Fix crash with glib-2.10 on resizing GtkSheet, many thanks to David Barnett in bug...

Package-Manager: portage-2.1.2_rc4-r7

diff --git a/x11-libs/gtk+extra/ChangeLog b/x11-libs/gtk+extra/ChangeLog
index 3d984ae6ecc8e6e5cd3d5fd7695d05e5b17de428..beb13b938f9d3e673913eeba627d45bc75ce44e3 100644 (file)
--- a/x11-libs/gtk+extra/ChangeLog
+++ b/x11-libs/gtk+extra/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/gtk+extra
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+extra/ChangeLog,v 1.16 2006/12/27 13:46:18 gustavoz Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+extra/ChangeLog,v 1.17 2007/01/09 07:19:56 leio Exp $
+
+*gtk+extra-2.1.1-r1 (09 Jan 2007)
+
+  09 Jan 2007; Mart Raudsepp <leio@gentoo.org>
+  +files/gtk+extra-2.1.1-glib2.10.patch, +gtk+extra-2.1.1-r1.ebuild:
+  Fix crash with glib-2.10 on resizing GtkSheet, many thanks to David Barnett
+  in bug 149075
 
   27 Dec 2006; Gustavo Zacarias <gustavoz@gentoo.org>
   gtk+extra-2.1.1.ebuild:

diff --git a/x11-libs/gtk+extra/Manifest b/x11-libs/gtk+extra/Manifest
index 78f07703a0a8e5539a752fdfeffeafe2f86f462a..166d05169290d4bf1c8809b1dfff7121e6359789 100644 (file)
--- a/x11-libs/gtk+extra/Manifest
+++ b/x11-libs/gtk+extra/Manifest
@@ -1,20 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX gtk+extra-2.1.1-glib2.10.patch 433 RMD160 c82be271daea458f6bc32c7714bcf30f2d756e37 SHA1 d6ae84aa168b3b525d5e4163c222afeffee79e57 SHA256 2c6100e0a4215d0602335cf42347c9cc35b8639fe22f7e458748c847872d87f4
+MD5 f95089c42b7aaa914bddd85564e27c67 files/gtk+extra-2.1.1-glib2.10.patch 433
+RMD160 c82be271daea458f6bc32c7714bcf30f2d756e37 files/gtk+extra-2.1.1-glib2.10.patch 433
+SHA256 2c6100e0a4215d0602335cf42347c9cc35b8639fe22f7e458748c847872d87f4 files/gtk+extra-2.1.1-glib2.10.patch 433
 DIST gtk+extra-0.99.17.tar.gz 426952
 DIST gtk+extra-2.1.1.tar.gz 893481 RMD160 7134fe4c5aaaa45ee3a7e651f3c477ba7c477214 SHA1 94d7ae9cb3aef05159cfff148265fc9ce0973980 SHA256 82d179fd2eb3fd5acbc9fc4d74507c559c6bc3269c488dc8642f9bca47a5dbe4
 EBUILD gtk+extra-0.99.17.ebuild 883 RMD160 679505b99f03589195330043623761a785b91f61 SHA1 05450df93e35dcffb08e18ae47767c27fe73e38c SHA256 9ad1e8eab6e748aab679de7731d10b38b58f943e58af0d954330a984acdb6f08
 MD5 283f562c1dc0b24470d7e48a36cb966d gtk+extra-0.99.17.ebuild 883
 RMD160 679505b99f03589195330043623761a785b91f61 gtk+extra-0.99.17.ebuild 883
 SHA256 9ad1e8eab6e748aab679de7731d10b38b58f943e58af0d954330a984acdb6f08 gtk+extra-0.99.17.ebuild 883
+EBUILD gtk+extra-2.1.1-r1.ebuild 687 RMD160 603b1a91b6d6e2d0a8848f3ca54b40197e20d1b3 SHA1 8456a442a05c992a6cd8b8538e8d8d433c6e477b SHA256 7ec7bf9b6c64766ca37d1b46cb3aabb2e44675cf9c182e465029337efb4118ac
+MD5 7190bcd165614f65718f6a52c7b2a486 gtk+extra-2.1.1-r1.ebuild 687
+RMD160 603b1a91b6d6e2d0a8848f3ca54b40197e20d1b3 gtk+extra-2.1.1-r1.ebuild 687
+SHA256 7ec7bf9b6c64766ca37d1b46cb3aabb2e44675cf9c182e465029337efb4118ac gtk+extra-2.1.1-r1.ebuild 687
 EBUILD gtk+extra-2.1.1.ebuild 599 RMD160 bf0b02dcd3273d67a1813a3070765fd898909544 SHA1 fb35520a3e709dffe0ad252c9e6329dc9cbf42ce SHA256 a5876559f0fa8f6b2f19cd846a9d86004f27339893d91fcdaf358d04d67550d9
 MD5 cb97f3ebb72aa8f5abf7037b7022e25a gtk+extra-2.1.1.ebuild 599
 RMD160 bf0b02dcd3273d67a1813a3070765fd898909544 gtk+extra-2.1.1.ebuild 599
 SHA256 a5876559f0fa8f6b2f19cd846a9d86004f27339893d91fcdaf358d04d67550d9 gtk+extra-2.1.1.ebuild 599
-MISC ChangeLog 2009 RMD160 ae1694cec22266a2420b22caa20472e22f2354d0 SHA1 a906c427e1070b9353325b017b16be2e0b4598be SHA256 d6645eb8c5af48cab29b9587f55e6f1e04481ff89d86ccb81d159d2bc95aa7aa
-MD5 fe191605fdd9c0ad8bdf31fd532e6703 ChangeLog 2009
-RMD160 ae1694cec22266a2420b22caa20472e22f2354d0 ChangeLog 2009
-SHA256 d6645eb8c5af48cab29b9587f55e6f1e04481ff89d86ccb81d159d2bc95aa7aa ChangeLog 2009
+MISC ChangeLog 2251 RMD160 7eead9c6c22e4d8991233cada9df4231bd17d6b4 SHA1 dfb967d653aa5bf82908d633c13d7008c2517867 SHA256 141625187d30a956dcf1bbb66778a4b3551593e73c93a05641127448803d303a
+MD5 532319e160ea50e8233c15a7be9d2ce3 ChangeLog 2251
+RMD160 7eead9c6c22e4d8991233cada9df4231bd17d6b4 ChangeLog 2251
+SHA256 141625187d30a956dcf1bbb66778a4b3551593e73c93a05641127448803d303a ChangeLog 2251
 MISC metadata.xml 209 RMD160 d8d5450994c26467cca04e0007b1ef7d4676d9d8 SHA1 972c9d81f4e17ce38f86fe6600fb6b786c4014ec SHA256 d1a9b5333a198e7e949511b738c16eeadb97a3ae7342bb6680aff97721be235c
 MD5 1e568475e2bbf65aec6bdf38995407f7 metadata.xml 209
 RMD160 d8d5450994c26467cca04e0007b1ef7d4676d9d8 metadata.xml 209
@@ -25,10 +33,13 @@ SHA256 d548f5714fa2cd703ba9625a1bc08e097eaa225445d3369f28e5be90fe667114 files/di
 MD5 ad7224f468c755cca8ce3be5915740ab files/digest-gtk+extra-2.1.1 247
 RMD160 3295cadef8ba8c80b7c084c1321983df47165a30 files/digest-gtk+extra-2.1.1 247
 SHA256 b78badbfa40e1ab1c00ef4416b7d476a40fbcc21f8ef0e8771234e788bc3b5d8 files/digest-gtk+extra-2.1.1 247
+MD5 ad7224f468c755cca8ce3be5915740ab files/digest-gtk+extra-2.1.1-r1 247
+RMD160 3295cadef8ba8c80b7c084c1321983df47165a30 files/digest-gtk+extra-2.1.1-r1 247
+SHA256 b78badbfa40e1ab1c00ef4416b7d476a40fbcc21f8ef0e8771234e788bc3b5d8 files/digest-gtk+extra-2.1.1-r1 247
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6-ecc01.6 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFknk0KRy60XGEcJIRApqkAJ0bNwmqhqVA/v5GWOl7hArgSprP2gCcCYWN
-1Oa13Mo48DNVFLLp5HaTeMs=
-=8hKh
+iD8DBQFFo0GBkeYb6olFHJcRAo73AJsEXP+Y9dCSU7h2eeUt8zHGhUILYQCgqka+
+8diiu4TTOJ6H1+SumZ7SvKI=
+=ibY0
 -----END PGP SIGNATURE-----

diff --git a/x11-libs/gtk+extra/files/digest-gtk+extra-2.1.1-r1 b/x11-libs/gtk+extra/files/digest-gtk+extra-2.1.1-r1
new file mode 100644 (file)
index 0000000..945a17e
--- /dev/null
+++ b/x11-libs/gtk+extra/files/digest-gtk+extra-2.1.1-r1
@@ -0,0 +1,3 @@
+MD5 1a933ca1286829383a0554cc2deb9e04 gtk+extra-2.1.1.tar.gz 893481
+RMD160 7134fe4c5aaaa45ee3a7e651f3c477ba7c477214 gtk+extra-2.1.1.tar.gz 893481
+SHA256 82d179fd2eb3fd5acbc9fc4d74507c559c6bc3269c488dc8642f9bca47a5dbe4 gtk+extra-2.1.1.tar.gz 893481

diff --git a/x11-libs/gtk+extra/files/gtk+extra-2.1.1-glib2.10.patch b/x11-libs/gtk+extra/files/gtk+extra-2.1.1-glib2.10.patch
new file mode 100644 (file)
index 0000000..b605c0c
--- /dev/null
+++ b/x11-libs/gtk+extra/files/gtk+extra-2.1.1-glib2.10.patch
@@ -0,0 +1,11 @@
+--- gtkextra/gtksheet.c.old    2006-09-25 11:04:06.000000000 -0500
++++ gtkextra/gtksheet.c        2006-09-25 11:04:33.000000000 -0500
+@@ -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-r1.ebuild b/x11-libs/gtk+extra/gtk+extra-2.1.1-r1.ebuild
new file mode 100644 (file)
index 0000000..8704aba
--- /dev/null
+++ b/x11-libs/gtk+extra/gtk+extra-2.1.1-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2007 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-r1.ebuild,v 1.1 2007/01/09 07:19:56 leio 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
+       epatch "${FILESDIR}/${P}-glib2.10.patch"
+}