From 798c311f33bf38e349393cdf0e13131702abd538 Mon Sep 17 00:00:00 2001 From: Ryan Carsten Schmidt Date: Sat, 7 Sep 2024 00:38:21 -0500 Subject: [PATCH] gnome-dictionary: Fix build failure with current meson Closes: https://trac.macports.org/ticket/65774 --- gnome/gnome-dictionary/Portfile | 5 +-- .../gnome-dictionary/files/meson.build.patch | 32 +++++++++++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 gnome/gnome-dictionary/files/meson.build.patch diff --git a/gnome/gnome-dictionary/Portfile b/gnome/gnome-dictionary/Portfile index 85b09e1491b..45563c121ed 100644 --- a/gnome/gnome-dictionary/Portfile +++ b/gnome/gnome-dictionary/Portfile @@ -14,7 +14,6 @@ long_description GNOME Dictionary can look for the definition or translation maintainers {devans @dbevans} openmaintainer categories gnome -platforms darwin homepage https://www.gnome.org master_sites gnome:sources/${name}/${branch}/ @@ -25,7 +24,7 @@ checksums rmd160 2cc3598c4edc75e0fce395d272b86470dc595633 \ size 662048 depends_build-append \ - port:pkgconfig \ + path:bin/pkg-config:pkgconfig \ port:itstool \ port:docbook-xsl-nons \ port:libxslt @@ -36,6 +35,8 @@ depends_lib port:desktop-file-utils \ depends_run port:adwaita-icon-theme +patchfiles meson.build.patch + # port installs desktop application file, and gschemas post-activate { system "${prefix}/bin/update-desktop-database ${prefix}/share/applications" diff --git a/gnome/gnome-dictionary/files/meson.build.patch b/gnome/gnome-dictionary/files/meson.build.patch new file mode 100644 index 00000000000..d38a7a03db9 --- /dev/null +++ b/gnome/gnome-dictionary/files/meson.build.patch @@ -0,0 +1,32 @@ +Fix: + +ERROR: Function does not take positional arguments. + +https://github.com/mesonbuild/meson/issues/9441 +https://gitlab.gnome.org/Archive/gnome-dictionary/-/commit/cf3f8a67cd6f3059c555ed9cf0f5fba10abb7f68 +--- data/meson.build.orig 2017-10-01 09:14:30.000000000 -0500 ++++ data/meson.build 2024-09-07 00:37:10.000000000 -0500 +@@ -1,4 +1,4 @@ +-i18n.merge_file ('desktop', ++i18n.merge_file ( + input: 'org.gnome.Dictionary.desktop.in', + output: 'org.gnome.Dictionary.desktop', + install: true, +@@ -14,7 +14,7 @@ + workdir: meson.current_build_dir()) + endif + +-i18n.merge_file ('desktop', ++i18n.merge_file ( + input: 'org.gnome.Dictionary.appdata.xml.in', + output: 'org.gnome.Dictionary.appdata.xml', + install: true, +@@ -48,7 +48,7 @@ + ] + + foreach s: sources +- i18n.merge_file('desktop', ++ i18n.merge_file( + input: '@0@.in'.format(s), + output: s, + install: true,