add tested patch and mark stable

5 files changed, 37 insertions, 10 deletions

diff --git a/x11-libs/gtksourceview/ChangeLog b/x11-libs/gtksourceview/ChangeLog
index 4083101e8c67..3df12ae01b9a 100644
--- a/x11-libs/gtksourceview/ChangeLog
+++ b/x11-libs/gtksourceview/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/gtksourceview
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtksourceview/ChangeLog,v 1.10 2003/11/15 02:42:51 agriffis Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtksourceview/ChangeLog,v 1.11 2004/01/08 13:14:14 foser Exp $
+
+*gtksourceview-0.7.0-r1 (08 Jan 2004)
+
+  08 Jan 2004; foser <foser@gentoo.org> gtksourceview-0.7.0-r1.ebuild :
+  Added workaround patch for problem described in http://bugzilla.gnome.org/show_bug.cgi?id=120118
+  Testing with 2.3 series glib/gtk show this bug doesn't show there, so it can probably
+  be remove by then
 
   14 Nov 2003; Aron Griffis <agriffis@gentoo.org> gtksourceview-0.6.0.ebuild:
   Stable on ia64
diff --git a/x11-libs/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest
index 1f1c9fcff08f..6068024dc01e 100644
--- a/x11-libs/gtksourceview/Manifest
+++ b/x11-libs/gtksourceview/Manifest
@@ -1,10 +1,7 @@
 MD5 0e3d4b9d3a2abd2a90948b1ae3e2087f gtksourceview-0.6.0.ebuild 730
-MD5 9989b591377743c33aaa7b58d0c06d50 gtksourceview-0.7.0.ebuild 809
-MD5 32091b648975127427b17f14834782df gtksourceview-0.7.0-r1.ebuild 974
-MD5 fb36a0cfacccc8c67c62b62d25a899a3 ChangeLog 1336
+MD5 8c01da420d8719dcec2e69632a3f3e89 gtksourceview-0.7.0-r1.ebuild 976
+MD5 07769ea7cce920daf7130a248669f525 ChangeLog 1652
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 9d48eb7e7f723c9f9b2be960e63ab6a8 files/digest-gtksourceview-0.6.0 72
-MD5 1402eb2fe2d5eccbb5213a7e3979480e files/digest-gtksourceview-0.7.0 72
 MD5 886e09e6bf90b82fecec60f34e5a349d files/gtksourceview-0.6.0-border_fix.patch 479
-MD5 1dfb7706fb006369c13cd89dab13b449 files/gtksourceview-0.6.0-glib23_fix.patch 520
 MD5 1402eb2fe2d5eccbb5213a7e3979480e files/digest-gtksourceview-0.7.0-r1 72
diff --git a/x11-libs/gtksourceview/files/digest-gtksourceview-0.7.0 b/x11-libs/gtksourceview/files/digest-gtksourceview-0.7.0-r1
index caadb2e947ed..caadb2e947ed 100644
--- a/x11-libs/gtksourceview/files/digest-gtksourceview-0.7.0
+++ b/x11-libs/gtksourceview/files/digest-gtksourceview-0.7.0-r1
diff --git a/x11-libs/gtksourceview/files/gtksourceview-0.6.0-border_fix.patch b/x11-libs/gtksourceview/files/gtksourceview-0.6.0-border_fix.patch
new file mode 100644
index 000000000000..0499bdbb8934
--- /dev/null
+++ b/x11-libs/gtksourceview/files/gtksourceview-0.6.0-border_fix.patch
@@ -0,0 +1,12 @@
+diff -NurB gtksourceview-0.6.0-orig/gtksourceview/gtksourceview.c gtksourceview-0.6.0/gtksourceview/gtksourceview.c
+--- gtksourceview-0.6.0-orig/gtksourceview/gtksourceview.c	2003-10-01 08:08:20.000000000 -0500
++++ gtksourceview-0.6.0/gtksourceview/gtksourceview.c	2003-10-01 08:08:36.000000000 -0500
+@@ -975,7 +975,7 @@
+ 	{
+ 		gtk_text_view_set_border_window_size (GTK_TEXT_VIEW (text_view),
+ 						      GTK_TEXT_WINDOW_LEFT,
+-						      0);
++						      1);
+ 
+ 		return;
+ 	}
diff --git a/x11-libs/gtksourceview/gtksourceview-0.7.0.ebuild b/x11-libs/gtksourceview/gtksourceview-0.7.0-r1.ebuild
index a4ec9109084c..5ed678283f94 100644
--- a/x11-libs/gtksourceview/gtksourceview-0.7.0.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-0.7.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtksourceview/gtksourceview-0.7.0.ebuild,v 1.2 2003/12/07 09:29:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtksourceview/gtksourceview-0.7.0-r1.ebuild,v 1.1 2004/01/08 13:14:14 foser Exp $
 
 inherit gnome2
 
@@ -9,12 +9,13 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc hppa ~amd64"
+KEYWORDS="x86 ~ppc ~alpha ~sparc hppa ~amd64"
 IUSE="doc"
 
 RDEPEND=">=x11-libs/gtk+-2.2
 	>=dev-libs/libxml2-2.5
 	>=gnome-base/libgnomeprint-2.2"
+
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.27
 	dev-util/pkgconfig
@@ -24,3 +25,13 @@ DEPEND="${RDEPEND}
 G2CONF="${G2CONF} --disable-build-tests"
 
 DOCS="AUTHORS COPYING ChangeLog HACKING INSTALL MAINTAINERS NEWS README TODO"
+
+src_unpack() {
+
+	unpack ${A}
+
+	# workaround patch for http://bugzilla.gnome.org/show_bug.cgi?id=120118
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-0.6.0-border_fix.patch
+
+}