gtk+_2.10.1.bb : rediff and re-add the no-demos patch

diff --git a/packages/gtk+/gtk+-2.10.1/no-demos.patch b/packages/gtk+/gtk+-2.10.1/no-demos.patch
index 2f10a30..0fc4c48 100644 (file)
--- a/packages/gtk+/gtk+-2.10.1/no-demos.patch
+++ b/packages/gtk+/gtk+-2.10.1/no-demos.patch
@@ -1,10 +1,10 @@
---- gtk+-2.4.1/Makefile.am~    2004-01-17 22:15:56.000000000 +0000
-+++ gtk+-2.4.1/Makefile.am     2004-05-08 12:25:32.000000000 +0100
+--- 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 contrib
-+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests contrib
- SUBDIRS = po po-properties $(SRC_SUBDIRS) docs build m4macros
+-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/packages/gtk+/gtk+_2.10.1.bb b/packages/gtk+/gtk+_2.10.1.bb
index 4d2d18b..4015839 100644 (file)
--- a/packages/gtk+/gtk+_2.10.1.bb
+++ b/packages/gtk+/gtk+_2.10.1.bb
@@ -23,8 +23,8 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \
           file://migration.patch;patch=1;pnum=0 \
            file://run-iconcache.patch;patch=1 \
            file://disable-print.patch;patch=1 \
-           file://hardcoded_libtool.patch;patch=1"
-#           file://no-demos.patch;patch=1
+           file://hardcoded_libtool.patch;patch=1 \
+           file://no-demos.patch;patch=1"
 #           file://gtk+-handhelds.patch;patch=1
 #         file://single-click.patch;patch=1
 #         file://spinbutton.patch;patch=1 \