| 1 |
commit: 4588a9b756645daac4bcb633014da3ea85e13961 |
| 2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Oct 1 13:38:12 2017 +0000 |
| 4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Oct 30 21:26:22 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4588a9b7 |
| 7 |
|
| 8 |
x11-libs/gtk+: remove unused patch. |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/5828 |
| 11 |
|
| 12 |
.../files/gtk+-2.24.27-update-icon-cache.patch | 64 ---------------------- |
| 13 |
1 file changed, 64 deletions(-) |
| 14 |
|
| 15 |
diff --git a/x11-libs/gtk+/files/gtk+-2.24.27-update-icon-cache.patch b/x11-libs/gtk+/files/gtk+-2.24.27-update-icon-cache.patch |
| 16 |
deleted file mode 100644 |
| 17 |
index f88e02e5350..00000000000 |
| 18 |
--- a/x11-libs/gtk+/files/gtk+-2.24.27-update-icon-cache.patch |
| 19 |
+++ /dev/null |
| 20 |
@@ -1,64 +0,0 @@ |
| 21 |
-From 2537d97e4685767ce22834c0dd24d37ba715fb52 Mon Sep 17 00:00:00 2001 |
| 22 |
-From: Gilles Dartiguelongue <eva@g.o> |
| 23 |
-Date: Sat, 9 May 2015 23:30:58 +0200 |
| 24 |
-Subject: [PATCH] Always use external gtk-update-icon-cache |
| 25 |
- |
| 26 |
---- |
| 27 |
- configure.ac | 8 +++----- |
| 28 |
- gtk/Makefile.am | 13 ++----------- |
| 29 |
- 2 files changed, 5 insertions(+), 16 deletions(-) |
| 30 |
- |
| 31 |
-diff --git a/configure.ac b/configure.ac |
| 32 |
-index 2671a3d..fa46004 100644 |
| 33 |
---- a/configure.ac |
| 34 |
-+++ b/configure.ac |
| 35 |
-@@ -913,11 +913,9 @@ dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling |
| 36 |
- |
| 37 |
- AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes) |
| 38 |
- |
| 39 |
--if test $cross_compiling = yes; then |
| 40 |
-- AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache, no) |
| 41 |
-- if test x$GTK_UPDATE_ICON_CACHE = xno; then |
| 42 |
-- REBUILD_PNGS=# |
| 43 |
-- fi |
| 44 |
-+AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache, no) |
| 45 |
-+if test x$GTK_UPDATE_ICON_CACHE = xno; then |
| 46 |
-+ REBUILD_PNGS=# |
| 47 |
- fi |
| 48 |
- |
| 49 |
- AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no) |
| 50 |
-diff --git a/gtk/Makefile.am b/gtk/Makefile.am |
| 51 |
-index 248220d..42e4c23 100644 |
| 52 |
---- a/gtk/Makefile.am |
| 53 |
-+++ b/gtk/Makefile.am |
| 54 |
-@@ -1039,8 +1039,7 @@ endif |
| 55 |
- # Installed tools |
| 56 |
- # |
| 57 |
- bin_PROGRAMS = \ |
| 58 |
-- gtk-query-immodules-2.0 \ |
| 59 |
-- gtk-update-icon-cache |
| 60 |
-+ gtk-query-immodules-2.0 |
| 61 |
- |
| 62 |
- bin_SCRIPTS = gtk-builder-convert |
| 63 |
- |
| 64 |
-@@ -1390,16 +1389,8 @@ stamp-icons: $(STOCK_ICONS) |
| 65 |
- ) done \ |
| 66 |
- && touch stamp-icons |
| 67 |
- |
| 68 |
--if CROSS_COMPILING |
| 69 |
--gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE) |
| 70 |
--else |
| 71 |
--gtk_update_icon_cache_program = \ |
| 72 |
-- ./gtk-update-icon-cache |
| 73 |
--endif |
| 74 |
-- |
| 75 |
- gtkbuiltincache.h: @REBUILD@ stamp-icons |
| 76 |
-- $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) |
| 77 |
-- $(gtk_update_icon_cache_program) --force --ignore-theme-index \ |
| 78 |
-+ $(GTK_UPDATE_ICON_CACHE) --force --ignore-theme-index \ |
| 79 |
- --include-image-data \ |
| 80 |
- --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ |
| 81 |
- mv gtkbuiltincache.h.tmp gtkbuiltincache.h |
| 82 |
--- |
| 83 |
-2.3.6 |
| 84 |
- |
Archives