Gentoo Archives: gentoo-commits

From: "Pacho Ramos (pacho)" <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/gtk+/files: gtk+-3.12.2-builtin-icon.patch
Date: Fri, 02 Jan 2015 11:53:09
Message-Id: 20150102115303.F325FEB62@oystercatcher.gentoo.org
1 pacho 15/01/02 11:53:03
2
3 Added: gtk+-3.12.2-builtin-icon.patch
4 Log:
5 Include image data in the builtin icon cache (#518352 by Leho Kraav, Rafał Mużyło and more), newer gdbus-codegen needed (#500216 by Vladimir Dolzhenko), unset DISPLAY to make tests work in more environments (#527682 by Gangræna Gorgeous, Mark Wright and Alexander Tsoy).
6
7 (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
8
9 Revision Changes Path
10 1.1 x11-libs/gtk+/files/gtk+-3.12.2-builtin-icon.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/files/gtk+-3.12.2-builtin-icon.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/files/gtk+-3.12.2-builtin-icon.patch?rev=1.1&content-type=text/plain
14
15 Index: gtk+-3.12.2-builtin-icon.patch
16 ===================================================================
17 From 46ac7e51d96c8ffb41c1c055fbe97474dcf096f8 Mon Sep 17 00:00:00 2001
18 From: Matthias Clasen <mclasen@××××××.com>
19 Date: Fri, 15 Aug 2014 10:37:05 -0400
20 Subject: Include image data in the builtin icon cache
21
22
23 diff --git a/gtk/Makefile.am b/gtk/Makefile.am
24 index c281666..9369273 100644
25 --- a/gtk/Makefile.am
26 +++ b/gtk/Makefile.am
27 @@ -1779,8 +1779,13 @@ else
28 $(AM_V_at) $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT)
29 endif
30 endif
31 - $(AM_V_GEN) $(gtk_update_icon_cache_program) --quiet --force --ignore-theme-index \
32 - --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \
33 + $(AM_V_GEN) $(gtk_update_icon_cache_program) \
34 + --quiet \
35 + --force \
36 + --ignore-theme-index \
37 + --include-image-data \
38 + --source builtin_icons stock-icons \
39 + > gtkbuiltincache.h.tmp && \
40 mv gtkbuiltincache.h.tmp gtkbuiltincache.h
41
42 EXTRA_DIST += \
43 --
44 cgit v0.10.1