[gnome-continuous/wip/yocto1.7: 1/4] Add patch that fixes build issue with gtk-engines

[Alexander Larsson <alexl src gnome org>]

commit 22a887d4bf0bb1b1fa89af2b8227df68b1b34b87
Author: Alexander Larsson <alexl redhat com>
Date:   Tue Sep 23 14:44:28 2014 +0200

    Add patch that fixes build issue with gtk-engines
    
    See patch for details

 manifest.json                          |    1 +
 patches/gtk-engines-automake1.14.patch |   64 ++++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+), 0 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index 281a93f..4f030a0 100644
--- a/manifest.json
+++ b/manifest.json
@@ -578,6 +578,7 @@
                 "branch": "gtk-2-24"},
 
                {"src": "gnome:gtk-engines",
+                "patches": ["gtk-engines-automake1.14.patch"],
                 "branch": "gtk-engines-2-22"},
 
                {"src": "gnome:gtk+",
diff --git a/patches/gtk-engines-automake1.14.patch b/patches/gtk-engines-automake1.14.patch
new file mode 100644
index 0000000..17f6d04
--- /dev/null
+++ b/patches/gtk-engines-automake1.14.patch
@@ -0,0 +1,64 @@
+From 0540c37a7d3896eee75e42a1f2780e2e3896703e Mon Sep 17 00:00:00 2001
+From: Alexander Larsson <alexl redhat com>
+Date: Tue, 23 Sep 2014 13:48:43 +0200
+Subject: [PATCH] Work around bug in automake
+
+There is an issue with later automakes and path substitution that
+breaks test/Makefile. See e.g. http://debbugs.gnu.org/db/14/14561.html
+
+This patch is from the debian package and works around this by doing
+the expansion in configure instead.
+---
+ configure.ac     |  2 ++
+ test/Makefile.am | 12 ++++++++----
+ 2 files changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8570250..652a2b2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -130,6 +130,8 @@ AC_SUBST(LIBM)
+ AC_SUBST(BUILD_ENGINES)
+ AC_SUBST(BUILD_THEMES)
+ AC_SUBST(BUILD_SCHEMAS)
++AC_SUBST([auto_find_tests], ['$(patsubst %,exported_%,$(BUILD_ENGINES)) torture_buildin $(patsubst 
%,torture_%,$(TORTURE_TEST_ENGINES))'])
++
+ 
+ if test $animation = "yes"; then
+       AC_DEFINE_UNQUOTED(HAVE_ANIMATION, 1, [Defines whether to compile with animation support])
+diff --git a/test/Makefile.am b/test/Makefile.am
+index ea366f9..a082217 100644
+--- a/test/Makefile.am
++++ b/test/Makefile.am
+@@ -64,9 +64,10 @@ VALGRIND_ENV=G_SLICE=always-malloc G_DEBUG=gc-friendly,resident-modules
+ # Exported Symbols Test - Tests all engines unconditionally
+ #############################################################
+ # Prefix with exported_
+-EXPORTED_SYMBOLS_TESTS = $(patsubst %,exported_%,$(BUILD_ENGINES))
++# disabled to work around automake bug #14561
++# EXPORTED_SYMBOLS_TESTS = $(patsubst %,exported_%,$(BUILD_ENGINES))
+ 
+-TESTS += $(EXPORTED_SYMBOLS_TESTS)
++#TESTS += $(EXPORTED_SYMBOLS_TESTS)
+ 
+ 
+ #############################################################
+@@ -85,10 +86,13 @@ SUPPORTED_TORTURE_TEST_ENGINES = \
+ # Filter engines that are not build from the set of engines
+ TORTURE_TEST_ENGINES = $(filter $(SUPPORTED_TORTURE_TEST_ENGINES),$(BUILD_ENGINES))
+ # Prefix with torture_
+-TORTURE_TEST_TESTS = torture_buildin $(patsubst %,torture_%,$(TORTURE_TEST_ENGINES))
++# disabled to work around automake bug #14561
++# TORTURE_TEST_TESTS = torture_buildin $(patsubst %,torture_%,$(TORTURE_TEST_ENGINES))
+ 
+ # Add TORTURE_TEST_ENGINES to list of tests
+-TESTS += $(TORTURE_TEST_TESTS)
++# disabled to work around automake bug #14561
++#TESTS += $(TORTURE_TEST_TESTS)
++TESTS += @auto_find_tests@
+ 
+ # Possible other tests:
+ #  - An extensive theme switch tests that loads/unloads the engine
+-- 
+2.1.0
+