From: Koen Kooi <koen@openembedded.org>
Date: Fri, 5 Mar 2010 09:42:11 +0000 (+0100)
Subject: gtk+: reinstate no-demos patch for gtk+-native, it fails to build without it
X-Git-Tag: Release-2010-05/1~475^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3bf0f5e55a48dfb5ac34e750433a838c62e5dda;p=openembedded.git

gtk+: reinstate no-demos patch for gtk+-native, it fails to build without it
---

diff --git a/recipes/gtk+/gtk+-2.18.6/no-demos.patch b/recipes/gtk+/gtk+-2.18.6/no-demos.patch
new file mode 100644
index 0000000000..0fc4c48d1a
--- /dev/null
+++ b/recipes/gtk+/gtk+-2.18.6/no-demos.patch
@@ -0,0 +1,10 @@
+--- gtk+-2.10.1/Makefile.am.orig	2006-08-08 12:37:30.000000000 +0100
++++ gtk+-2.10.1/Makefile.am	2006-08-08 12:37:48.000000000 +0100
+@@ -1,6 +1,6 @@
+ ## Makefile.am for GTK+
+ 
+-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
++SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests perf contrib
+ SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
+ 
+ # require automake 1.4
diff --git a/recipes/gtk+/gtk+_2.18.6.bb b/recipes/gtk+/gtk+_2.18.6.bb
index cba32e507e..9321b43dfa 100644
--- a/recipes/gtk+/gtk+_2.18.6.bb
+++ b/recipes/gtk+/gtk+_2.18.6.bb
@@ -1,10 +1,13 @@
 require gtk+.inc
 
-PR = "${INC_PR}.1"
+SRC_URI_append_virtclass-native = " file://no-demos.patch;patch=1 \
+"
+
+PR = "${INC_PR}.3"
 
 BBCLASSEXTEND = "native"
 
-DEPENDS_virtclass-native = "atk-native pango-native cairo-native libxrender-native"
+DEPENDS_virtclass-native = "libpng-native atk-native pango-native cairo-native libxrender-native"
 
 # Enable xkb selectively
 XKBTOGGLE = " --disable-xkb"