Fix building with GCC 4.5+ wrt #321357 by Gef Lebster.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/kde-misc/filelight/ChangeLog b/kde-misc/filelight/ChangeLog
index cceee08f08f4790b494edb35ede769b4b1cf7198..50882d2400b68e0b6deeb78d32a93cda7d4c8d09 100644 (file)
--- a/kde-misc/filelight/ChangeLog
+++ b/kde-misc/filelight/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-misc/filelight
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/filelight/ChangeLog,v 1.41 2010/03/06 09:17:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/filelight/ChangeLog,v 1.42 2010/06/05 13:57:03 ssuominen Exp $
+
+  05 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
+  filelight-1.9_rc3.ebuild, +files/filelight-1.9_rc3-gcc45.patch:
+  Fix building with GCC 4.5+ wrt #321357 by Gef Lebster.
 
   06 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
   filelight-1.9_rc3.ebuild:

diff --git a/kde-misc/filelight/Manifest b/kde-misc/filelight/Manifest
index 14eb3cd5b2a1c6471a8bf93f828dfdfc56c793bd..5a6373cd8034d2b21af4ba33e8e909f65656f888 100644 (file)
--- a/kde-misc/filelight/Manifest
+++ b/kde-misc/filelight/Manifest
@@ -1,4 +1,5 @@
+AUX filelight-1.9_rc3-gcc45.patch 596 RMD160 14eef118e5dbc7ae5057e0165fedb3b274ef5229 SHA1 394caefb49731533fbb776f1e9b3e3d279013d36 SHA256 a1a62bad725b6f770f0cb68634f1de08fc390140e666390763da9070ad3e34f8
 DIST 99561-filelight-1.9rc3.tgz 93481 RMD160 26112c392f0652a8eb66c4afedb9234cf901f2ef SHA1 226e2272757f615842f51247e64c17921c895aee SHA256 58a323aff9939c5c31629bd5ac96118d092c90a2b1d7dd42d479332287e85e52
-EBUILD filelight-1.9_rc3.ebuild 835 RMD160 2a6efe84324b4315a3032430a37dea33da1808c0 SHA1 2c68d972d6a8759cafab09f36cd77f30bd6c86c3 SHA256 35e3ff8061fd21e763cc871cc7f53c5e145625b0be5c5857f2e91fd431d8d523
-MISC ChangeLog 7318 RMD160 993c7d4125e633b5f69eb503fec3b9254a1bce5c SHA1 101ecd3fb8e2c1f41108424e6e0b0de43deac5a3 SHA256 ec26bc6224fb255f69636b68710af7865d0cef91f7b903a7add2968d30bf1d63
+EBUILD filelight-1.9_rc3.ebuild 863 RMD160 7725271e22fb32d5615683880154084b34c73916 SHA1 9fc84eaa4f745ed556c33c29c02715e46df18ff9 SHA256 e9d9e63da3d3da2129f1cd6c49a7b55388d48b0c30f3c31c5766188458a9b97d
+MISC ChangeLog 7496 RMD160 d4822c0ff2a5a498be9affc522de3a448c00cae7 SHA1 3abef4386107507051026e071cd2e5a1a0c5974e SHA256 e83db042ed49b4c6b1ce67d41bbf4b135c3368d1b29a72372fe13fa867ee2e5a
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a

diff --git a/kde-misc/filelight/filelight-1.9_rc3.ebuild b/kde-misc/filelight/filelight-1.9_rc3.ebuild
index 2d071cbeb89ae0d60190e614aad0e6fae6e9f775..a671d10f6c0d4b32d9c6307ebb2207458115f1a6 100644 (file)
--- a/kde-misc/filelight/filelight-1.9_rc3.ebuild
+++ b/kde-misc/filelight/filelight-1.9_rc3.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/filelight/filelight-1.9_rc3.ebuild,v 1.6 2010/03/06 09:17:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/filelight/filelight-1.9_rc3.ebuild,v 1.7 2010/06/05 13:57:03 ssuominen Exp $
 
 EAPI=2
 KMNAME="playground/utils"
-KDE_MINIMAL=4.2
 
 inherit kde4-base
 
@@ -23,6 +22,8 @@ RDEPEND="x11-apps/xdpyinfo"
 
 S=${WORKDIR}/${MY_P}
 
+PATCHES=( "${FILESDIR}/${P}-gcc45.patch" )
+
 src_prepare() {
        sed -i \
                -e '/qimageblitz/d' \

diff --git a/kde-misc/filelight/files/filelight-1.9_rc3-gcc45.patch b/kde-misc/filelight/files/filelight-1.9_rc3-gcc45.patch
new file mode 100644 (file)
index 0000000..3471cb3
--- /dev/null
+++ b/kde-misc/filelight/files/filelight-1.9_rc3-gcc45.patch
@@ -0,0 +1,24 @@
+http://bugs.gentoo.org/321357
+
+--- src/app/mainWindow.cpp
++++ src/app/mainWindow.cpp
+@@ -222,7 +222,7 @@
+ 
+ inline bool MainWindow::slotScanPath(const QString &path)
+ {
+-    return slotScanUrl(KUrl::KUrl(path));
++    return slotScanUrl(KUrl(path));
+ }
+ 
+ bool MainWindow::slotScanUrl(const KUrl &url)
+--- src/part/radialMap/widget.cpp
++++ src/part/radialMap/widget.cpp
+@@ -64,7 +64,7 @@
+ KUrl
+ RadialMap::Widget::url(File const * const file) const
+ {
+-    return KUrl::KUrl(file ? file->fullPath() : m_tree->fullPath());
++    return KUrl(file ? file->fullPath() : m_tree->fullPath());
+ }
+ 
+ void