add patch

5 files changed, 99 insertions, 3 deletions

diff --git a/x11-themes/ximian-artwork/ChangeLog b/x11-themes/ximian-artwork/ChangeLog
index a3f2fbc8c1d2..3f0c2f971187 100644
--- a/x11-themes/ximian-artwork/ChangeLog
+++ b/x11-themes/ximian-artwork/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-themes/ximian-artwork
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/ximian-artwork/ChangeLog,v 1.3 2003/06/24 21:49:30 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/ximian-artwork/ChangeLog,v 1.4 2003/08/11 00:23:08 foser Exp $
+
+*ximian-artwork-0.2.26.0.6.1-r1 (11 Aug 2003)
+
+  11 Aug 2003; foser <foser@gentoo.org> ximian-artwork-0.2.26.0.6.1.-r1.ebuild : 
+  Add patch for sodipodi ruler corruption bug (#23258)
 
   24 Jun 2003; Martin Holzer <mholzer@gentoo.org>
   ximian-artwork-0.2.26.0.6.1.ebuild:
diff --git a/x11-themes/ximian-artwork/Manifest b/x11-themes/ximian-artwork/Manifest
index b50475767e10..37cbac1085a4 100644
--- a/x11-themes/ximian-artwork/Manifest
+++ b/x11-themes/ximian-artwork/Manifest
@@ -1,6 +1,6 @@
-MD5 9618726927e9926cac9e0aa2dd2d0c9a ximian-artwork-0.2.26.0.6.1-r1.ebuild 2137
+MD5 6d7fbbaf5a04507f4ae0cd60ec6fbf90 ximian-artwork-0.2.26.0.6.1-r1.ebuild 2138
 MD5 a33df014d63916d03033bc98c3010f42 ximian-artwork-0.2.26.0.6.1.ebuild 2048
-MD5 52d27c537e7a50d5ca6a80942b01fa3d ChangeLog 769
+MD5 138d8e18c7ee01ca473613f79a87ff02 ChangeLog 952
 MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219
 MD5 a733ce592710282d7d68dceedcf32d00 files/ximian-artwork-0.2.26-gdm.patch 520
 MD5 4c7e2c510200a7fcf63d66700ada089c files/digest-ximian-artwork-0.2.26.0.6.1-r1 88
diff --git a/x11-themes/ximian-artwork/files/digest-ximian-artwork-0.2.26.0.6.1-r1 b/x11-themes/ximian-artwork/files/digest-ximian-artwork-0.2.26.0.6.1-r1
new file mode 100644
index 000000000000..a1ce210ee463
--- /dev/null
+++ b/x11-themes/ximian-artwork/files/digest-ximian-artwork-0.2.26.0.6.1-r1
@@ -0,0 +1 @@
+MD5 40a4b551cab97860eead3cff519e7278 ximian-artwork-0.2.26-0.ximian.6.1.src.rpm 3818278
diff --git a/x11-themes/ximian-artwork/files/ximian-artwork-0.2.26-corruption_fix.patch b/x11-themes/ximian-artwork/files/ximian-artwork-0.2.26-corruption_fix.patch
new file mode 100644
index 000000000000..20065c3331ea
--- /dev/null
+++ b/x11-themes/ximian-artwork/files/ximian-artwork-0.2.26-corruption_fix.patch
@@ -0,0 +1,17 @@
+diff -uNr ximian-artwork-0.2.26/gtk/gtk2-engine/industrial_style.c ximian-artwork-0.2.26.patched/gtk/gtk2-engine/industrial_style.c
+--- ximian-artwork-0.2.26/gtk/gtk2-engine/industrial_style.c	2003-05-19 23:34:47.000000000 +0200
++++ ximian-artwork-0.2.26.patched/gtk/gtk2-engine/industrial_style.c	2003-08-11 02:23:35.000000000 +0200
+@@ -1242,9 +1242,11 @@
+ 	       gint           height,
+ 	       gboolean       fill)
+ {
+-  if (shadow_type == GTK_SHADOW_NONE)
++  if (shadow_type == GTK_SHADOW_NONE) {
++	parent_class->draw_flat_box (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
+     return;
+-  
++}
++
+   g_return_if_fail (style != NULL);
+   g_return_if_fail (window != NULL);
+ 
diff --git a/x11-themes/ximian-artwork/ximian-artwork-0.2.26.0.6.1-r1.ebuild b/x11-themes/ximian-artwork/ximian-artwork-0.2.26.0.6.1-r1.ebuild
new file mode 100644
index 000000000000..f28452866c06
--- /dev/null
+++ b/x11-themes/ximian-artwork/ximian-artwork-0.2.26.0.6.1-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/ximian-artwork/ximian-artwork-0.2.26.0.6.1-r1.ebuild,v 1.1 2003/08/11 00:23:08 foser Exp $
+
+inherit eutils rpm
+
+# bash magic to extract last 2 versions as XIMIAN_V, 
+# third last version as RPM_V and the rest as MY_PV
+MY_PV=${PV%.[0-9]*.[0-9]*.[0-9]*}
+END_V=${PV/${MY_PV}./}
+RPM_V=${END_V%.[0-9]*.[0-9]*}
+XIMIAN_V=${END_V#[0-9]*.}
+
+DESCRIPTION="Ximian Desktop's GTK, Galeon, GDM, Metacity, Nautilus, XMMS themes, icons and cursors."
+HOMEPAGE="http://www.ximian.com/xd2/"
+SRC_URI="ftp://ftp.ximian.com/pub/xd2/redhat-9-i386/source/${PN}-${MY_PV}-${RPM_V}.ximian.${XIMIAN_V}.src.rpm"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="xmms"
+
+# until we can do mutliple dep on one package, it'll be >=x11-libs/gtk+-1.2
+# even though we want =x11-libs/gtk+-1.2 and >=x11-libs/gtk+-2
+DEPEND="sys-devel/autoconf
+	sys-devel/automake
+	app-arch/rpm2targz
+	>=media-libs/gdk-pixbuf-0.2.5
+	>=x11-libs/gtk+-1.2"
+
+# Because one may only want to use the theme with kde OR gtk OR Metacity
+# OR gdm, we don't want any run-time dependencies...
+RDEPEND=""
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+#src_unpack() {
+#	cd ${WORKDIR}
+#	rpm2targz ${DISTDIR}/${A}
+#	tar xzf ${PN}-${MY_PV}-${RPM_V}.ximian.${XIMIAN_V}.src.tar.gz
+#	tar xzf ${PN}-${MY_PV}.tar.gz
+#}
+
+src_unpack() {
+	rpm_src_unpack
+
+	epatch ${FILESDIR}/${PN}-0.2.26-corruption_fix.patch
+}
+
+src_compile() {
+	econf || die
+	emake || die
+}
+
+src_install () {
+	make DESTDIR=${D} install || die
+
+	# Removing trademarks
+	patch ${D}/usr/share/gdm/themes/industrial/industrial.xml < ${FILESDIR}/${PN}-${MY_PV}-gdm.patch || die "patch failed"
+	rm -f ${D}/usr/share/gdm/themes/industrial/xd2logo.png
+	rm -rf ${D}/usr/share/pixmaps/ximian
+	rm -f ${D}/usr/share/pixmaps/ximian-desktop-stripe.png
+	
+	# Moving cursors
+	dodir /usr/share/cursors/xfree/Industrial
+	mv ${D}/usr/share/icons/Industrial/cursors ${D}/usr/share/cursors/xfree/Industrial
+
+	# remove xmms skin if unneeded
+	[ -n "`use xmms`" ] || rm -rf ${D}/usr/share/xmms
+	
+	cd ${S}
+	dodoc COPYING ChangeLog
+}
+