adjust patch to version 2.17.0 of gtk+

[openwrt/svn-archive/archive.git] / Xorg / lib / gtk2 / patches / 010-dont-build-demos-and-tests.patch

diff --git a/Xorg/lib/gtk2/patches/010-dont-build-demos-and-tests.patch b/Xorg/lib/gtk2/patches/010-dont-build-demos-and-tests.patch
index db5a3bd8ce35b1e6a73dfa3ce6d328dd9edb96e2..3181882e20da363d695ffe50656108dbcbe5e604 100644 (file)
--- a/Xorg/lib/gtk2/patches/010-dont-build-demos-and-tests.patch
+++ b/Xorg/lib/gtk2/patches/010-dont-build-demos-and-tests.patch
@@ -1,40 +1,28 @@
-diff -urN gtk+-2.14.3.orig/gdk/Makefile.in gtk+-2.14.3/gdk/Makefile.in
---- gtk+-2.14.3.orig/gdk/Makefile.in   2008-10-03 23:14:22.000000000 +0200
-+++ gtk+-2.14.3/gdk/Makefile.in        2008-10-03 23:19:30.000000000 +0200
-@@ -424,8 +424,8 @@
-       && DISPLAY=:$$XID && export DISPLAY
- 
- 
--SUBDIRS = $(gdktarget) . tests
--DIST_SUBDIRS = win32 x11 quartz directfb tests
-+SUBDIRS = $(gdktarget) .
-+DIST_SUBDIRS = x11 directfb
- 
- INCLUDES = \
-       -DG_LOG_DOMAIN=\"Gdk\"          \
-diff -urN gtk+-2.14.3.orig/gtk/Makefile.in gtk+-2.14.3/gtk/Makefile.in
---- gtk+-2.14.3.orig/gtk/Makefile.in   2008-10-03 23:14:06.000000000 +0200
-+++ gtk+-2.14.3/gtk/Makefile.in        2008-10-03 23:20:08.000000000 +0200
-@@ -465,8 +465,8 @@
- @USE_QUARTZ_TRUE@GTK_PRINT_PREVIEW_COMMAND = "open -a /Applications/Preview.app %f"
- @USE_QUARTZ_FALSE@GTK_PRINT_PREVIEW_COMMAND = "evince --unlink-tempfile --preview --print-settings %s %f"
+diff -ruN gtk+-2.17.0.orig/Makefile.am gtk+-2.17.0/Makefile.am
+--- gtk+-2.17.0.orig/Makefile.am       2009-05-03 18:39:14.000000000 +0200
++++ gtk+-2.17.0/Makefile.am    2009-10-16 23:53:15.000000000 +0200
+@@ -1,8 +1,8 @@
+ ## Makefile.am for GTK+
+ include $(top_srcdir)/Makefile.decl
  
--SUBDIRS = theme-bits . tests
--DIST_SUBDIRS = theme-bits tests
-+SUBDIRS = theme-bits .
-+DIST_SUBDIRS = theme-bits
- @HAVE_CUPS_FALSE@GTK_PRINT_BACKENDS = file,lpr
+-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
+-SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
++SRC_SUBDIRS = gdk-pixbuf gdk gtk modules contrib
++SUBDIRS = po po-properties $(SRC_SUBDIRS) m4macros
  
- @HAVE_CUPS_TRUE@GTK_PRINT_BACKENDS = file,cups
-diff -urN gtk+-2.14.3.orig/Makefile.in gtk+-2.14.3/Makefile.in
---- gtk+-2.14.3.orig/Makefile.in       2008-10-03 23:13:54.000000000 +0200
-+++ gtk+-2.14.3/Makefile.in    2008-10-03 23:18:13.000000000 +0200
-@@ -516,7 +516,7 @@
+ # require automake 1.4
+ AUTOMAKE_OPTIONS = 1.7
+diff -ruN gtk+-2.17.0.orig/Makefile.in gtk+-2.17.0/Makefile.in
+--- gtk+-2.17.0.orig/Makefile.in       2009-05-04 06:45:42.000000000 +0200
++++ gtk+-2.17.0/Makefile.in    2009-10-16 23:53:07.000000000 +0200
+@@ -523,8 +523,8 @@
        && DISPLAY=:$$XID && export DISPLAY
  
  
 -SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
+-SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
 +SRC_SUBDIRS = gdk-pixbuf gdk gtk modules contrib
- SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
++SUBDIRS = po po-properties $(SRC_SUBDIRS) m4macros
  
  # require automake 1.4
+ AUTOMAKE_OPTIONS = 1.7