summaryrefslogtreecommitdiff
path: root/recipes
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2010-03-05 10:42:11 +0100
committerKoen Kooi <koen@openembedded.org>2010-03-05 10:45:24 +0100
commitf3bf0f5e55a48dfb5ac34e750433a838c62e5dda (patch)
treec54c274b31037015cde9fee335ab42f61c64308f /recipes
parentce7359e12ea8968be5e0c559e320624bc269cd3d (diff)
gtk+: reinstate no-demos patch for gtk+-native, it fails to build without it
Diffstat (limited to 'recipes')
-rw-r--r--recipes/gtk+/gtk+-2.18.6/no-demos.patch10
-rw-r--r--recipes/gtk+/gtk+_2.18.6.bb7
2 files changed, 15 insertions, 2 deletions
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"