[84973] trunk/dports/kde/krusader
jmr at macports.org
jmr at macports.org
Wed Oct 5 18:34:20 PDT 2011
Revision: 84973
http://trac.macports.org/changeset/84973
Author: jmr at macports.org
Date: 2011-10-05 18:34:17 -0700 (Wed, 05 Oct 2011)
Log Message:
-----------
krusader: add patches from upstream git to fix build with Qt 4.7
Modified Paths:
--------------
trunk/dports/kde/krusader/Portfile
Added Paths:
-----------
trunk/dports/kde/krusader/files/000feab199d06f0dcd816d958aae01f0ebf2631c.patch
trunk/dports/kde/krusader/files/7429ec2e1a43a5d2d0c883311b181a8d3ea53dc6.patch
Modified: trunk/dports/kde/krusader/Portfile
===================================================================
--- trunk/dports/kde/krusader/Portfile 2011-10-06 00:56:46 UTC (rev 84972)
+++ trunk/dports/kde/krusader/Portfile 2011-10-06 01:34:17 UTC (rev 84973)
@@ -31,7 +31,9 @@
copy ${filespath}/hi128-app-krusader_user.png ${workpath}/${distname}/krusader/
}
-patchfiles app-install-bug.patch
+patchfiles app-install-bug.patch \
+ 7429ec2e1a43a5d2d0c883311b181a8d3ea53dc6.patch \
+ 000feab199d06f0dcd816d958aae01f0ebf2631c.patch
patch.dir ${workpath}/${distname}
# awful hack to avoid meinproc crash, ticket #30162
Added: trunk/dports/kde/krusader/files/000feab199d06f0dcd816d958aae01f0ebf2631c.patch
===================================================================
--- trunk/dports/kde/krusader/files/000feab199d06f0dcd816d958aae01f0ebf2631c.patch (rev 0)
+++ trunk/dports/kde/krusader/files/000feab199d06f0dcd816d958aae01f0ebf2631c.patch 2011-10-06 01:34:17 UTC (rev 84973)
@@ -0,0 +1,22 @@
+From: Christoph Feck <christoph at maxiom.de>
+Date: Fri, 12 Mar 2010 19:34:01 +0000
+Subject: SVN_SILENT compile with Qt 4.7
+X-Git-Tag: v2.2.0-beta1
+X-Git-Url: http://quickgit.kde.org/?p=krusader.git&a=commitdiff&h=000feab199d06f0dcd816d958aae01f0ebf2631c
+---
+SVN_SILENT compile with Qt 4.7
+---
+
+
+--- krusader/Search/krsearchdialog.h
++++ krusader/Search/krsearchdialog.h
+@@ -62,7 +62,7 @@ class KrSearchDialog : public QDialog
+ class KrSearchDialog : public QDialog {
+ Q_OBJECT
+ public:
+- KrSearchDialog(QString profile = 0, QWidget* parent = 0 );
++ KrSearchDialog(QString profile = QString(), QWidget* parent = 0);
+
+ void prepareGUI();
+
+
Added: trunk/dports/kde/krusader/files/7429ec2e1a43a5d2d0c883311b181a8d3ea53dc6.patch
===================================================================
--- trunk/dports/kde/krusader/files/7429ec2e1a43a5d2d0c883311b181a8d3ea53dc6.patch (rev 0)
+++ trunk/dports/kde/krusader/files/7429ec2e1a43a5d2d0c883311b181a8d3ea53dc6.patch 2011-10-06 01:34:17 UTC (rev 84973)
@@ -0,0 +1,24 @@
+From: Christoph Feck <christoph at maxiom.de>
+Date: Fri, 12 Mar 2010 16:54:01 +0000
+Subject: SVN_SILENT compile with Qt 4.7
+X-Git-Tag: v2.2.0-beta1
+X-Git-Url: http://quickgit.kde.org/?p=krusader.git&a=commitdiff&h=7429ec2e1a43a5d2d0c883311b181a8d3ea53dc6
+---
+SVN_SILENT compile with Qt 4.7
+
+There is no QString(int) constructor
+---
+
+
+--- krusader/MountMan/kmountmangui.h
++++ krusader/MountMan/kmountmangui.h
+@@ -112,7 +112,7 @@ private:
+ /////////////////////////////////////////////////////////////////
+ class fsData {
+ public:
+- fsData() : Name( 0 ), Type( 0 ), MntPoint( 0 ), TotalBlks( 0 ),
++ fsData() : Name(), Type(), MntPoint(), TotalBlks( 0 ),
+ FreeBlks( 0 ), Mounted( false ) {}
+
+ // get information
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111005/cbeca9db/attachment-0001.html>
More information about the macports-changes
mailing list