x11-libs/gtk+extra: add patches to fix segfaults, see bug #219777

Package-Manager: portage-2.1.5.2

5 files changed, 80 insertions, 3 deletions

diff --git a/x11-libs/gtk+extra/ChangeLog b/x11-libs/gtk+extra/ChangeLog
index 468aae729532..c9d4d977a3e5 100644
--- a/x11-libs/gtk+extra/ChangeLog
+++ b/x11-libs/gtk+extra/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/gtk+extra
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+extra/ChangeLog,v 1.20 2007/07/08 16:52:02 remi Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+extra/ChangeLog,v 1.21 2008/05/31 13:13:56 remi Exp $
+
+*gtk+extra-2.1.1-r2 (31 May 2008)
+
+  31 May 2008; Rémi Cardona <remi@gentoo.org>
+  +files/gtk+extra-2.1.1-fix-row-deletion-segfault.patch,
+  +files/gtk+extra-2.1.1-glib2.10-full-fix.patch,
+  +gtk+extra-2.1.1-r2.ebuild:
+  add patches to fix segfaults, see bug #219777
 
   08 Jul 2007; Remi Cardona <remi@gentoo.org> -gtk+extra-0.99.17.ebuild:
   punt old version 0.99.17 (see bug 160195)
diff --git a/x11-libs/gtk+extra/Manifest b/x11-libs/gtk+extra/Manifest
index 4e5f6d56d36c..45bfad508299 100644
--- a/x11-libs/gtk+extra/Manifest
+++ b/x11-libs/gtk+extra/Manifest
@@ -1,6 +1,9 @@
+AUX gtk+extra-2.1.1-fix-row-deletion-segfault.patch 523 RMD160 15fefdff6aa61a76f9c24618be6ad8983eccb4bc SHA1 61d83ff86d540e492f77960bafd88d10d9aad980 SHA256 0495dc3d3692c422c91c297370e99de97cdba6326cacfcbbc93ea8acf8ae8261
+AUX gtk+extra-2.1.1-glib2.10-full-fix.patch 631 RMD160 325bc963e2bb1ce46d4a56911a6e0d756c2f7f2a SHA1 893e9d338c125375ff643057cd134f9b1bddceaa SHA256 a81388ef0379079fb3be32ebfd8c3e1dc529b847eb6264396f26632a45dba4f1
 AUX gtk+extra-2.1.1-glib2.10.patch 433 RMD160 c82be271daea458f6bc32c7714bcf30f2d756e37 SHA1 d6ae84aa168b3b525d5e4163c222afeffee79e57 SHA256 2c6100e0a4215d0602335cf42347c9cc35b8639fe22f7e458748c847872d87f4
 DIST gtk+extra-2.1.1.tar.gz 893481 RMD160 7134fe4c5aaaa45ee3a7e651f3c477ba7c477214 SHA1 94d7ae9cb3aef05159cfff148265fc9ce0973980 SHA256 82d179fd2eb3fd5acbc9fc4d74507c559c6bc3269c488dc8642f9bca47a5dbe4
 EBUILD gtk+extra-2.1.1-r1.ebuild 687 RMD160 603b1a91b6d6e2d0a8848f3ca54b40197e20d1b3 SHA1 8456a442a05c992a6cd8b8538e8d8d433c6e477b SHA256 7ec7bf9b6c64766ca37d1b46cb3aabb2e44675cf9c182e465029337efb4118ac
+EBUILD gtk+extra-2.1.1-r2.ebuild 815 RMD160 feba17712dd12143c196999e6c1b0cc6cb12a618 SHA1 26c345e29e818f20abb3c49a29085742dc47637c SHA256 8a3d38e70eccb7438865513924877dc77d64f910ca617056dcf751d3551fa880
 EBUILD gtk+extra-2.1.1.ebuild 596 RMD160 3528d39890be7f82a1664ac1d3c76b93b22a31d4 SHA1 0382a4aa01ca7387a4c48b01acbef831531d2059 SHA256 083a69ac491cadedc54dd09c404dd47b7a07cce0b89605da9b3c4ce3f80af6bd
-MISC ChangeLog 2566 RMD160 19da203c2696ef0e99f4562e580c9aca785a67ee SHA1 712416eba11e119f1ce2bbea5d1a164613dc55d1 SHA256 37fb114e11ed598532f5461ba09a83170eeaceb495124f43d41ace12c073bd3e
+MISC ChangeLog 2835 RMD160 8811c63bb717b8cd26a538f21df483109b9719eb SHA1 8f9fad927649444f8a488066af8746d093acf42a SHA256 b1d9a26fea8429ab237196ba924f7f7d9e89c485d784d6fdd1a580237bd5a91e
 MISC metadata.xml 209 RMD160 d8d5450994c26467cca04e0007b1ef7d4676d9d8 SHA1 972c9d81f4e17ce38f86fe6600fb6b786c4014ec SHA256 d1a9b5333a198e7e949511b738c16eeadb97a3ae7342bb6680aff97721be235c
diff --git a/x11-libs/gtk+extra/files/gtk+extra-2.1.1-fix-row-deletion-segfault.patch b/x11-libs/gtk+extra/files/gtk+extra-2.1.1-fix-row-deletion-segfault.patch
new file mode 100644
index 000000000000..04aaeb4f9d90
--- /dev/null
+++ b/x11-libs/gtk+extra/files/gtk+extra-2.1.1-fix-row-deletion-segfault.patch
@@ -0,0 +1,16 @@
+diff -ur gtk+extra/gtkextra/gtksheet.c gtk+extra-2.1.1/gtkextra/gtksheet.c
+--- gtk+extra/gtkextra/gtksheet.c	2008-02-01 01:04:09.000000000 +0100
++++ gtk+extra-2.1.1/gtkextra/gtksheet.c	2008-02-01 01:08:52.000000000 +0100
+@@ -7956,11 +7956,10 @@
+     }
+ 
+     tbl->maxallocrow-=MIN(nrows,tbl->maxallocrow-row+1);
+-    tbl->maxallocrow = MIN(tbl->maxallocrow, tbl->maxrow);
+-
+   }
+ 
+   tbl->maxrow-=nrows;
++  tbl->maxallocrow = MIN(tbl->maxallocrow, tbl->maxrow);
+   gtk_sheet_recalc_top_ypixels(tbl, 0);
+   return TRUE;
+ } 
diff --git a/x11-libs/gtk+extra/files/gtk+extra-2.1.1-glib2.10-full-fix.patch b/x11-libs/gtk+extra/files/gtk+extra-2.1.1-glib2.10-full-fix.patch
new file mode 100644
index 000000000000..c4fbfce39d3c
--- /dev/null
+++ b/x11-libs/gtk+extra/files/gtk+extra-2.1.1-glib2.10-full-fix.patch
@@ -0,0 +1,21 @@
+--- gtkextra/gtksheet.c.orig	2005-06-24 19:51:00.000000000 +0200
++++ gtkextra/gtksheet.c	2007-10-19 15:13:42.000000000 +0200
+@@ -2738,7 +2738,7 @@
+   gdk_window_destroy (sheet->row_title_window);
+ 
+   if (sheet->pixmap){
+-    g_free (sheet->pixmap);
++    g_object_unref (sheet->pixmap);
+     sheet->pixmap = NULL;
+   }
+ 
+@@ -4149,7 +4149,7 @@
+ 			   &pixmap_width, &pixmap_height);
+       if ((pixmap_width != width) || (pixmap_height != height))
+ 	{
+-          g_free(sheet->pixmap);
++          g_object_unref(sheet->pixmap);
+ 	  sheet->pixmap = gdk_pixmap_new (sheet->sheet_window,
+ 					       width, height,
+ 					       -1);
+
diff --git a/x11-libs/gtk+extra/gtk+extra-2.1.1-r2.ebuild b/x11-libs/gtk+extra/gtk+extra-2.1.1-r2.ebuild
new file mode 100644
index 000000000000..baf5123cc4cd
--- /dev/null
+++ b/x11-libs/gtk+extra/gtk+extra-2.1.1-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+extra/gtk+extra-2.1.1-r2.ebuild,v 1.1 2008/05/31 13:13:56 remi Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="Useful Additional GTK+ widgets"
+HOMEPAGE="http://gtkextra.sourceforge.net"
+SRC_URI="mirror://sourceforge/scigraphica/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2.0
+		>=dev-libs/glib-2.0"
+DEPEND="${RDEPEND}
+		dev-util/pkgconfig"
+
+DOCS="AUTHORS ChangeLog INSTALL README"
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# patches to fix segfaults, see bug #219777
+	epatch "${FILESDIR}/${PN}-2.1.1-glib2.10-full-fix.patch"
+	epatch "${FILESDIR}/${PN}-2.1.1-fix-row-deletion-segfault.patch"
+}