Added patch to fix compilation with gcc-4.1 by Ryan Hill <dirtyepic DOT sk AT gmail DOT com>; bug #117251

(Portage version: 2.1_pre4-r1)

5 files changed, 41 insertions, 16 deletions

diff --git a/net-ftp/kftpgrabber/ChangeLog b/net-ftp/kftpgrabber/ChangeLog
index 05b86b69d51b..85ee395312fd 100644
--- a/net-ftp/kftpgrabber/ChangeLog
+++ b/net-ftp/kftpgrabber/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-ftp/kftpgrabber
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/kftpgrabber/ChangeLog,v 1.8 2005/11/11 14:13:10 flameeyes Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/kftpgrabber/ChangeLog,v 1.9 2006/02/25 22:25:31 halcy0n Exp $
+
+  25 Feb 2006; Mark Loeser <halcy0n@gentoo.org>
+  +files/kftpgrabber-0.6.0-gcc41.patch, kftpgrabber-0.6.0.ebuild:
+  Added patch to fix compilation with gcc-4.1 by Ryan Hill <dirtyepic DOT sk
+  AT gmail DOT com>; bug #117251
 
   11 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
   +files/kftpgrabber-0.6.0-gcc4.patch, +files/kftpgrabber-0.6.0-uic.patch,
diff --git a/net-ftp/kftpgrabber/Manifest b/net-ftp/kftpgrabber/Manifest
index 0e54bdb74045..82f2e8472152 100644
--- a/net-ftp/kftpgrabber/Manifest
+++ b/net-ftp/kftpgrabber/Manifest
@@ -1,16 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 70d2ec6d51ac5cd293c55f85678bfde5 ChangeLog 1273
-MD5 655b1b8780d7db4a2af5b6ce1ce0cfd8 files/digest-kftpgrabber-0.6.0 71
+RMD160 3aad1362fae432f568d3eb3b7b5c2bfcc02c9866 ChangeLog 1273
+SHA256 30c8e673ac05f6a80ee4267118b0cf0ce04003557a9b2f9e6260be02e3f6ffce ChangeLog 1273
+MD5 8562b360765db17dccec14b2de8801df files/digest-kftpgrabber-0.6.0 259
+RMD160 6537f7dd162cc82f6a3d4f49a51ec664ef492c22 files/digest-kftpgrabber-0.6.0 259
+SHA256 598d5145d8176f39545b013b47342e5a8793be635804ed39e6002cb2d39a5cb6 files/digest-kftpgrabber-0.6.0 259
 MD5 288e8f880999088f99c5d33c19b875f3 files/kftpgrabber-0.6.0-gcc4.patch 2222
+RMD160 4d7846303da504a79ef2b7f4bd0ec0a229debcfb files/kftpgrabber-0.6.0-gcc4.patch 2222
+SHA256 a090e9c1ebb2f0069fb4a6d6f6f48200140c19d4040eea89e078b303a9854fd4 files/kftpgrabber-0.6.0-gcc4.patch 2222
+MD5 3b41dd830f1a9b5e1af422cf60900190 files/kftpgrabber-0.6.0-gcc41.patch 953
+RMD160 2040f9cf9fb05f64d2ba02c75b528b7b21956128 files/kftpgrabber-0.6.0-gcc41.patch 953
+SHA256 b809978fe17374af2ca403cd712780e7bfe65661ab96f1d954fbc26ec94a5ebb files/kftpgrabber-0.6.0-gcc41.patch 953
 MD5 225f4b81821c40c533b31665a32de321 files/kftpgrabber-0.6.0-uic.patch 1049
-MD5 6063a712f85738f73e99c5e5a691b229 kftpgrabber-0.6.0.ebuild 663
+RMD160 72d0ef24890aee9f15ae978c624933f5204ac162 files/kftpgrabber-0.6.0-uic.patch 1049
+SHA256 58c0dabdf5d4cc6aec88f8bfd3bbfa30bb5732dfb9a89592a735806389287199 files/kftpgrabber-0.6.0-uic.patch 1049
+MD5 de1f1356a5a52912d4d98a2c428bcd34 kftpgrabber-0.6.0.ebuild 702
+RMD160 9c3395d89d9135fb5c64dc195b44c144cdce4c29 kftpgrabber-0.6.0.ebuild 702
+SHA256 7a76208dc64d75bfdce9b0bb2aa157316e5a21a835660788e912a29fe93a192e kftpgrabber-0.6.0.ebuild 702
 MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDdKcKAiZjviIA2XgRArETAKDkSKBB5CYK9LmWC2Kc5cTTa5YALwCfdRBf
-5EU4Lb5+7TvwR0VSvGUBtXc=
-=LXjJ
------END PGP SIGNATURE-----
+RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 metadata.xml 157
+SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292 metadata.xml 157
diff --git a/net-ftp/kftpgrabber/files/digest-kftpgrabber-0.6.0 b/net-ftp/kftpgrabber/files/digest-kftpgrabber-0.6.0
index db73590af9b9..f30abb41279d 100644
--- a/net-ftp/kftpgrabber/files/digest-kftpgrabber-0.6.0
+++ b/net-ftp/kftpgrabber/files/digest-kftpgrabber-0.6.0
@@ -1 +1,3 @@
 MD5 549d4575fc0240c3ef9f249a7587d902 kftpgrabber-0.6.0.tar.bz2 1127926
+RMD160 d036f000dcfe7d189384c850ff8be3d91eb82669 kftpgrabber-0.6.0.tar.bz2 1127926
+SHA256 6f717053dbf138cccd73041814e5c0865cfd40bfb03402107fa5b3fcf3e43da1 kftpgrabber-0.6.0.tar.bz2 1127926
diff --git a/net-ftp/kftpgrabber/files/kftpgrabber-0.6.0-gcc41.patch b/net-ftp/kftpgrabber/files/kftpgrabber-0.6.0-gcc41.patch
new file mode 100644
index 000000000000..f9ad6c3cefd4
--- /dev/null
+++ b/net-ftp/kftpgrabber/files/kftpgrabber-0.6.0-gcc41.patch
@@ -0,0 +1,12 @@
+diff -Naur kftpgrabber-0.6.0-orig/kftpgrabber/src/kftpqueue.h kftpgrabber-0.6.0/kftpgrabber/src/kftpqueue.h
+--- kftpgrabber-0.6.0-orig/kftpgrabber/src/kftpqueue.h	2005-12-30 23:41:57.000000000 -0600
++++ kftpgrabber-0.6.0/kftpgrabber/src/kftpqueue.h	2005-12-30 23:42:22.000000000 -0600
+@@ -128,7 +128,7 @@
+     void abortQueueTransfer();
+     bool queueProcRunning() { return m_queueProc->isRunning(); }
+     
+-    static int KFTPQueueManager::fileExistsDialog(KFTPQueue::TransferFile *transfer, const QString &local, FTPEntry remote, bool reversed = false);
++    static int fileExistsDialog(KFTPQueue::TransferFile *transfer, const QString &local, FTPEntry remote, bool reversed = false);
+ 
+     KFTPQueue::Transfer *spawnTransfer(KURL srcURL, KURL dstURL, filesize_t size, bool dir, KFTPQueue::TransferType t_type, 
+                                        bool ignoreSkip = false, bool insertToQueue = true, QObject *parent = 0L, bool noScan = false);
diff --git a/net-ftp/kftpgrabber/kftpgrabber-0.6.0.ebuild b/net-ftp/kftpgrabber/kftpgrabber-0.6.0.ebuild
index 431b8594efcf..b8e5d10e86dd 100644
--- a/net-ftp/kftpgrabber/kftpgrabber-0.6.0.ebuild
+++ b/net-ftp/kftpgrabber/kftpgrabber-0.6.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/kftpgrabber/kftpgrabber-0.6.0.ebuild,v 1.4 2005/11/11 14:13:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/kftpgrabber/kftpgrabber-0.6.0.ebuild,v 1.5 2006/02/25 22:25:31 halcy0n Exp $
 
 inherit kde eutils
 
@@ -24,4 +24,5 @@ src_unpack() {
 
 	epatch "${FILESDIR}/${P}-uic.patch"
 	epatch "${FILESDIR}/${P}-gcc4.patch"
+	epatch "${FILESDIR}/${P}-gcc41.patch"
 }