Signed-off-by: Robert Schwebel <[email protected]> --- .../0001-gtk-2.10.11-iconcache.diff.patch | 33 ++++++++++++++++++++ .../0002-gtk-2.10.12-no-demos.diff.patch | 25 +++++++++++++++ patches/gtk+-2.18.7/gtk+-2.10.11-iconcache.diff | 25 --------------- patches/gtk+-2.18.7/gtk+-2.10.12-no-demos.diff | 17 ---------- patches/gtk+-2.18.7/series | 2 - 5 files changed, 58 insertions(+), 44 deletions(-) create mode 100644 patches/gtk+-2.18.7/0001-gtk-2.10.11-iconcache.diff.patch create mode 100644 patches/gtk+-2.18.7/0002-gtk-2.10.12-no-demos.diff.patch delete mode 100644 patches/gtk+-2.18.7/gtk+-2.10.11-iconcache.diff delete mode 100644 patches/gtk+-2.18.7/gtk+-2.10.12-no-demos.diff delete mode 100644 patches/gtk+-2.18.7/series
diff --git a/patches/gtk+-2.18.7/0001-gtk-2.10.11-iconcache.diff.patch b/patches/gtk+-2.18.7/0001-gtk-2.10.11-iconcache.diff.patch new file mode 100644 index 0000000..2946f79 --- /dev/null +++ b/patches/gtk+-2.18.7/0001-gtk-2.10.11-iconcache.diff.patch @@ -0,0 +1,33 @@ +From 8fed496b71b501058bb0d27e547f858cee100f22 Mon Sep 17 00:00:00 2001 +From: unknown author <[email protected]> +Date: Sun, 30 Oct 2011 22:38:42 +0100 +Subject: [PATCH 1/2] gtk+-2.10.11-iconcache.diff + +--- + gtk/Makefile.am | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/gtk/Makefile.am b/gtk/Makefile.am +index 267c499..2ce0bd4 100644 +--- a/gtk/Makefile.am ++++ b/gtk/Makefile.am +@@ -1304,11 +1304,11 @@ gtk_update_icon_cache_program = \ + ./gtk-update-icon-cache + endif + +-gtkbuiltincache.h: @REBUILD@ stamp-icons +- $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) $(GTK_UPDATE_ICON_CACHE_MANIFEST) +- $(gtk_update_icon_cache_program) --force --ignore-theme-index \ +- --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ +- mv gtkbuiltincache.h.tmp gtkbuiltincache.h ++#gtkbuiltincache.h: @REBUILD@ stamp-icons ++# $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) $(GTK_UPDATE_ICON_CACHE_MANIFEST) ++# $(gtk_update_icon_cache_program) --force --ignore-theme-index \ ++# --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ ++# mv gtkbuiltincache.h.tmp gtkbuiltincache.h + + EXTRA_DIST += \ + $(STOCK_ICONS) \ +-- +1.7.7 + diff --git a/patches/gtk+-2.18.7/0002-gtk-2.10.12-no-demos.diff.patch b/patches/gtk+-2.18.7/0002-gtk-2.10.12-no-demos.diff.patch new file mode 100644 index 0000000..800f999 --- /dev/null +++ b/patches/gtk+-2.18.7/0002-gtk-2.10.12-no-demos.diff.patch @@ -0,0 +1,25 @@ +From 6967f987acd29442bf34a3f527ae8dc47b933a9c Mon Sep 17 00:00:00 2001 +From: unknown author <[email protected]> +Date: Sun, 30 Oct 2011 22:38:42 +0100 +Subject: [PATCH 2/2] gtk+-2.10.12-no-demos.diff + +--- + Makefile.am | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 38f245b..1c06145 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,7 +1,7 @@ + ## Makefile.am for GTK+ + include $(top_srcdir)/Makefile.decl + +-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 +-- +1.7.7 + diff --git a/patches/gtk+-2.18.7/gtk+-2.10.11-iconcache.diff b/patches/gtk+-2.18.7/gtk+-2.10.11-iconcache.diff deleted file mode 100644 index 206977d..0000000 --- a/patches/gtk+-2.18.7/gtk+-2.10.11-iconcache.diff +++ /dev/null @@ -1,25 +0,0 @@ ---- - gtk/Makefile.am | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -Index: b/gtk/Makefile.am -=================================================================== ---- a/gtk/Makefile.am -+++ b/gtk/Makefile.am -@@ -1300,11 +1300,11 @@ gtk_update_icon_cache_program = \ - ./gtk-update-icon-cache - endif - --gtkbuiltincache.h: @REBUILD@ stamp-icons -- $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) $(GTK_UPDATE_ICON_CACHE_MANIFEST) -- $(gtk_update_icon_cache_program) --force --ignore-theme-index \ -- --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ -- mv gtkbuiltincache.h.tmp gtkbuiltincache.h -+#gtkbuiltincache.h: @REBUILD@ stamp-icons -+# $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) $(GTK_UPDATE_ICON_CACHE_MANIFEST) -+# $(gtk_update_icon_cache_program) --force --ignore-theme-index \ -+# --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ -+# mv gtkbuiltincache.h.tmp gtkbuiltincache.h - - EXTRA_DIST += \ - $(STOCK_ICONS) \ diff --git a/patches/gtk+-2.18.7/gtk+-2.10.12-no-demos.diff b/patches/gtk+-2.18.7/gtk+-2.10.12-no-demos.diff deleted file mode 100644 index b8d131a..0000000 --- a/patches/gtk+-2.18.7/gtk+-2.10.12-no-demos.diff +++ /dev/null @@ -1,17 +0,0 @@ ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: b/Makefile.am -=================================================================== ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,7 +1,7 @@ - ## Makefile.am for GTK+ - include $(top_srcdir)/Makefile.decl - --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/patches/gtk+-2.18.7/series b/patches/gtk+-2.18.7/series deleted file mode 100644 index 3067390..0000000 --- a/patches/gtk+-2.18.7/series +++ /dev/null @@ -1,2 +0,0 @@ -gtk+-2.10.11-iconcache.diff -gtk+-2.10.12-no-demos.diff -- 1.7.7 -- ptxdist mailing list [email protected]
