fix crash on refreshing device (bug #201615)

(Portage version: 2.1.4_rc14)

4 files changed, 65 insertions, 2 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/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"
+}