From d9894509a7e38a1259feb1963388d6c22d2fe62a Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 8 Aug 2006 11:51:32 +0000
Subject: gtk+_2.10.1.bb : rediff and re-add the no-demos patch
---
packages/gtk+/gtk+-2.10.1/no-demos.patch | 10 +++++-----
packages/gtk+/gtk+_2.10.1.bb | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
(limited to 'packages/gtk+')
diff --git a/packages/gtk+/gtk+-2.10.1/no-demos.patch b/packages/gtk+/gtk+-2.10.1/no-demos.patch
index 2f10a30dda..0fc4c48d1a 100644
--- 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 4d2d18bbf4..401583987e 100644
--- 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 \
--
cgit v1.2.3