aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorApelete Seketeli <apelete@seketeli.net>2012-06-19 23:55:19 +0200
committerApelete Seketeli <apelete@seketeli.net>2012-07-04 22:10:44 +0200
commitc7e85ba9134dc14237db102aa6d69668d5fe74a0 (patch)
treec4a520eee6ec5295dbf5ed0691f356073ad27698
parent8825b28fc691265458acd273f03e1fdd55856ecb (diff)
downloadopenembedded-c7e85ba9134dc14237db102aa6d69668d5fe74a0.zip
openembedded-c7e85ba9134dc14237db102aa6d69668d5fe74a0.tar.gz
openembedded-c7e85ba9134dc14237db102aa6d69668d5fe74a0.tar.bz2
gtk+: Add no-test-inline-pixbufs.patch to gtk+-2.20.1
This patch adds a patch to the gtk+-2.20.1 recipe that removes the need to build test-inline-pixbufs.h in the demos/Makefile.am file of the gtk+-2.20.1 upstream package. It also removes all the demo programs that were dependant on test-inline-pixbufs.h from demos/Makefile.am. Signed-off-by: Apelete Seketeli <apelete@seketeli.net>
-rw-r--r--recipes/gtk+/gtk+-2.20.1/no-test-inline-pixbufs.patch22
-rw-r--r--recipes/gtk+/gtk+_2.20.1.bb1
2 files changed, 23 insertions, 0 deletions
diff --git a/recipes/gtk+/gtk+-2.20.1/no-test-inline-pixbufs.patch b/recipes/gtk+/gtk+-2.20.1/no-test-inline-pixbufs.patch
new file mode 100644
index 0000000..c1fcbd7
--- /dev/null
+++ b/recipes/gtk+/gtk+-2.20.1/no-test-inline-pixbufs.patch
@@ -0,0 +1,22 @@
+--- gtk+-2.20.1/demos/Makefile.am.orig 2012-06-18 21:53:07.365997572 +0200
++++ gtk+-2.20.1/demos/Makefile.am 2012-06-18 21:53:43.718177837 +0200
+@@ -23,18 +23,9 @@
+ $(GTK_DEP_LIBS) \
+ $(MATH_LIB)
+
+-noinst_PROGRAMS = \
+- testpixbuf-drawable \
+- testanimation \
+- testpixbuf-color \
+- testpixbuf-save \
+- testpixbuf-scale \
+- pixbuf-demo
+-
+ # Need to build test-inline-pixbufs.h for testpixbuf
+ if HAVE_PNG
+-noinst_PROGRAMS += testpixbuf
+-BUILT_SOURCES = test-inline-pixbufs.h
++BUILT_SOURCES =
+ endif
+
+ if CROSS_COMPILING
diff --git a/recipes/gtk+/gtk+_2.20.1.bb b/recipes/gtk+/gtk+_2.20.1.bb
index cd3a6d2..62f2f3c 100644
--- a/recipes/gtk+/gtk+_2.20.1.bb
+++ b/recipes/gtk+/gtk+_2.20.1.bb
@@ -7,6 +7,7 @@ SRC_URI_append_virtclass-native = " file://no-demos.patch \
SRC_URI_append = "file://gtk-dnd-grab-deadlock-fix.patch \
file://cross-nm.patch \
file://xkb-ifdef.patch \
+ file://no-test-inline-pixbufs.patch \
"
SRC_URI[gtk.md5sum] = "53e6f3a93bd22934878fc4a4a34c68aa"