Gentoo Archives: gentoo-commits

From: "Gilles Dartiguelongue (eva)" <eva@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-themes/gtk-chtheme/files: gtk-chtheme-0.3.1-asneeded.patch gtk-chtheme-0.3.1-qgtkstyle.patch
Date: Wed, 25 Feb 2009 23:56:56
Message-Id: E1LcTcU-0004L2-Dl@stork.gentoo.org
1 eva 09/02/25 23:56:54
2
3 Added: gtk-chtheme-0.3.1-asneeded.patch
4 gtk-chtheme-0.3.1-qgtkstyle.patch
5 Log:
6 Bump to 0.3.1-r2. Fix forced as-needed, bug #248655. Make it work with qgtkstyle, bug #250504.
7 (Portage version: 2.2_rc23/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 x11-themes/gtk-chtheme/files/gtk-chtheme-0.3.1-asneeded.patch
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-themes/gtk-chtheme/files/gtk-chtheme-0.3.1-asneeded.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-themes/gtk-chtheme/files/gtk-chtheme-0.3.1-asneeded.patch?rev=1.1&content-type=text/plain
14
15 Index: gtk-chtheme-0.3.1-asneeded.patch
16 ===================================================================
17 # LDFLAGS is for linker flags, not libraries
18 # Fixes issue with forced --as-needed
19 #
20 # https://bugs.gentoo.org/show_bug.cgi?id=248655
21 --- a/Makefile 2009-02-26 00:43:54.000000000 +0100
22 +++ b/Makefile 2009-02-26 00:43:32.000000000 +0100
23 @@ -2,7 +2,7 @@
24
25 CFLAGS := $(if $(RPM_OPT_FLAGS), $(RPM_OPT_FLAGS), $(CFLAGS))
26
27 -LDFLAGS = $(shell pkg-config --libs gtk+-2.0)
28 +LIBS = $(shell pkg-config --libs gtk+-2.0)
29 CFLAGS += -Wall
30 CFLAGS += $(shell pkg-config --cflags gtk+-2.0) -DGTK_DISABLE_BROKEN
31 CFLAGS += -DPROJNAME='"$(PROJNAME)"' -DVERSION='"$(VERSION)"'
32 @@ -17,7 +17,7 @@
33 all: $(EXENAME) $(EXENAME).1
34
35 $(EXENAME): $(addsuffix .o, $(SRC))
36 - $(CC) $(LDFLAGS) $^ -o $@
37 + $(CC) $(LDFLAGS) $^ $(LIBS) -o $@
38
39 $(EXENAME).1: $(EXENAME).pod
40 pod2man $< | sed 's/^\.TH .*/.TH $(EXENAME) 1/' > $@
41
42
43
44 1.1 x11-themes/gtk-chtheme/files/gtk-chtheme-0.3.1-qgtkstyle.patch
45
46 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-themes/gtk-chtheme/files/gtk-chtheme-0.3.1-qgtkstyle.patch?rev=1.1&view=markup
47 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-themes/gtk-chtheme/files/gtk-chtheme-0.3.1-qgtkstyle.patch?rev=1.1&content-type=text/plain
48
49 Index: gtk-chtheme-0.3.1-qgtkstyle.patch
50 ===================================================================
51 # Make gtk-chtheme work with qgtkstyle
52 # https://bugs.gentoo.org/show_bug.cgi?id=250504
53 --- a/main.c 2004-02-09 06:33:28.000000000 +0200
54 +++ b/main.c 2008-12-10 12:47:42.000000000 +0200
55 @@ -97,6 +97,7 @@
56 fprintf(gtkrc_fh, "gtk-font-name=\"%s\"\n\n", font);
57 }
58
59 + fprintf(gtkrc_fh, "gtk-theme-name = \"%s\"\n\n", themename);
60 fprintf(gtkrc_fh, "include \"%s/.gtkrc.mine\"\n\n", getenv("HOME"));
61 fprintf(gtkrc_fh, "# -- THEME AUTO-WRITTEN DO NOT EDIT\n");
62 fclose(gtkrc_fh);