summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger <m.mairkeimberger@gmail.com>2017-10-01 15:38:12 +0200
committerPatrice Clement <monsieurp@gentoo.org>2017-10-30 22:26:22 +0100
commit4588a9b756645daac4bcb633014da3ea85e13961 (patch)
tree909dff11bf65a80de316e502849b7df84f1cd549 /x11-libs
parentnet-misc/ssh-askpass-fullscreen: remove unused file. (diff)
downloadgentoo-4588a9b756645daac4bcb633014da3ea85e13961.tar.gz
gentoo-4588a9b756645daac4bcb633014da3ea85e13961.tar.bz2
gentoo-4588a9b756645daac4bcb633014da3ea85e13961.zip
x11-libs/gtk+: remove unused patch.
Closes: https://github.com/gentoo/gentoo/pull/5828
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/gtk+/files/gtk+-2.24.27-update-icon-cache.patch64
1 files changed, 0 insertions, 64 deletions
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
deleted file mode 100644
index f88e02e53500..000000000000
--- a/x11-libs/gtk+/files/gtk+-2.24.27-update-icon-cache.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 2537d97e4685767ce22834c0dd24d37ba715fb52 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sat, 9 May 2015 23:30:58 +0200
-Subject: [PATCH] Always use external gtk-update-icon-cache
-
----
- configure.ac | 8 +++-----
- gtk/Makefile.am | 13 ++-----------
- 2 files changed, 5 insertions(+), 16 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 2671a3d..fa46004 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -913,11 +913,9 @@ dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling
-
- AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
-
--if test $cross_compiling = yes; then
-- AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache, no)
-- if test x$GTK_UPDATE_ICON_CACHE = xno; then
-- REBUILD_PNGS=#
-- fi
-+AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache, no)
-+if test x$GTK_UPDATE_ICON_CACHE = xno; then
-+ REBUILD_PNGS=#
- fi
-
- AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no)
-diff --git a/gtk/Makefile.am b/gtk/Makefile.am
-index 248220d..42e4c23 100644
---- a/gtk/Makefile.am
-+++ b/gtk/Makefile.am
-@@ -1039,8 +1039,7 @@ endif
- # Installed tools
- #
- bin_PROGRAMS = \
-- gtk-query-immodules-2.0 \
-- gtk-update-icon-cache
-+ gtk-query-immodules-2.0
-
- bin_SCRIPTS = gtk-builder-convert
-
-@@ -1390,16 +1389,8 @@ stamp-icons: $(STOCK_ICONS)
- ) done \
- && touch stamp-icons
-
--if CROSS_COMPILING
--gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE)
--else
--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_program) --force --ignore-theme-index \
-+ $(GTK_UPDATE_ICON_CACHE) --force --ignore-theme-index \
- --include-image-data \
- --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \
- mv gtkbuiltincache.h.tmp gtkbuiltincache.h
---
-2.3.6
-