Added patches to compile using Qt 3.3.5 (stricter uic) and GCC4 (stricter compiler).

(Portage version: 2.0.53_rc7)

2 files changed, 96 insertions, 0 deletions

diff --git a/net-ftp/kftpgrabber/files/kftpgrabber-0.6.0-gcc4.patch b/net-ftp/kftpgrabber/files/kftpgrabber-0.6.0-gcc4.patch
new file mode 100644
index 000000000000..0f51868bc0ea
--- /dev/null
+++ b/net-ftp/kftpgrabber/files/kftpgrabber-0.6.0-gcc4.patch
@@ -0,0 +1,70 @@
+Index: kftpgrabber-0.6.0/kftpgrabber/src/kftptransfer.h
+===================================================================
+--- kftpgrabber-0.6.0.orig/kftpgrabber/src/kftptransfer.h
++++ kftpgrabber-0.6.0/kftpgrabber/src/kftptransfer.h
+@@ -44,6 +44,7 @@
+ #include <kurl.h>
+ 
+ class KFTPSession;
++class KFTPQueueManager;
+ 
+ namespace KFTPQueue {
+ 
+@@ -61,8 +62,8 @@ This class is the base class for all tra
+ class Transfer : public QObject
+ {
+ friend class TransferDir;
+-friend class KFTPQueueManager;
+-friend class KFTPSession;
++friend class ::KFTPQueueManager;
++friend class ::KFTPSession;
+ Q_OBJECT
+ public:
+     enum Status {
+Index: kftpgrabber-0.6.0/kftpgrabber/src/kftptransferfile.h
+===================================================================
+--- kftpgrabber-0.6.0.orig/kftpgrabber/src/kftptransferfile.h
++++ kftpgrabber-0.6.0/kftpgrabber/src/kftptransferfile.h
+@@ -39,6 +39,7 @@
+ #include "kftptransfer.h"
+ 
+ class KFTPSessionConnection;
++class KFTPQueueManager;
+ 
+ namespace KFTPNetwork {
+   class Error;
+@@ -54,7 +55,7 @@ namespace KFTPQueue {
+ class TransferFile : public Transfer
+ {
+ Q_OBJECT
+-friend class KFTPQueueManager;
++friend class ::KFTPQueueManager;
+ public:
+     TransferFile(QObject *parent);
+     ~TransferFile();
+Index: kftpgrabber-0.6.0/kftpgrabber/src/widgets/filedirview/kftpfilepropsplugin.h
+===================================================================
+--- kftpgrabber-0.6.0.orig/kftpgrabber/src/widgets/filedirview/kftpfilepropsplugin.h
++++ kftpgrabber-0.6.0/kftpgrabber/src/widgets/filedirview/kftpfilepropsplugin.h
+@@ -41,6 +41,8 @@
+ 
+ #include "kftpclientthread.h"
+ 
++class KFTPSession;
++
+ /**
+ This is a plugin for displaying remote file properties using standard KDE file properties dialog.
+ 
+Index: kftpgrabber-0.6.0/kftpgrabber/src/widgets/kftpservermanagementlistview.h
+===================================================================
+--- kftpgrabber-0.6.0.orig/kftpgrabber/src/widgets/kftpservermanagementlistview.h
++++ kftpgrabber-0.6.0/kftpgrabber/src/widgets/kftpservermanagementlistview.h
+@@ -48,7 +48,7 @@ class KFTPSession;
+ class KListViewItem;
+ class KFTPClientThr;
+ class KActionCollection;
+-
++class KFTPServerManagementDialog;
+ 
+ /**
+  * @author Blacknator
diff --git a/net-ftp/kftpgrabber/files/kftpgrabber-0.6.0-uic.patch b/net-ftp/kftpgrabber/files/kftpgrabber-0.6.0-uic.patch
new file mode 100644
index 000000000000..83da5136f212
--- /dev/null
+++ b/net-ftp/kftpgrabber/files/kftpgrabber-0.6.0-uic.patch
@@ -0,0 +1,26 @@
+Index: kftpgrabber-0.6.0/kftpgrabber/src/ui/kftpqueueeditorlayout.ui
+===================================================================
+--- kftpgrabber-0.6.0.orig/kftpgrabber/src/ui/kftpqueueeditorlayout.ui
++++ kftpgrabber-0.6.0/kftpgrabber/src/ui/kftpqueueeditorlayout.ui
+@@ -322,9 +322,6 @@
+ </images>
+ <layoutdefaults spacing="6" margin="11"/>
+ <includehints>
+-    <includehint>kftpserverlineedit.h</includehint>
+-    <includehint>kpassdlg.h</includehint>
+-    <includehint>kftpserverlineedit.h</includehint>
+     <includehint>kpassdlg.h</includehint>
+ </includehints>
+ </UI>
+Index: kftpgrabber-0.6.0/kftpgrabber/src/ui/kftpsearchlayout.ui
+===================================================================
+--- kftpgrabber-0.6.0.orig/kftpgrabber/src/ui/kftpsearchlayout.ui
++++ kftpgrabber-0.6.0/kftpgrabber/src/ui/kftpsearchlayout.ui
+@@ -240,7 +240,6 @@
+ </images>
+ <layoutdefaults spacing="6" margin="11"/>
+ <includehints>
+-    <includehint>kftpserverlineedit.h</includehint>
+     <includehint>kpassdlg.h</includehint>
+ </includehints>
+ </UI>