fix crash on refreshing device (bug #201615)

Package-Manager: portage-2.1.4_rc14

5 files changed, 90 insertions, 6 deletions

diff --git a/sys-block/gparted/ChangeLog b/sys-block/gparted/ChangeLog
index 5e095b7f2866..db48fe447c95 100644
--- a/sys-block/gparted/ChangeLog
+++ b/sys-block/gparted/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-block/gparted
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/gparted/ChangeLog,v 1.41 2007/09/20 14:15:56 dang Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/gparted/ChangeLog,v 1.42 2008/01/14 00:02:55 eva Exp $
+
+*gparted-0.3.3-r1 (13 Jan 2008)
+
+  13 Jan 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/gparted-0.3.3-device-reload-crash.patch, +gparted-0.3.3-r1.ebuild:
+  fix crash on refreshing device (bug #201615)
 
   20 Sep 2007; Daniel Gryniewicz <dang@gentoo.org> gparted-0.3.3.ebuild:
   fs utils are runtime-deps only; bug #178873
diff --git a/sys-block/gparted/Manifest b/sys-block/gparted/Manifest
index 9c0cd04d17df..1c4ae9dfeecc 100644
--- a/sys-block/gparted/Manifest
+++ b/sys-block/gparted/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gparted-0.2.5-llabs.patch 796 RMD160 e8f7ca03ed5b0754b67b2f72f78624b0320c83ed SHA1 c28b1b56cc4ef37343325207b69d8dc00d615fb8 SHA256 951c69e36a652a4f91c22293758e52b2ba740973437f4caf50f61b3f16e94a0f
 MD5 5b6ce360acc20c55a6939cbebee57916 files/gparted-0.2.5-llabs.patch 796
 RMD160 e8f7ca03ed5b0754b67b2f72f78624b0320c83ed files/gparted-0.2.5-llabs.patch 796
@@ -6,20 +9,28 @@ AUX gparted-0.3.1-llabs.patch 2871 RMD160 077c82c19e860203e39544c2df41b1bd821d7f
 MD5 a47bef636f7a4d0f8ba38b73bacd389f files/gparted-0.3.1-llabs.patch 2871
 RMD160 077c82c19e860203e39544c2df41b1bd821d7f02 files/gparted-0.3.1-llabs.patch 2871
 SHA256 fbbfa242a53978a360d44263870c22ee89dcfb30f7ce31196ca9a965d98e576b files/gparted-0.3.1-llabs.patch 2871
+AUX gparted-0.3.3-device-reload-crash.patch 717 RMD160 7453b2c3999a61655bedd682cc4968ff4f88004e SHA1 9cf5f636397cab4b5482d3e28a9ce123a2218826 SHA256 9b2894f94fb8b51bcc2b4856d9f8d3a7c5423e3bf52f374c59be9dccebe755f2
+MD5 036cc87c38e5754d3182db83d777e261 files/gparted-0.3.3-device-reload-crash.patch 717
+RMD160 7453b2c3999a61655bedd682cc4968ff4f88004e files/gparted-0.3.3-device-reload-crash.patch 717
+SHA256 9b2894f94fb8b51bcc2b4856d9f8d3a7c5423e3bf52f374c59be9dccebe755f2 files/gparted-0.3.3-device-reload-crash.patch 717
 DIST gparted-0.3.1.tar.bz2 466481 RMD160 09a5c26427c47216a9ef16ef4f56082caa65f78a SHA1 c3689f51b61cc3f41ebb0345c478da0df1346039 SHA256 648cbfe3ba536dca8c1d56f9fac946dac7c88cbfa8ec0db1aa7dee868c0f3150
 DIST gparted-0.3.3.tar.bz2 491860 RMD160 bf008b9a94a79a680a2bb8a1b04d345ceec136df SHA1 b932ddc98ee547ed9085be5cd20964e0e6092365 SHA256 c7c86abd344055bdf1f840a037d04064759f52039cb075260b60369b721f245c
 EBUILD gparted-0.3.1.ebuild 907 RMD160 8b3518ce888acbe975ce192eaf5212f91758fed5 SHA1 efbfef70a3b2bcad58589e7b4a590981f580c3e2 SHA256 1418e55d2af4bf8a77f420b243c787c06d8d6b48e51afbef0c676d56579efa9f
 MD5 bf249fbe0324c04e33666a232ed885fe gparted-0.3.1.ebuild 907
 RMD160 8b3518ce888acbe975ce192eaf5212f91758fed5 gparted-0.3.1.ebuild 907
 SHA256 1418e55d2af4bf8a77f420b243c787c06d8d6b48e51afbef0c676d56579efa9f gparted-0.3.1.ebuild 907
+EBUILD gparted-0.3.3-r1.ebuild 978 RMD160 f5151efe07df2e344759024b1edef5007a08bab7 SHA1 19168a0c19dbdf4bfc673e20b56835b6d8ab5857 SHA256 ba5f81364e0c3b0ebf3b10a0f2945597b8d612942f8e5d168224d4215adfde5e
+MD5 be06d3c487696d4430e5852ae0258e72 gparted-0.3.3-r1.ebuild 978
+RMD160 f5151efe07df2e344759024b1edef5007a08bab7 gparted-0.3.3-r1.ebuild 978
+SHA256 ba5f81364e0c3b0ebf3b10a0f2945597b8d612942f8e5d168224d4215adfde5e gparted-0.3.3-r1.ebuild 978
 EBUILD gparted-0.3.3.ebuild 880 RMD160 2515eeb1fd9825016b4d59ed980db7291a55cf04 SHA1 f02a83d9aeae0351a30e85404197940429b89807 SHA256 1593ca75fd7af5fa336b551a58d9f7676040e389b30c6060ee7131f02e4299e7
 MD5 b0a0ce2fc2b9eb55cae2b3497c523206 gparted-0.3.3.ebuild 880
 RMD160 2515eeb1fd9825016b4d59ed980db7291a55cf04 gparted-0.3.3.ebuild 880
 SHA256 1593ca75fd7af5fa336b551a58d9f7676040e389b30c6060ee7131f02e4299e7 gparted-0.3.3.ebuild 880
-MISC ChangeLog 4863 RMD160 dfc53a7d50b7ba4851e580cb7d0513c959c93b64 SHA1 2c346c3b93acd94bbffba27e7e098773f8e47a99 SHA256 57b98ec4d5002a6a8cadff434442ed77bd8f03e1c2a2b9efc7a4c71c0b6ddda1
-MD5 316964a69290778c7ec3c662cf210f00 ChangeLog 4863
-RMD160 dfc53a7d50b7ba4851e580cb7d0513c959c93b64 ChangeLog 4863
-SHA256 57b98ec4d5002a6a8cadff434442ed77bd8f03e1c2a2b9efc7a4c71c0b6ddda1 ChangeLog 4863
+MISC ChangeLog 5073 RMD160 265554cf8b8304cdafb24c6409f1adec83c1ad5c SHA1 28c45047025f97291ebe1de99e44585666fa903e SHA256 30461b98cc1d0a0d42f6fd871089e11180c067a959d22890902b4085ebc6e108
+MD5 89989fd42911729c6616d545dd325031 ChangeLog 5073
+RMD160 265554cf8b8304cdafb24c6409f1adec83c1ad5c ChangeLog 5073
+SHA256 30461b98cc1d0a0d42f6fd871089e11180c067a959d22890902b4085ebc6e108 ChangeLog 5073
 MISC metadata.xml 391 RMD160 c9be71f7009ec667ca482b49615b6df53f72d06b SHA1 3bc133d256a902bf160ad6f85d945e74517284dc SHA256 9b617e6f69a0195393aed1dd10afa2ee6311da2e5134cfa5781d387b20249741
 MD5 c02142e81c7255a14a83b8cc92127276 metadata.xml 391
 RMD160 c9be71f7009ec667ca482b49615b6df53f72d06b metadata.xml 391
@@ -30,3 +41,13 @@ SHA256 0e4b253701ec86392064450b521647250640f98b860d2b485331709a95bda61c files/di
 MD5 9a3b68521fa95d0b5dea228b3e52d4fc files/digest-gparted-0.3.3 244
 RMD160 73a3f29d5eb0fde9b8662a4dfb270307522c25f2 files/digest-gparted-0.3.3 244
 SHA256 8c55bbb688d649bee6cbd2c1e6325075e0872f82bace66dc5d2b3dedb98f856d files/digest-gparted-0.3.3 244
+MD5 9a3b68521fa95d0b5dea228b3e52d4fc files/digest-gparted-0.3.3-r1 244
+RMD160 73a3f29d5eb0fde9b8662a4dfb270307522c25f2 files/digest-gparted-0.3.3-r1 244
+SHA256 8c55bbb688d649bee6cbd2c1e6325075e0872f82bace66dc5d2b3dedb98f856d files/digest-gparted-0.3.3-r1 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAkeKpsAACgkQ1fmVwcYIWAYFagCgzNK8Bjza8/PCfDf6Nc2jiNNB
+27YAn2eFsqlBWmS16JE5Y2K+592o87z8
+=UMWK
+-----END PGP SIGNATURE-----
diff --git a/sys-block/gparted/files/digest-gparted-0.3.3-r1 b/sys-block/gparted/files/digest-gparted-0.3.3-r1
new file mode 100644
index 000000000000..44249ea7edb2
--- /dev/null
+++ b/sys-block/gparted/files/digest-gparted-0.3.3-r1
@@ -0,0 +1,3 @@
+MD5 f3d16ccfda72fa1dac9fa1ff9ded2c42 gparted-0.3.3.tar.bz2 491860
+RMD160 bf008b9a94a79a680a2bb8a1b04d345ceec136df gparted-0.3.3.tar.bz2 491860
+SHA256 c7c86abd344055bdf1f840a037d04064759f52039cb075260b60369b721f245c gparted-0.3.3.tar.bz2 491860
diff --git a/sys-block/gparted/files/gparted-0.3.3-device-reload-crash.patch b/sys-block/gparted/files/gparted-0.3.3-device-reload-crash.patch
new file mode 100644
index 000000000000..b9e5c1b560f1
--- /dev/null
+++ b/sys-block/gparted/files/gparted-0.3.3-device-reload-crash.patch
@@ -0,0 +1,17 @@
+diff -ur gparted-0.3.3.orig/src/Win_GParted.cc gparted-0.3.3/src/Win_GParted.cc
+--- gparted-0.3.3.orig/src/Win_GParted.cc	2006-12-01 18:14:23.000000000 +0500
++++ gparted-0.3.3/src/Win_GParted.cc	2007-11-04 11:46:32.000000000 +0500
+@@ -916,8 +916,13 @@
+ 
+ void Win_GParted::combo_devices_changed()
+ {
++	unsigned int old_current_device = current_device;
+ 	//set new current device
+ 	current_device = combo_devices .get_active_row_number() ;
++	if ( current_device == (unsigned int) -1 )
++		current_device = old_current_device;
++	if ( current_device >= devices .size() )
++		current_device = 0 ;
+ 	set_title( String::ucompose( _("%1 - GParted"), devices[ current_device ] .get_path() ) );
+ 	
+ 	//refresh label_device_info
diff --git a/sys-block/gparted/gparted-0.3.3-r1.ebuild b/sys-block/gparted/gparted-0.3.3-r1.ebuild
new file mode 100644
index 000000000000..0e8ad80bc7e1
--- /dev/null
+++ b/sys-block/gparted/gparted-0.3.3-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/gparted/gparted-0.3.3-r1.ebuild,v 1.1 2008/01/14 00:02:55 eva Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="Gnome Partition Editor"
+HOMEPAGE="http://gparted.sourceforge.net/"
+
+SRC_URI="mirror://sourceforge/gparted/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="fat hfs jfs ntfs reiserfs reiser4 xfs"
+
+common_depends=">=sys-apps/parted-1.7.1
+		>=dev-cpp/gtkmm-2.8.0"
+
+RDEPEND="${common_depends}
+		fat? ( sys-fs/dosfstools )
+		ntfs? ( sys-fs/ntfsprogs )
+		hfs? ( sys-fs/hfsutils )
+		jfs? ( sys-fs/jfsutils )
+		reiserfs? ( sys-fs/reiserfsprogs )
+		reiser4? ( sys-fs/reiser4progs )
+		xfs? ( sys-fs/xfsprogs sys-fs/xfsdump )"
+
+DEPEND="${common_depends}
+		>=dev-util/pkgconfig-0.12
+		>=dev-util/intltool-0.29"
+
+src_unpack() {
+	gnome2_src_unpack
+
+	epatch "${FILESDIR}/${P}-device-reload-crash.patch"
+}