fix issues with smooth engine & gtk 2.4

6 files changed, 28 insertions, 32 deletions

diff --git a/x11-themes/gnome-themes-extras/ChangeLog b/x11-themes/gnome-themes-extras/ChangeLog
index 94d5cbd3738d..a6a0a0d748bc 100644
--- a/x11-themes/gnome-themes-extras/ChangeLog
+++ b/x11-themes/gnome-themes-extras/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-themes/gnome-themes-extras
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes-extras/ChangeLog,v 1.11 2004/03/06 13:03:37 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes-extras/ChangeLog,v 1.12 2004/03/19 14:18:35 foser Exp $
+
+  19 Mar 2004; foser <foser@gentoo.org> gnome-themes-extras-*.ebuild :
+  Add patch for gtk+-2.4 (#44988)
 
 *gnome-themes-extras-0.6 (06 Mar 2004)
 
diff --git a/x11-themes/gnome-themes-extras/files/digest-gnome-themes-extras-0.4 b/x11-themes/gnome-themes-extras/files/digest-gnome-themes-extras-0.4
deleted file mode 100644
index b05dabbf095b..000000000000
--- a/x11-themes/gnome-themes-extras/files/digest-gnome-themes-extras-0.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4f78d8358aba27b22681beed969e8e7c gnome-themes-extras-0.4.tar.bz2 1720856
diff --git a/x11-themes/gnome-themes-extras/files/gnome-themes-extras-0-smooth_engine_gtk_2.4.patch b/x11-themes/gnome-themes-extras/files/gnome-themes-extras-0-smooth_engine_gtk_2.4.patch
new file mode 100644
index 000000000000..a06e8c0f12d9
--- /dev/null
+++ b/x11-themes/gnome-themes-extras/files/gnome-themes-extras-0-smooth_engine_gtk_2.4.patch
@@ -0,0 +1,12 @@
+diff -uNr gnome-themes-extras-0.6/Smooth/smooth_style.c gnome-themes-extras-0.6.patched/Smooth/smooth_style.c
+--- gnome-themes-extras-0.6/Smooth/smooth_style.c	2003-12-14 22:00:56.000000000 +0100
++++ gnome-themes-extras-0.6.patched/Smooth/smooth_style.c	2004-03-18 16:34:50.755088896 +0100
+@@ -707,7 +707,7 @@
+ {
+   g_return_if_fail(sanitize_parameters(style, window, &width, &height));
+ 
+-  if ((EDGE_LINE_STYLE(style,NULL) == SMOOTH_LINE_FLAT)  && DETAIL ("entry") && widget && (GTK_IS_SPIN_BUTTON (widget) || (widget->parent && GTK_IS_COMBO(widget->parent)))) 
++  if ((EDGE_LINE_STYLE(style,NULL) == SMOOTH_LINE_FLAT)  && DETAIL ("entry") && widget && (GTK_IS_SPIN_BUTTON (widget) || (widget->parent && GTK_IS_COMBO_BOX(widget->parent)))) 
+   {
+        gtk_paint_flat_box(style, window, widget->state, GTK_SHADOW_NONE, area, widget, "entry_bg", x, y, width, height);
+ 
diff --git a/x11-themes/gnome-themes-extras/gnome-themes-extras-0.4.ebuild b/x11-themes/gnome-themes-extras/gnome-themes-extras-0.4.ebuild
deleted file mode 100644
index 35f2cbcd2bfe..000000000000
--- a/x11-themes/gnome-themes-extras/gnome-themes-extras-0.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes-extras/gnome-themes-extras-0.4.ebuild,v 1.4 2004/01/16 21:23:30 darkspecter Exp $
-
-inherit gnome2
-
-DESCRIPTION="Additional themes for GNOME 2.2"
-HOMEPAGE="http://librsvg.sourceforge.net/theme.php"
-
-SLOT="0"
-KEYWORDS="x86 ~sparc ppc"
-IUSE=""
-LICENSE="LGPL-2.1 GPL-2 DSL"
-
-RDEPEND=">=x11-libs/gtk+-2"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.23"
-
-DOCS="AUTHORS ChangeLog MAINTAINERS README TODO"
-
-src_unpack() {
-	unpack ${A}
-	sed -e 's:gorilla-default:capplet-icons:' \
-		-i ${S}/Gorilla/gtk-2.0/iconrc.in \
-		-i ${S}/Gorilla/gtk-2.0/iconrc
-}
diff --git a/x11-themes/gnome-themes-extras/gnome-themes-extras-0.5.ebuild b/x11-themes/gnome-themes-extras/gnome-themes-extras-0.5.ebuild
index c056273fcd4f..4c62a7d71e12 100644
--- a/x11-themes/gnome-themes-extras/gnome-themes-extras-0.5.ebuild
+++ b/x11-themes/gnome-themes-extras/gnome-themes-extras-0.5.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/gnome-themes-extras/gnome-themes-extras-0.5.ebuild,v 1.4 2004/03/06 13:03:37 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes-extras/gnome-themes-extras-0.5.ebuild,v 1.5 2004/03/19 14:18:35 foser Exp $
 
 inherit gnome2
 
@@ -21,7 +21,11 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS ChangeLog MAINTAINERS README TODO"
 
 src_unpack() {
+
 	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-0-smooth_engine_gtk_2.4.patch
+
 	sed -e 's:gorilla-default:capplet-icons:' \
 		-i ${S}/Gorilla/gtk-2.0/iconrc.in \
 		-i ${S}/Gorilla/gtk-2.0/iconrc
diff --git a/x11-themes/gnome-themes-extras/gnome-themes-extras-0.6.ebuild b/x11-themes/gnome-themes-extras/gnome-themes-extras-0.6.ebuild
index f83b4cd796e9..8dc1a0e5277f 100644
--- a/x11-themes/gnome-themes-extras/gnome-themes-extras-0.6.ebuild
+++ b/x11-themes/gnome-themes-extras/gnome-themes-extras-0.6.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/gnome-themes-extras/gnome-themes-extras-0.6.ebuild,v 1.1 2004/03/06 13:03:37 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes-extras/gnome-themes-extras-0.6.ebuild,v 1.2 2004/03/19 14:18:35 foser Exp $
 
 inherit gnome2
 
@@ -21,7 +21,13 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS ChangeLog MAINTAINERS README TODO"
 
 src_unpack() {
+
 	unpack ${A}
+
+	cd ${S}
+	# fix issues with gtk+ 2.4 (#44988)
+	epatch ${FILESDIR}/${PN}-0-smooth_engine_gtk_2.4.patch
+
 	sed -e 's:gorilla-default:capplet-icons:' \
 		-i ${S}/Gorilla/gtk-2.0/iconrc.in \
 		-i ${S}/Gorilla/gtk-2.0/iconrc