[gtk+/gtk-3-12] Revert "Include image data in the builtin icon cache"



commit 6f703f828b4d35e2a3a09904844c7ae66ef14214
Author: Lars Uebernickel <lars uebernickel canonical com>
Date:   Tue Aug 19 17:23:22 2014 +0200

    Revert "Include image data in the builtin icon cache"
    
    This reverts commit 46ac7e51d96c8ffb41c1c055fbe97474dcf096f8. It breaks
    the build by calling gtk-update-icon-cache with --include-image-data, an
    argument that doesn't exist in this branch.

 gtk/Makefile.am |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)
---
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 9369273..c281666 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1779,13 +1779,8 @@ else
        $(AM_V_at) $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT)
 endif
 endif
-       $(AM_V_GEN) $(gtk_update_icon_cache_program)    \
-               --quiet                                 \
-               --force                                 \
-               --ignore-theme-index                    \
-               --include-image-data                    \
-               --source builtin_icons stock-icons      \
-                       > gtkbuiltincache.h.tmp &&      \
+       $(AM_V_GEN) $(gtk_update_icon_cache_program) --quiet --force --ignore-theme-index               \
+          --source builtin_icons stock-icons > gtkbuiltincache.h.tmp &&        \
        mv gtkbuiltincache.h.tmp gtkbuiltincache.h
 
 EXTRA_DIST +=                   \


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]