From: Robert Schwebel <r.schwebel@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Robert Schwebel <r.schwebel@pengutronix.de>
Subject: [ptxdist] [PATCH 28/28] gtk: clean up patches
Date: Sun, 30 Oct 2011 23:00:59 +0100 [thread overview]
Message-ID: <1320012059-24971-28-git-send-email-r.schwebel@pengutronix.de> (raw)
In-Reply-To: <1320012059-24971-1-git-send-email-r.schwebel@pengutronix.de>
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
.../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 <unknown.author@example.com>
+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 <unknown.author@example.com>
+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
ptxdist@pengutronix.de
prev parent reply other threads:[~2011-10-30 22:00 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-30 22:00 [ptxdist] Patch cleanup Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 01/28] canfestival: clean up patches Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 02/28] devicekit-disks: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 03/28] mplayer: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 04/28] policykit: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 05/28] sdl: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 06/28] sdl-mixer: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 07/28] atop: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 08/28] bing: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 09/28] bridge-utils: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 10/28] bzip2: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 11/28] cbmbasic: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 12/28] cpufrequtils: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 13/28] cvs: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 14/28] daemonize: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 15/28] dibbler: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 16/28] e2fsprogs: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 17/28] efax: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 18/28] eggdbus: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 19/28] elektra: remove orphaned package Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 20/28] etherwake: clean up patches Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 21/28] fakeroot: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 22/28] fbtest: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 23/28] font-alias: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 24/28] freetype: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 25/28] glademm: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 26/28] gpsd: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 27/28] gst-plugins-gl: " Robert Schwebel
2011-10-30 22:00 ` Robert Schwebel [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1320012059-24971-28-git-send-email-r.schwebel@pengutronix.de \
--to=r.schwebel@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox