<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/fff8b9641672e8a5e646fe2c290eb22eed8467d8">https://github.com/macports/macports-ports/commit/fff8b9641672e8a5e646fe2c290eb22eed8467d8</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 fff8b964167 gtk-quartz-engine: Use automake 1.17 if available
</span>fff8b964167 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit fff8b9641672e8a5e646fe2c290eb22eed8467d8
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Tue Jul 23 00:26:54 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> gtk-quartz-engine: Use automake 1.17 if available
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/70408
</span>---
gnome/gtk-quartz-engine/Portfile | 7 +++----
gnome/gtk-quartz-engine/files/patch-autogen.sh.diff | 13 ++++++++-----
2 files changed, 11 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gtk-quartz-engine/Portfile b/gnome/gtk-quartz-engine/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e8fe2943292..ba9f752dd3d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gtk-quartz-engine/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gtk-quartz-engine/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,6 @@ PortGroup github 1.0
</span> github.setup jralls gtk-quartz-engine 0.2 v
revision 2
categories gnome aqua
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> maintainers nomaintainer
description Quartz theme engine for Gtk+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,9 +16,9 @@ checksums rmd160 f2ae0bccf168a8281c82933d77fe96958603a102 \
</span> sha256 56441340aabd79ead12fea043d5772084e9f76d066b1ccb34a77469e1f453031 \
size 29663
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:automake \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libtool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:automake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libtool \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/pkg-config:pkgconfig
</span>
depends_lib port:libpng \
path:lib/pkgconfig/gtk+-2.0.pc:gtk2
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gtk-quartz-engine/files/patch-autogen.sh.diff b/gnome/gtk-quartz-engine/files/patch-autogen.sh.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 3bab748e048..f7d8cfb18ad 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gtk-quartz-engine/files/patch-autogen.sh.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gtk-quartz-engine/files/patch-autogen.sh.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,14 @@
</span> --- autogen.sh.orig 2009-10-08 11:26:39.000000000 -0500
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ autogen.sh 2018-11-29 22:43:04.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18,7 +18,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ autogen.sh 2024-07-23 00:23:34.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18,7 +18,28 @@
</span> DIE=1
}
-if automake-1.10 --version < /dev/null > /dev/null 2>&1 ; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+if automake-1.16 --version < /dev/null > /dev/null 2>&1 ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if automake-1.17 --version < /dev/null > /dev/null 2>&1 ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AUTOMAKE=automake-1.17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ACLOCAL=aclocal-1.17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++elif automake-1.16 --version < /dev/null > /dev/null 2>&1 ; then
</span> + AUTOMAKE=automake-1.16
+ ACLOCAL=aclocal-1.16
+elif automake-1.15 --version < /dev/null > /dev/null 2>&1 ; then
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +30,7 @@
</span> AUTOMAKE=automake-1.10
ACLOCAL=aclocal-1.10
elif automake-1.9 --version < /dev/null > /dev/null 2>&1 ; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -38,7 +56,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -38,7 +59,7 @@
</span> DIE=1
fi
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,7 +39,7 @@
</span> echo
echo "You must have libtool installed to compile $PROJECT."
echo "Get http://ftp.gnu.org/gnu/libtool/libtool-1.5.22.tar.gz"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -49,15 +67,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -49,15 +70,15 @@
</span> exit 1
fi
</pre><pre style='margin:0'>
</pre>