From 13b5e05cfedd2f32c3d7b678762b770a6b0dab83 Mon Sep 17 00:00:00 2001 From: Rémi Cardona Date: Sat, 31 May 2008 13:13:57 +0000 Subject: x11-libs/gtk+extra: add patches to fix segfaults, see bug #219777 (Portage version: 2.1.5.2) --- x11-libs/gtk+extra/ChangeLog | 12 +++++++-- ...gtk+extra-2.1.1-fix-row-deletion-segfault.patch | 16 ++++++++++++ .../files/gtk+extra-2.1.1-glib2.10-full-fix.patch | 21 ++++++++++++++++ x11-libs/gtk+extra/gtk+extra-2.1.1-r2.ebuild | 29 ++++++++++++++++++++++ 4 files changed, 76 insertions(+), 2 deletions(-) create mode 100644 x11-libs/gtk+extra/files/gtk+extra-2.1.1-fix-row-deletion-segfault.patch create mode 100644 x11-libs/gtk+extra/files/gtk+extra-2.1.1-glib2.10-full-fix.patch create mode 100644 x11-libs/gtk+extra/gtk+extra-2.1.1-r2.ebuild 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 + +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 -gtk+extra-0.99.17.ebuild: punt old version 0.99.17 (see bug 160195) 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" +} -- cgit v1.2.3-65-gdbad