<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7e64b0de3018a4efe26583e905bb904a9e0fc196">https://github.com/macports/macports-ports/commit/7e64b0de3018a4efe26583e905bb904a9e0fc196</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 7e64b0d gtk-engines2: Work around automake bug
</span>7e64b0d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7e64b0de3018a4efe26583e905bb904a9e0fc196
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sat Aug 11 08:26:39 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> gtk-engines2: Work around automake bug
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes build failure on some systems, including Snow Leopard.
</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/56167
</span>---
x11/gtk-engines2/Portfile | 1 +
x11/gtk-engines2/files/automake-1.14.patch | 42 ++++++++++++++++++++++++++++++
2 files changed, 43 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/gtk-engines2/Portfile b/x11/gtk-engines2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 40c5bef..8d1bea8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/gtk-engines2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/gtk-engines2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,6 +39,7 @@ depends_lib port:gtk2
</span>
patchfiles patch-engines-clearlooks-src-animation.c.diff \
patch-remove-lua-engine.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ automake-1.14.patch \
</span> no-test.patch
# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/gtk-engines2/files/automake-1.14.patch b/x11/gtk-engines2/files/automake-1.14.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..b9081b2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/gtk-engines2/files/automake-1.14.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,42 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Work around build failure due to automake 1.14 bug.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Automake generates invalid Makefiles when patsubst is used in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Makefile.am. To work around this problem configure injects the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patsubsts to the Makefile now.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://bugs.debian.org/713353
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://debbugs.gnu.org/cgi/bugreport.cgi?bug=14561
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig 2010-10-01 07:42:37.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2018-08-11 08:21:27.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -127,6 +127,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_SUBST(BUILD_ENGINES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_SUBST(BUILD_THEMES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_SUBST(BUILD_SCHEMAS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_SUBST([auto_find_tests], ['$(patsubst %,exported_%,$(BUILD_ENGINES)) torture_buildin $(patsubst %,torture_%,$(TORTURE_TEST_ENGINES))'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test $animation = "yes"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_DEFINE_UNQUOTED(HAVE_ANIMATION, 1, [Defines whether to compile with animation support])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- test/Makefile.am.orig 2010-09-19 10:18:21.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ test/Makefile.am 2018-08-11 08:21:27.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -64,9 +64,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Exported Symbols Test - Tests all engines unconditionally
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #############################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Prefix with exported_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-EXPORTED_SYMBOLS_TESTS = $(patsubst %,exported_%,$(BUILD_ENGINES))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-TESTS += $(EXPORTED_SYMBOLS_TESTS)
</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;'>+ #############################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -85,10 +83,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Filter engines that are not build from the set of engines
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TORTURE_TEST_ENGINES = $(filter $(SUPPORTED_TORTURE_TEST_ENGINES),$(BUILD_ENGINES))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Prefix with torture_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-TORTURE_TEST_TESTS = torture_buildin $(patsubst %,torture_%,$(TORTURE_TEST_ENGINES))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Add TORTURE_TEST_ENGINES to list of tests
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-TESTS += $(TORTURE_TEST_TESTS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++TESTS += @auto_find_tests@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Possible other tests:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # - An extensive theme switch tests that loads/unloads the engine
</span></pre><pre style='margin:0'>
</pre>