<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/bc8144fdf966cac0c3d55e414cfa697e2caea8b1">https://github.com/macports/macports-ports/commit/bc8144fdf966cac0c3d55e414cfa697e2caea8b1</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit bc8144fdf966cac0c3d55e414cfa697e2caea8b1
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Tue Jul 5 13:30:35 2022 -0700
<span style='display:block; white-space:pre;color:#404040;'> gedit: upstream build fix for meson 61.0+
</span>---
gnome/gedit/Portfile | 3 ++-
gnome/gedit/files/patch-meson-61.0.diff | 34 +++++++++++++++++++++++++++++++++
2 files changed, 36 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gedit/Portfile b/gnome/gedit/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0c887d2a6f2..69916d1723b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gedit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gedit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,7 +50,8 @@ depends_lib-append port:desktop-file-utils \
</span>
depends_run port:adwaita-icon-theme
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-gedit-meson-build-python3.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-gedit-meson-build-python3.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-meson-61.0.diff
</span>
post-patch {
reinplace "s|@@PYTHON3@@|${configure.python}|g" ${worksrcpath}/meson.build
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gedit/files/patch-meson-61.0.diff b/gnome/gedit/files/patch-meson-61.0.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d0e1e46b50e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gedit/files/patch-meson-61.0.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 6d32d0a0ec7755c59d2da5c581f1d0dc4774d7e5 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: rvalue <i@rvalue.moe>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 15 Dec 2021 07:02:09 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Remove incorrect args for i18n.merge_file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The positional argument has been silently ignored for a time. And it causes failure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+with "ERROR: Function does not take positional arguments" since meson 0.60.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ data/meson.build | 2 --
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/data/meson.build b/data/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 774618b3d..0077b49c5 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- data/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ data/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4,7 +4,6 @@ install_man('gedit.1')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ appdata = 'org.gnome.gedit.appdata.xml'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ appdata_file = i18n.merge_file(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- appdata,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ input: appdata + '.in',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ output: appdata,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ po_dir: '../po/',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,7 +22,6 @@ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ desktop_file = 'org.gnome.gedit.desktop'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ desktop_output_file = i18n.merge_file(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- desktop_file,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ type: 'desktop',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ input: desktop_file + '.in',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ output: desktop_file,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+GitLab
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>