fix crasher and dnd behaviour

Package-Manager: portage-2.1_pre4-r1

5 files changed, 102 insertions, 4 deletions

diff --git a/app-arch/file-roller/ChangeLog b/app-arch/file-roller/ChangeLog
index 6704a4258ced..1b8a3f087706 100644
--- a/app-arch/file-roller/ChangeLog
+++ b/app-arch/file-roller/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-arch/file-roller
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/ChangeLog,v 1.162 2006/03/24 15:13:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/ChangeLog,v 1.163 2006/04/04 13:50:50 foser Exp $
+
+  04 Apr 2006; Marinus Schraal <foser@gentoo.org> 
+  files/file-roller-2.14.0-drag_move.patch, files/file-roller-2.14.0-double_unpack.patch :
+  Add patches to fix a crasher and fix dnd behaviour
 
   24 Mar 2006; Aron Griffis <agriffis@gentoo.org> file-roller-2.12.3.ebuild:
   Mark 2.12.3 stable on ia64
diff --git a/app-arch/file-roller/Manifest b/app-arch/file-roller/Manifest
index 54203f56abf6..cac2eda4e72b 100644
--- a/app-arch/file-roller/Manifest
+++ b/app-arch/file-roller/Manifest
@@ -1,23 +1,75 @@
-MD5 7805515b5b7ebc8ff6cc4ea9ac9eef0f ChangeLog 19408
+MD5 289c77d32b0580d3cca39312b31fb0c5 ChangeLog 19601
+RMD160 6b8f0a75362a2da147f9a385a4981bceef733645 ChangeLog 19601
+SHA256 175a6e006012fee3e3316f3fcf1b6432f06703f8e98190cc654f9a296dcc522d ChangeLog 19601
 MD5 6a822233a7d4799925d086c7fe2b743e file-roller-2.10.0-r1.ebuild 1489
+RMD160 54d3b9c6228ebb4c581647517c6894a4e60c6ed3 file-roller-2.10.0-r1.ebuild 1489
+SHA256 6b29ef346e55a44a4f8cdebe60f6030f206f1227ae8762bf296c130061459e8e file-roller-2.10.0-r1.ebuild 1489
 MD5 fab7851231fc02801db3f51c775a447a file-roller-2.10.3.ebuild 1354
+RMD160 fefa015df6e6eea081b21f4104c7b6250192bed3 file-roller-2.10.3.ebuild 1354
+SHA256 36f73c92e784330a16e5b13cbd3f74aa97de6e0b5b306db9cf22e1f547843d49 file-roller-2.10.3.ebuild 1354
 MD5 ca9d6d105d2d3b03f4e87a84e637a1de file-roller-2.10.4.ebuild 1408
+RMD160 b8da44cfbce234e338fc3a6ab254e5728cad5d0d file-roller-2.10.4.ebuild 1408
+SHA256 b9fc43bb4c17d8eea184fe06a4e4efc3f643a87580082a16f5fe8abe7c1b986d file-roller-2.10.4.ebuild 1408
 MD5 e50968e75d2b69cc87787c176ef6ced4 file-roller-2.12.1.ebuild 1385
+RMD160 a8cb7f96c036d559a230e34a6c628f923acef54e file-roller-2.12.1.ebuild 1385
+SHA256 4a5b981a7dba02cffe11582dcdb7055c00e2cc19e0514023400b5b0a20ca5300 file-roller-2.12.1.ebuild 1385
 MD5 cbf7f180540094b2de81c5973c412ac7 file-roller-2.12.2.ebuild 1376
+RMD160 d6796e0c3a8e22da9dcd18af6ea4aea0e33b3f2f file-roller-2.12.2.ebuild 1376
+SHA256 b655deca2da47cf090b569fda9a99c0ba15e47759ef3b6a74fdff55dca61005b file-roller-2.12.2.ebuild 1376
 MD5 0b7f7e11f614ec0817869bb14b5cc4f0 file-roller-2.12.3.ebuild 1377
-MD5 ac8317ab847a581b709b9445a441d57b file-roller-2.14.0.ebuild 1432
+RMD160 8c82fd62bd99eccdc1e163337f31b2690bac4e86 file-roller-2.12.3.ebuild 1377
+SHA256 d95c4b4faf7b469385cc8b0bdcc371e4f13ce623687b217385b7b7d2803a9277 file-roller-2.12.3.ebuild 1377
+MD5 6f27ddf243d1e2fe2850875afab10acf file-roller-2.14.0.ebuild 1708
+RMD160 ef567cf0f37e6deb3a62d46cf5d62fb9cba8db55 file-roller-2.14.0.ebuild 1708
+SHA256 545ba9737e19171a4119c623619bc28307901d057b878966122a67e1d5584fe1 file-roller-2.14.0.ebuild 1708
 MD5 d779986864325c09e5caba951a634f9a files/digest-file-roller-2.10.0-r1 72
+RMD160 8f38431eddb180265461a7767523aadfd9bfa49e files/digest-file-roller-2.10.0-r1 72
+SHA256 bddb639eebed7acac505fb1a0a90e9c00ae1b689b17f83d6ddb16be67d2c196e files/digest-file-roller-2.10.0-r1 72
 MD5 be190f54f0aaa0ff36a6d17c56e1a5b6 files/digest-file-roller-2.10.3 72
+RMD160 68f3eb0db92605bc8cf047389063c5dab22adcd5 files/digest-file-roller-2.10.3 72
+SHA256 65cb22fb7ea5b76e36c97af7d894b125a3e91ef881c43e64e5b6d2470df64d6b files/digest-file-roller-2.10.3 72
 MD5 639fd7660e2205b9a529b1df15ff765b files/digest-file-roller-2.10.4 72
+RMD160 92a887a0a0cca8d8f4c18ddf24acfb4f2b9f033b files/digest-file-roller-2.10.4 72
+SHA256 654a3e870fccf44efa23b0e2dbaa7bf8e00671ed42983120df2076e6acc75c3d files/digest-file-roller-2.10.4 72
 MD5 96336d41df5f3f5a10fb946b1418a9f9 files/digest-file-roller-2.12.1 72
+RMD160 15cf55a786e88dfd1e4dda19b00951ccaa55af39 files/digest-file-roller-2.12.1 72
+SHA256 eeb40bc2766da5c83c720317f617377af5d0a76ef42967ff5c739391ad8f55a9 files/digest-file-roller-2.12.1 72
 MD5 e5e3fd5829a2e5fe5b51b8cf4d9b7b17 files/digest-file-roller-2.12.2 71
+RMD160 27e64d8741ec321b1f35c85eb5f62da6c033225f files/digest-file-roller-2.12.2 71
+SHA256 0c1a32aa26b97ef0b070727c4c7c60af903928e524eaaa9b1c3e25b62d0e9e8e files/digest-file-roller-2.12.2 71
 MD5 ff5c1fc8b7070c9b8678df3f7f37a0f6 files/digest-file-roller-2.12.3 71
+RMD160 6bf86232fe342de87e24b0bdf44f0280f3617d36 files/digest-file-roller-2.12.3 71
+SHA256 d59578ef5898755f0a9d55d3418e33e3fa86a8ccd215e6348eb29d111ffb214f files/digest-file-roller-2.12.3 71
 MD5 2806a65ed08779ba71c66ef9b3f5f2c2 files/digest-file-roller-2.14.0 262
+RMD160 880b8592c7f232cc3446888e9b4f5631622ae2c8 files/digest-file-roller-2.14.0 262
+SHA256 d4b20a2dd98039a181af5f01fbdf5e46c9812a344a7e0157dc4f5f828557d4d5 files/digest-file-roller-2.14.0 262
 MD5 cb207c4a86910d9e23948e4fb15d5d8d files/file-roller-2.10-use_fr_rpm2cpio.patch 1113
+RMD160 b15170f4df67a5aa5a2c9ba5d845f544ac6961f7 files/file-roller-2.10-use_fr_rpm2cpio.patch 1113
+SHA256 08d0fdb57d507fbfcbaf3367ea0a08575b74570d94f64a6698589921d13bde0e files/file-roller-2.10-use_fr_rpm2cpio.patch 1113
 MD5 d12176c3351e047a90fc4740f4b09237 files/file-roller-2.10.0-fix_whitespace.patch 1713
+RMD160 f1ea47f8ac3e064decf2e9a274bf3726ea6dd9be files/file-roller-2.10.0-fix_whitespace.patch 1713
+SHA256 3c151c8eb90f1c736c6af6ffd1ce542dfa896fdc5ccb897fc2d601f5a66e2a9e files/file-roller-2.10.0-fix_whitespace.patch 1713
 MD5 b3c29c8524d0b4485f2b5abc64d003fe files/file-roller-2.10.2-fix_unrar.patch 858
+RMD160 4234661240301e1c62e2d30390ad4c4e0908e530 files/file-roller-2.10.2-fix_unrar.patch 858
+SHA256 60a32146132f6ccd5839bf6fa2077896b41d0d3ddb397a4ee1fe6deee8577dcb files/file-roller-2.10.2-fix_unrar.patch 858
 MD5 52258671fa0060fb4c537665f1be68b6 files/file-roller-2.10.3-use_bin_tar.patch 504
+RMD160 0af7af1c83953554e58c3a2f82ae3edb2e6b7e55 files/file-roller-2.10.3-use_bin_tar.patch 504
+SHA256 c22e742893800c4302df40af66b1eabeab700fea7326eada849f919bdd76c052 files/file-roller-2.10.3-use_bin_tar.patch 504
 MD5 90d9bf0e5affc3ce79f6a0c4c88e0af7 files/file-roller-2.13.2-xmllint.patch 976
+RMD160 124ef82a33eda1415777582410090234bfaa5c58 files/file-roller-2.13.2-xmllint.patch 976
+SHA256 52ce45266a897c1f0664959214baa5fb3a092793fff6a9b0a4241e86962dd1d4 files/file-roller-2.13.2-xmllint.patch 976
+MD5 e7f4941936f91f5c5bd890567676403c files/file-roller-2.14.0-double_unpack.patch 590
+RMD160 167322682635185fdccdc5b8219f3d5c3aa43a60 files/file-roller-2.14.0-double_unpack.patch 590
+SHA256 23d2e1e9d06a2942941635d91511d9592a41cebb034118cb3f437f2754270bb9 files/file-roller-2.14.0-double_unpack.patch 590
+MD5 8bdebffa2e4304365dbc00d0e7a15db5 files/file-roller-2.14.0-drag_move.patch 526
+RMD160 19be59ba4756614cb0887772cb8213d98a3a7506 files/file-roller-2.14.0-drag_move.patch 526
+SHA256 e3aaf8128f3afac606c716af2d51472c151e89c61ddfebd3880cd29a81083ac9 files/file-roller-2.14.0-drag_move.patch 526
 MD5 67f58f96b7c00be703c9bf9cf38cd191 files/file-roller-2.8.0-use_bin_tar.patch 405
+RMD160 4564fbca0d9643dec5e3d1e892d17117fe5b78a9 files/file-roller-2.8.0-use_bin_tar.patch 405
+SHA256 f76a2d4acd87291ac0ee9becb679c8f87063119ffdc8d53b93cee79dcd2245ac files/file-roller-2.8.0-use_bin_tar.patch 405
 MD5 d23f66e1c734a44ce6ee89b0e724b371 files/rpm2cpio-file-roller 2556
+RMD160 c123c4f046a5844d75a90f4a1edb308b17d99bd9 files/rpm2cpio-file-roller 2556
+SHA256 75dc7413d516d1f315534662c5a098c7973866b4d125547cd2696190818b8b6a files/rpm2cpio-file-roller 2556
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
+SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata.xml 158
diff --git a/app-arch/file-roller/file-roller-2.14.0.ebuild b/app-arch/file-roller/file-roller-2.14.0.ebuild
index e186d9f2efab..991f284f81c1 100644
--- a/app-arch/file-roller/file-roller-2.14.0.ebuild
+++ b/app-arch/file-roller/file-roller-2.14.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/file-roller-2.14.0.ebuild,v 1.1 2006/03/14 22:38:51 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/file-roller-2.14.0.ebuild,v 1.2 2006/04/04 13:50:50 foser Exp $
 
 inherit eutils gnome2
 
@@ -47,6 +47,13 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-2.10-use_fr_rpm2cpio.patch
 	# fix xmllint failure
 	epatch ${FILESDIR}/${PN}-2.13.2-xmllint.patch
+
+	cd ${S}/src
+	# fix dnd drop to move instead of copy (http://bugzilla.gnome.org/show_bug.cgi?id=335659)
+	epatch ${FILESDIR}/${P}-drag_move.patch
+	# fix crasher on double unpack (http://bugzilla.gnome.org/show_bug.cgi?id=336854)
+	epatch ${FILESDIR}/${P}-double_unpack.patch
+
 }
 
 src_install() {
diff --git a/app-arch/file-roller/files/file-roller-2.14.0-double_unpack.patch b/app-arch/file-roller/files/file-roller-2.14.0-double_unpack.patch
new file mode 100644
index 000000000000..855910f84095
--- /dev/null
+++ b/app-arch/file-roller/files/file-roller-2.14.0-double_unpack.patch
@@ -0,0 +1,19 @@
+===================================================================
+RCS file: /cvs/gnome/file-roller/src/window.c,v
+retrieving revision 1.160
+retrieving revision 1.161
+diff -u -r1.160 -r1.161
+--- window.c	2006/04/03 12:44:13	1.160
++++ window.c	2006/04/04 11:25:47	1.161
+@@ -4793,6 +4793,11 @@
+ 			    junk_paths,
+ 			    password);
+ 
++	if (window->archive->process->n_comm < 0) { /* no file to extract */
++		fr_process_start (window->archive->process);
++		return;
++	}
++
+ 	fr_process_set_continue_func (window->archive->process,
+ 				      extract__content_is_singleton,
+ 				      window);
diff --git a/app-arch/file-roller/files/file-roller-2.14.0-drag_move.patch b/app-arch/file-roller/files/file-roller-2.14.0-drag_move.patch
new file mode 100644
index 000000000000..c6fe592c62c3
--- /dev/null
+++ b/app-arch/file-roller/files/file-roller-2.14.0-drag_move.patch
@@ -0,0 +1,16 @@
+===================================================================
+RCS file: /cvs/gnome/file-roller/src/eggtreemultidnd.c,v
+retrieving revision 1.4
+retrieving revision 1.5
+diff -u -r1.4 -r1.5
+--- eggtreemultidnd.c	2005/12/10 11:19:48	1.4
++++ eggtreemultidnd.c	2006/04/04 12:35:32	1.5
+@@ -311,7 +311,7 @@
+ 
+ 	  context = gtk_drag_begin (widget,
+ 				    target_list,
+-				    GDK_ACTION_COPY,
++				    GDK_ACTION_MOVE,
+ 				    priv_data->pressed_button,
+ 				    (GdkEvent*)event);
+ 	  set_context_data (context, path_list);