gtk+-2.24.31-update-icon-cache.patch (2504B)
1 From 260f94f3914ba18a256e6f1c222f643a57854e80 Mon Sep 17 00:00:00 2001 2 From: Gilles Dartiguelongue <eva@gentoo.org> 3 Date: Sat, 9 May 2015 23:30:58 +0200 4 Subject: [PATCH] Always use external gtk-update-icon-cache 5 6 --- 7 configure.ac | 8 +++----- 8 docs/reference/gtk/Makefile.am | 2 +- 9 gtk/Makefile.am | 13 ++----------- 10 3 files changed, 6 insertions(+), 17 deletions(-) 11 12 diff --git a/configure.ac b/configure.ac 13 index 4e11b40..7ef8cb6 100644 14 --- a/configure.ac 15 +++ b/configure.ac 16 @@ -913,11 +913,9 @@ dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling 17 18 AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes) 19 20 -if test $cross_compiling = yes; then 21 - AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache, no) 22 - if test x$GTK_UPDATE_ICON_CACHE = xno; then 23 - REBUILD_PNGS=# 24 - fi 25 +AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache, no) 26 +if test x$GTK_UPDATE_ICON_CACHE = xno; then 27 + REBUILD_PNGS=# 28 fi 29 30 AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no) 31 diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am 32 index c239445..60b5265 100644 33 --- a/docs/reference/gtk/Makefile.am 34 +++ b/docs/reference/gtk/Makefile.am 35 @@ -368,7 +368,7 @@ EXTRA_DIST += version.xml.in 36 37 if ENABLE_MAN 38 39 -man_MANS = gtk-query-immodules-2.0.1 gtk-update-icon-cache.1 gtk-builder-convert.1 40 +man_MANS = gtk-query-immodules-2.0.1 gtk-builder-convert.1 41 42 %.1 : %.xml 43 @XSLTPROC@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< 44 diff --git a/gtk/Makefile.am b/gtk/Makefile.am 45 index 8cc4536..a7afbf3 100644 46 --- a/gtk/Makefile.am 47 +++ b/gtk/Makefile.am 48 @@ -1087,8 +1087,7 @@ endif 49 # Installed tools 50 # 51 bin_PROGRAMS = \ 52 - gtk-query-immodules-2.0 \ 53 - gtk-update-icon-cache 54 + gtk-query-immodules-2.0 55 56 bin_SCRIPTS = gtk-builder-convert 57 58 @@ -1438,16 +1437,8 @@ stamp-icons: $(STOCK_ICONS) 59 ) done \ 60 && touch stamp-icons 61 62 -if CROSS_COMPILING 63 -gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE) 64 -else 65 -gtk_update_icon_cache_program = \ 66 - ./gtk-update-icon-cache 67 -endif 68 - 69 gtkbuiltincache.h: @REBUILD@ stamp-icons 70 - $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) 71 - $(gtk_update_icon_cache_program) --force --ignore-theme-index \ 72 + $(GTK_UPDATE_ICON_CACHE) --force --ignore-theme-index \ 73 --include-image-data \ 74 --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ 75 mv gtkbuiltincache.h.tmp gtkbuiltincache.h 76 -- 77 2.10.0 78