<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/798c311f33bf38e349393cdf0e13131702abd538">https://github.com/macports/macports-ports/commit/798c311f33bf38e349393cdf0e13131702abd538</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new 798c311f33b gnome-dictionary: Fix build failure with current meson
</span>798c311f33b is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 798c311f33bf38e349393cdf0e13131702abd538
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Sat Sep 7 00:38:21 2024 -0500

<span style='display:block; white-space:pre;color:#404040;'>    gnome-dictionary: Fix build failure with current meson
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/65774
</span>---
 gnome/gnome-dictionary/Portfile                |  5 ++--
 gnome/gnome-dictionary/files/meson.build.patch | 32 ++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 2 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-dictionary/Portfile b/gnome/gnome-dictionary/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 85b09e1491b..45563c121ed 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnome-dictionary/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnome-dictionary/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,7 +14,6 @@ long_description    GNOME Dictionary can look for the definition or translation
</span> 
 maintainers         {devans @dbevans} openmaintainer
 categories          gnome
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms           darwin
</span> homepage            https://www.gnome.org
 master_sites        gnome:sources/${name}/${branch}/
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +24,7 @@ checksums           rmd160  2cc3598c4edc75e0fce395d272b86470dc595633 \
</span>                     size    662048
 
 depends_build-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:bin/pkg-config:pkgconfig \
</span>                     port:itstool \
                     port:docbook-xsl-nons \
                     port:libxslt
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,6 +35,8 @@ depends_lib         port:desktop-file-utils \
</span> 
 depends_run         port:adwaita-icon-theme
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles          meson.build.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # port installs desktop application file, and gschemas
 post-activate {
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-dictionary/files/meson.build.patch b/gnome/gnome-dictionary/files/meson.build.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d38a7a03db9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnome-dictionary/files/meson.build.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,32 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ERROR: Function does not take positional arguments.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/mesonbuild/meson/issues/9441
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://gitlab.gnome.org/Archive/gnome-dictionary/-/commit/cf3f8a67cd6f3059c555ed9cf0f5fba10abb7f68
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- data/meson.build.orig  2017-10-01 09:14:30.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ data/meson.build       2024-09-07 00:37:10.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-i18n.merge_file ('desktop',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++i18n.merge_file (
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                  input: 'org.gnome.Dictionary.desktop.in',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                  output: 'org.gnome.Dictionary.desktop',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                  install: true,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14,7 +14,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        workdir: meson.current_build_dir())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-i18n.merge_file ('desktop',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++i18n.merge_file (
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                  input: 'org.gnome.Dictionary.appdata.xml.in',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                  output: 'org.gnome.Dictionary.appdata.xml',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                  install: true,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -48,7 +48,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach s: sources
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  i18n.merge_file('desktop',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  i18n.merge_file(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   input: '@0@.in'.format(s),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   output: s,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   install: true,
</span></pre><pre style='margin:0'>

</pre>