<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/22d5ec6a5d18c806ef724b1b843b87a306af9900">https://github.com/macports/macports-ports/commit/22d5ec6a5d18c806ef724b1b843b87a306af9900</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 22d5ec6 libgnomekbd: update to version 3.26.1
</span>22d5ec6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 22d5ec6a5d18c806ef724b1b843b87a306af9900
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Sun May 3 13:51:23 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> libgnomekbd: update to version 3.26.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add upstream patch for build compatibility with gettext 0.19.6+ including 0.20+.
</span>---
gnome/libgnomekbd/Portfile | 13 ++++--
.../files/patch-gettext-0.20-compat.diff | 48 ++++++++++++++++++++++
2 files changed, 57 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/libgnomekbd/Portfile b/gnome/libgnomekbd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9973861..6ddcab6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/libgnomekbd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/libgnomekbd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup active_variants 1.1
</span> PortGroup gobject_introspection 1.0
name libgnomekbd
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.26.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.26.1
</span> set branch [join [lrange [split ${version} .] 0 1] .]
description A GNOME library which manages keyboard configuration
long_description Libgnomekbd is ${description} and offers various \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,8 +20,9 @@ master_sites gnome:sources/${name}/${branch}/
</span>
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 8677d45a1e3a62ec5584d69b7b01adc2578544c9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ea3b418c57c30615f7ee5b6f718def7c9d09ce34637324361150744258968875
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 f9d22e3875786dfe6fe3ba0d31dc0e8a42402029 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f7ca02631576e9b88aee1b1bae37ac1488b80ee7975f20a97f29e761a7172679 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 450636
</span>
depends_build port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,8 +32,12 @@ depends_lib port:desktop-file-utils \
</span>
gobject_introspection yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# libgnomekbd/gkbd-keyboard-display.c uses gdk_set_allowed_backends ("x11")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-gettext-0.20-compat.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_autoreconf yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+autoreconf.args -fvi
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# libgnomekbd/gkbd-keyboard-display.c uses gdk_set_allowed_backends ("x11")
</span> require_active_variants port:gtk3 x11
configure.args --x-includes=${prefix}/include \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/libgnomekbd/files/patch-gettext-0.20-compat.diff b/gnome/libgnomekbd/files/patch-gettext-0.20-compat.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..94211b3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/libgnomekbd/files/patch-gettext-0.20-compat.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,48 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 8c95ba82813fab1777d920544c179d1a2c10156a Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Ting-Wei Lan <lantw@src.gnome.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 24 Jul 2019 16:54:35 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] =?UTF-8?q?build:=20Allow=20building=20with=20gettext=20?=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ =?UTF-8?q?=E2=89=A5=200.20?=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+MIME-Version: 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Content-Type: text/plain; charset=UTF-8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Content-Transfer-Encoding: 8bit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The use of AM_GNU_GETTEXT_VERSION in configure.ac instructs autopoint to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+copy po/Makefile.in.in from the exact gettext version. It is fine if the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version of gettext installed on the system has the same minor version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+number with the requested version, but it fails if you have a newer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version of gettext because of the mismatch between autoconf macros and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Makefile.in.in.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *** error: gettext infrastructure mismatch: using a Makefile.in.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from gettext version 0.19 but the autoconf macros are from gettext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 0.20
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Instead of specifying the exact version with AM_GNU_GETTEXT_VERSION, we
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+can use AM_GNU_GETTEXT_REQUIRE_VERSION to ask autopoint to simply use
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+the gettext version installed on the system to prevent the mismatch.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This also bumps the version requirement on gettext to 0.19.6 because
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+AM_GNU_GETTEXT_REQUIRE_VERSION was added in this version.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ac | 4 +++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 3 insertions(+), 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/configure.ac b/configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index beb5ee1..7b3972f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -37,7 +37,9 @@ AM_PROG_LIBTOOL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ****
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # i18n
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ****
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-AM_GNU_GETTEXT_VERSION([0.19.4])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# FIXME: Remove AM_GNU_GETTEXT_VERSION once autoreconf supports REQUIRE_VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AM_GNU_GETTEXT_VERSION([0.19.6])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.6])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AM_GNU_GETTEXT([external])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GETTEXT_PACKAGE=libgnomekbd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.26.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>