fix build with gtk+-2.4

5 files changed, 34 insertions, 6 deletions

diff --git a/x11-themes/gtk-theme-switch/ChangeLog b/x11-themes/gtk-theme-switch/ChangeLog
index aedb82a618a9..7c0e630a4862 100644
--- a/x11-themes/gtk-theme-switch/ChangeLog
+++ b/x11-themes/gtk-theme-switch/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-themes/gtk-theme-switch
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-theme-switch/ChangeLog,v 1.8 2004/03/14 00:47:11 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-theme-switch/ChangeLog,v 1.9 2004/03/25 23:48:27 foser Exp $
+
+  26 Mar 2004; foser <foser@gentoo.org> gtk-theme-switch-2*.ebuild :
+  Fix build with gtk+-2.4 (#45105)
 
   13 Mar 2004; Stephen P. Becker <geoman@gentoo.org>
   gtk-theme-switch-2.0.0_rc2-r1.ebuild:
diff --git a/x11-themes/gtk-theme-switch/Manifest b/x11-themes/gtk-theme-switch/Manifest
index 3d7d25c3cf41..c3ee9fc4116d 100644
--- a/x11-themes/gtk-theme-switch/Manifest
+++ b/x11-themes/gtk-theme-switch/Manifest
@@ -1,8 +1,9 @@
-MD5 6332cdd09340330e20e7c327802b8e0e gtk-theme-switch-2.0.0_rc2-r1.ebuild 773
+MD5 4976e4a30d4986e42e0624d1f11d4b87 gtk-theme-switch-2.0.0_rc2-r1.ebuild 860
 MD5 c2cf62fde435eee2feac8d1f8b31210c gtk-theme-switch-1.0.1-r1.ebuild 956
-MD5 e36b38893514560b5ff05a160a72beb9 gtk-theme-switch-2.0.0_rc2.ebuild 634
-MD5 dd6b8135ddf696343a47e894f61ac981 ChangeLog 1871
+MD5 7c16a0cf72727edd940c5f7f18591f8c gtk-theme-switch-2.0.0_rc2.ebuild 753
+MD5 e8e2321e5b88288013df91e22df83ebc ChangeLog 1975
 MD5 7000e172c2ce823ee4e26aabb932616d gtk-theme-switch-1.0.1.ebuild 831
+MD5 2fd14f20a592a23b3cba7552d0c74490 files/gtk-theme-switch-2.0.0_rc2-gtk+-2.4_fix.patch 360
 MD5 9c27caf3c3476d904e92231295d81214 files/digest-gtk-theme-switch-2.0.0_rc2 76
 MD5 a1e3741e017380e41ad84136abea9284 files/digest-gtk-theme-switch-2.0.0_rc2-r1 153
 MD5 1b4111aafbbc138e60a3b6b069d324a5 files/digest-gtk-theme-switch-1.0.1 73
diff --git a/x11-themes/gtk-theme-switch/files/gtk-theme-switch-2.0.0_rc2-gtk+-2.4_fix.patch b/x11-themes/gtk-theme-switch/files/gtk-theme-switch-2.0.0_rc2-gtk+-2.4_fix.patch
new file mode 100644
index 000000000000..637a984b753a
--- /dev/null
+++ b/x11-themes/gtk-theme-switch/files/gtk-theme-switch-2.0.0_rc2-gtk+-2.4_fix.patch
@@ -0,0 +1,11 @@
+--- Make.old	2004-03-24 19:20:49.450228544 -0800
++++ Makefile	2004-03-24 19:21:06.603620832 -0800
+@@ -2,7 +2,7 @@
+ PREFIX=/usr/local
+ CFLAGS = -O2 -Wall $(shell pkg-config --cflags gtk+-2.0)
+ LIBS = $(shell pkg-config --libs gtk+-2.0)
+-CFLAGS += -DGTK_DISABLE_BROKEN -DGTK_DISABLE_DEPRECATED
++CFLAGS += -DGTK_DISABLE_BROKEN 
+ 
+ VERSION = 2.0.0rc2
+ all: switch
diff --git a/x11-themes/gtk-theme-switch/gtk-theme-switch-2.0.0_rc2-r1.ebuild b/x11-themes/gtk-theme-switch/gtk-theme-switch-2.0.0_rc2-r1.ebuild
index a49f99eb783e..83e4d4de997e 100644
--- a/x11-themes/gtk-theme-switch/gtk-theme-switch-2.0.0_rc2-r1.ebuild
+++ b/x11-themes/gtk-theme-switch/gtk-theme-switch-2.0.0_rc2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-theme-switch/gtk-theme-switch-2.0.0_rc2-r1.ebuild,v 1.5 2004/03/14 00:47:11 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-theme-switch/gtk-theme-switch-2.0.0_rc2-r1.ebuild,v 1.6 2004/03/25 23:48:27 foser Exp $
 
 MY_P=${P/_/}
 S=${WORKDIR}/${MY_P}
@@ -19,6 +19,10 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${WORKDIR}/${MY_P}b.patch
+
+	# fix compilation with gtk+-2.4 (#45105)
+	epatch ${FILESDIR}/${P}-gtk+-2.4_fix.patch
+
 }
 
 src_compile() {
diff --git a/x11-themes/gtk-theme-switch/gtk-theme-switch-2.0.0_rc2.ebuild b/x11-themes/gtk-theme-switch/gtk-theme-switch-2.0.0_rc2.ebuild
index 7d274b42266c..78789d318f22 100644
--- a/x11-themes/gtk-theme-switch/gtk-theme-switch-2.0.0_rc2.ebuild
+++ b/x11-themes/gtk-theme-switch/gtk-theme-switch-2.0.0_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-theme-switch/gtk-theme-switch-2.0.0_rc2.ebuild,v 1.10 2004/02/22 22:41:36 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-theme-switch/gtk-theme-switch-2.0.0_rc2.ebuild,v 1.11 2004/03/25 23:48:27 foser Exp $
 
 MY_P=${P/_/}
 S=${WORKDIR}/${MY_P}
@@ -13,6 +13,15 @@ DEPEND="=x11-libs/gtk+-2*"
 SLOT="2"
 KEYWORDS="x86 ppc sparc alpha"
 
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+	# Fix build with gtk+-2.4 (#45105)
+	epatch ${FILESDIR}/${P}-gtk+-2.4_fix.patch
+
+}
+
 src_compile() {
 	make || die
 }