diff options
| author |   Patrice Clement <monsieurp@gentoo.org> | 2017-10-30 23:22:11 +0100 |
|---|---|---|
| committer | Patrice Clement <monsieurp@gentoo.org> | 2017-10-30 23:24:29 +0100 |
| commit | 78ca36b4f62b9bbe20b48dd1bfaee7a2f984e085 (patch) | |
| tree | 682ddacec40f41180a95055f293756e71c3fbd61 /x11-libs/gtk+ | |
| parent | sys-apps/fakeroot: stable 1.22 for sparc, bug #635850 (thanks to Rolf Eike Beer) (diff) | |
| download | gentoo-78ca36b4f62b9bbe20b48dd1bfaee7a2f984e085.tar.gz gentoo-78ca36b4f62b9bbe20b48dd1bfaee7a2f984e085.tar.bz2 gentoo-78ca36b4f62b9bbe20b48dd1bfaee7a2f984e085.zip | |
*/*: revert https://github.com/gentoo/gentoo/pull/5828.
This commit adds back the string of commits from PR 5828.
Diffstat (limited to 'x11-libs/gtk+')
| -rw-r--r-- | x11-libs/gtk+/files/gtk+-2.24.27-update-icon-cache.patch | 64 |
1 files changed, 64 insertions, 0 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 new file mode 100644 index 000000000000..f88e02e53500 --- /dev/null +++ b/x11-libs/gtk+/files/gtk+-2.24.27-update-icon-cache.patch @@ -0,0 +1,64 @@ +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 + |