73 lines
3.7 KiB
Diff
73 lines
3.7 KiB
Diff
diff -up gtk+-2.24.26/docs/reference/gtk/gtk-update-icon-cache.xml.icon-cache gtk+-2.24.26/docs/reference/gtk/gtk-update-icon-cache.xml
|
|
--- gtk+-2.24.26/docs/reference/gtk/gtk-update-icon-cache.xml.icon-cache 2014-09-29 16:02:16.000000000 -0400
|
|
+++ gtk+-2.24.26/docs/reference/gtk/gtk-update-icon-cache.xml 2015-02-19 21:06:03.858297553 -0500
|
|
@@ -19,11 +19,8 @@
|
|
<command>gtk-update-icon-cache</command>
|
|
<arg choice="opt">--force</arg>
|
|
<arg choice="opt">--ignore-theme-index</arg>
|
|
-<group>
|
|
- <arg choice="plain">--index-only</arg>
|
|
- <arg choice="plain">--include-image-data</arg>
|
|
-</group>
|
|
-<arg choice="opt">--source <arg choice="plain"><replaceable>NAME</replaceable></arg></arg>
|
|
+<arg choice="opt">--index-only</arg>
|
|
+<arg choice="opt">--source<arg>name</arg></arg>
|
|
<arg choice="opt">--quiet</arg>
|
|
<arg choice="opt">--validate</arg>
|
|
<arg choice="req">iconpath</arg>
|
|
@@ -74,12 +71,6 @@ multiple applications, the overall memor
|
|
</para></listitem>
|
|
</varlistentry>
|
|
|
|
- <varlistentry>
|
|
- <term>--include-image-data</term>
|
|
- <listitem><para>Include image data in the cache.
|
|
- </para></listitem>
|
|
- </varlistentry>
|
|
-
|
|
<varlistentry>
|
|
<term>--source</term>
|
|
<term>-c</term>
|
|
diff -up gtk+-2.24.26/gtk/Makefile.am.icon-cache gtk+-2.24.26/gtk/Makefile.am
|
|
--- gtk+-2.24.26/gtk/Makefile.am.icon-cache 2015-02-19 21:06:03.859297565 -0500
|
|
+++ gtk+-2.24.26/gtk/Makefile.am 2015-02-19 21:07:17.775156092 -0500
|
|
@@ -1400,7 +1400,6 @@ endif
|
|
gtkbuiltincache.h: @REBUILD@ stamp-icons
|
|
$(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT)
|
|
$(gtk_update_icon_cache_program) --force --ignore-theme-index \
|
|
- --include-image-data \
|
|
--source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \
|
|
mv gtkbuiltincache.h.tmp gtkbuiltincache.h
|
|
|
|
diff -up gtk+-2.24.26/gtk/Makefile.in.icon-cache gtk+-2.24.26/gtk/Makefile.in
|
|
--- gtk+-2.24.26/gtk/Makefile.in.icon-cache 2015-02-19 21:06:03.861297588 -0500
|
|
+++ gtk+-2.24.26/gtk/Makefile.in 2015-02-19 21:07:49.894529160 -0500
|
|
@@ -5713,7 +5713,6 @@ stamp-icons: $(STOCK_ICONS)
|
|
gtkbuiltincache.h: @REBUILD@ stamp-icons
|
|
$(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT)
|
|
$(gtk_update_icon_cache_program) --force --ignore-theme-index \
|
|
- --include-image-data \
|
|
--source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \
|
|
mv gtkbuiltincache.h.tmp gtkbuiltincache.h
|
|
|
|
diff -up gtk+-2.24.26/gtk/updateiconcache.c.icon-cache gtk+-2.24.26/gtk/updateiconcache.c
|
|
--- gtk+-2.24.26/gtk/updateiconcache.c.icon-cache 2014-09-29 16:02:17.000000000 -0400
|
|
+++ gtk+-2.24.26/gtk/updateiconcache.c 2015-02-19 21:06:03.859297565 -0500
|
|
@@ -46,7 +46,7 @@
|
|
static gboolean force_update = FALSE;
|
|
static gboolean ignore_theme_index = FALSE;
|
|
static gboolean quiet = FALSE;
|
|
-static gboolean index_only = TRUE;
|
|
+static gboolean index_only = FALSE;
|
|
static gboolean validate = FALSE;
|
|
static gchar *var_name = "-";
|
|
|
|
@@ -1659,7 +1659,6 @@ static GOptionEntry args[] = {
|
|
{ "force", 'f', 0, G_OPTION_ARG_NONE, &force_update, N_("Overwrite an existing cache, even if up to date"), NULL },
|
|
{ "ignore-theme-index", 't', 0, G_OPTION_ARG_NONE, &ignore_theme_index, N_("Don't check for the existence of index.theme"), NULL },
|
|
{ "index-only", 'i', 0, G_OPTION_ARG_NONE, &index_only, N_("Don't include image data in the cache"), NULL },
|
|
- { "include-image-data", 0, G_OPTION_FLAG_REVERSE, G_OPTION_ARG_NONE, &index_only, N_("Include image data in the cache"), NULL },
|
|
{ "source", 'c', 0, G_OPTION_ARG_STRING, &var_name, N_("Output a C header file"), "NAME" },
|
|
{ "quiet", 'q', 0, G_OPTION_ARG_NONE, &quiet, N_("Turn off verbose output"), NULL },
|
|
{ "validate", 'v', 0, G_OPTION_ARG_NONE, &validate, N_("Validate existing icon cache"), NULL },
|