<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/24e5af3cee41312a6a5f5ef8d5bf98c63507af94">https://github.com/macports/macports-ports/commit/24e5af3cee41312a6a5f5ef8d5bf98c63507af94</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 24e5af3cee4 devhelp: update to version 3.38.1
</span>24e5af3cee4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 24e5af3cee41312a6a5f5ef8d5bf98c63507af94
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Mon Jul 18 16:56:46 2022 -0700
<span style='display:block; white-space:pre;color:#404040;'> devhelp: update to version 3.38.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * update dependencies
</span><span style='display:block; white-space:pre;color:#404040;'> * backport upstream build fixes for meson 61.0+
</span><span style='display:block; white-space:pre;color:#404040;'> * update configuration to enable API documentation
</span>---
gnome/devhelp/Portfile | 36 +++++++++----
gnome/devhelp/files/dont-use-version-script.patch | 11 ++++
gnome/devhelp/files/meson-0.61.patch | 62 ++++++++++++++++++++++
.../files/patch-disable-version-script.diff | 10 ----
4 files changed, 98 insertions(+), 21 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/devhelp/Portfile b/gnome/devhelp/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 48fe5cc7614..94b14028f8a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/devhelp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/devhelp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,11 +3,8 @@
</span> PortSystem 1.0
PortGroup meson 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# version 3.36.0+ requires gio-2.0 >= 2.60
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# current glib2 is 2.58.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> name devhelp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.34.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.38.1
</span> revision 0
license GPL-2+
description Devhelp is an API documentation browser for GTK+ and GNOME.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,28 +19,45 @@ platforms darwin
</span> homepage https://wiki.gnome.org/Apps/Devhelp
set branch [join [lrange [split ${version} .] 0 1] .]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default master_sites {gnome:sources/${name}/${branch}/}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites gnome:sources/${name}/${branch}/
</span>
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 3ce87b3e2c518a322ee7bdc9307ca825aadb935b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ef920537b0afeaadeece765cdb326e471b0d5c2b2ac646ecf62abef99cb1f57e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 288352
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 4d890c43114992c69c93e356576ba8255f7be31f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4da8f5951b3a5920df73d057beab3ebe1855a75eae41208a9d89305a6b114a8f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 313948
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gettext \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gtk-doc \
</span> port:itstool
depends_lib port:desktop-file-utils \
port:amtk \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gettext-runtime \
</span> path:lib/pkgconfig/glib-2.0.pc:glib2 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/gobject-introspection-1.0.pc:gobject-introspection \
</span> port:gsettings-desktop-schemas \
path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
path:lib/pkgconfig/webkit2gtk-4.0.pc:webkit2-gtk
depends_run port:adwaita-icon-theme
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-disable-version-script.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles dont-use-version-script.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ meson-0.61.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args -Dgtk_doc=true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# gobject-introspection uses g-ir-scanner, which uses $CC from env
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${universal_possible} && [variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach arch ${configure.universal_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_build_env(${arch}) "CC=${configure.cc} -arch ${arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_destroot_env(${arch}) "CC=${configure.cc} -arch ${arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append "CC=${configure.cc} ${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append "CC=${configure.cc} ${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
post-activate {
system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/devhelp/files/dont-use-version-script.patch b/gnome/devhelp/files/dont-use-version-script.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..370d4542c29
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/devhelp/files/dont-use-version-script.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- devhelp/meson.build.orig 2020-11-20 05:48:48.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ devhelp/meson.build 2022-07-18 17:06:59.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -96,7 +96,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libdevhelp_shared_lib = shared_library(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'devhelp-@0@'.format(LIBDEVHELP_API_VERSION),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ link_whole: libdevhelp_static_lib,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- link_args: '-Wl,--version-script,' + symbol_map,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ link_args: '-export-symbols ' + symbol_map,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ link_depends: symbol_map,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version: LIBDEVHELP_LT_VERSION,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install: true
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/devhelp/files/meson-0.61.patch b/gnome/devhelp/files/meson-0.61.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ee5b225458b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/devhelp/files/meson-0.61.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,62 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 281bade14c1925cf9e7329fa8e9cf2d82512c66f Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Emmanuele Bassi <ebassi@gnome.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 24 Jan 2022 23:39:24 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] build: Fix i18n.merge_file() use with Meson 0.61
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The function never took positional arguments.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fixes: #59
</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 e583f21..d3ee099 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- data/meson.build.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ data/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17,7 +17,6 @@ configure_file(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ appdata = 'org.gnome.Devhelp.appdata.xml'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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;'>+@@ -27,7 +26,6 @@ I18N.merge_file(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ desktop_file = 'org.gnome.Devhelp.desktop'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 03b9b6b55ab1e1376b314ac7f99693512e42d80b Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: r-value <i@rvalue.moe>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 17 Nov 2021 18:02:20 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Remove incorrect arg for i18n.merge_file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+`i18n.merge_file` has been ignoring positional arguments and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+explicitly rejects with error "ERROR: Function does not take
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+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;'>+ plugins/gedit-plugin/meson.build | 1 -
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/plugins/gedit-plugin/meson.build b/plugins/gedit-plugin/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4f779886..877a01ff 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- plugins/gedit-plugin/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ plugins/gedit-plugin/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7,7 +7,6 @@ install_data(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ plugin_info_file = 'devhelp.plugin'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ I18N.merge_file(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- plugin_info_file,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ type: 'desktop',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ input: plugin_info_file + '.desktop.in',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ output: plugin_info_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><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/devhelp/files/patch-disable-version-script.diff b/gnome/devhelp/files/patch-disable-version-script.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index dc037639fbb..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/devhelp/files/patch-disable-version-script.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- devhelp/meson.build.orig 2020-06-23 21:22:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ devhelp/meson.build 2020-06-23 21:23:20.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -95,7 +95,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libdevhelp = shared_library(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'devhelp-@0@'.format(LIBDEVHELP_API_VERSION),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- link_whole : libdevhelp_static,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- link_args : '-Wl,--version-script,' + symbol_map,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- link_depends : symbol_map,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version : LIBDEVHELP_LT_VERSION,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install : true
</span></pre><pre style='margin:0'>
</pre>