Fix build w/ GCC 4.5. (bug #314471 by Bernd Buschinski)

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

4 files changed, 29 insertions, 8 deletions

diff --git a/sys-auth/polkit-kde/ChangeLog b/sys-auth/polkit-kde/ChangeLog
index 3d0018cf5578..b75579c8d6e1 100644
--- a/sys-auth/polkit-kde/ChangeLog
+++ b/sys-auth/polkit-kde/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-auth/polkit-kde
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit-kde/ChangeLog,v 1.2 2010/02/23 08:07:21 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit-kde/ChangeLog,v 1.3 2010/04/11 21:09:12 dirtyepic Exp $
+
+  11 Apr 2010; Ryan Hill <dirtyepic@gentoo.org> polkit-kde-0.95.1.ebuild,
+  +files/polkit-kde-0.95.1-gcc45.patch:
+  Fix build w/ GCC 4.5. (bug #314471 by Bernd Buschinski)
 
   23 Feb 2010; Joseph Jezak <josejx@gentoo.org> polkit-kde-0.95.1.ebuild:
   Marked ~ppc/~ppc64 for bug #296548.
diff --git a/sys-auth/polkit-kde/Manifest b/sys-auth/polkit-kde/Manifest
index a8d06bb3b6cb..c5fd1687741e 100644
--- a/sys-auth/polkit-kde/Manifest
+++ b/sys-auth/polkit-kde/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX polkit-kde-0.95.1-gcc45.patch 716 RMD160 73111981118fdac5c90b2232501848c3fff2dac0 SHA1 4abb79e00357df61fd7e4efb08194225e6a09620 SHA256 5b54121a53c6a740c35199fba789cd3eb0fbecd54117c6e1b26d48fd4fd07244
 DIST polkit-kde-1-0.95.1.tar.bz2 21345 RMD160 805f7bd4bcb9dddaeeaf214fc77d2f0f3470336e SHA1 f6cca0173beeffa244e75c6e30ac83a2f67bf504 SHA256 3a16fdc80a57efd4713c12b04762f1dca5e6b58bd61b9ef0cdc89619d7e8d98a
-EBUILD polkit-kde-0.95.1.ebuild 753 RMD160 883686ec5bcccf49d93cf653f23b76f68ade225d SHA1 e71d6a181141168dde5d3c6fd0d406c69ad63908 SHA256 51226ab483201707d7d34bbe110e0114d13828cfdd8b215c223fd9c0d424c39a
-MISC ChangeLog 471 RMD160 de790a5df5dd29b93fe440276ee81b966e739540 SHA1 6d3616e315b137af40e7087574cc4e80ca6e0b3e SHA256 5fce664c466ede19967b2425e914dfd43d6b4db4b6c2c040d7d5f0ccb5feb69c
+EBUILD polkit-kde-0.95.1.ebuild 840 RMD160 207bbeda6f810f58f4944717e84768f96a9c430d SHA1 7bbcbc378904096e7a52a7a7519a4e2bd9e016ff SHA256 5412209026a54a2d8f552562e4a51c87ac5b8f9d44ebab0c6a2b9c933a0ecbe2
+MISC ChangeLog 647 RMD160 5d5720e1cf2ccee169e751f487348485de6cd9d2 SHA1 a2b15c0f653b479a6d6653bb8c238fca6a76ba1c SHA256 8e3a98be9064711bf36b28af96bfe834b3a84d06b9ac400afaa6171c1b7f02aa
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkuDjHEACgkQcsIHjyDViGQOkACaA3QF6ZmwmfhWTJzOmpBDck9N
-peUAn2nBIYb3kpQn8hjZwwef+39X2Qm7
-=8WPU
+iEYEARECAAYFAkvCOywACgkQiqiDRvmkBmJpOQCg2KqW+3blo18/WNi57PIhr81K
+bxIAoL6IElQsocew4bNsv//dRZMmfnf2
+=W/FY
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/polkit-kde/files/polkit-kde-0.95.1-gcc45.patch b/sys-auth/polkit-kde/files/polkit-kde-0.95.1-gcc45.patch
new file mode 100644
index 000000000000..9f83fc00d02d
--- /dev/null
+++ b/sys-auth/polkit-kde/files/polkit-kde-0.95.1-gcc45.patch
@@ -0,0 +1,14 @@
+http://bugs.gentoo.org/314471
+http://websvn.kde.org/trunk/extragear/base/polkit-kde-1/agent/AuthDialog.cpp?r1=1065570&r2=1073600
+
+--- trunk/extragear/base/polkit-kde-1/agent/AuthDialog.cpp
++++ trunk/extragear/base/polkit-kde-1/agent/AuthDialog.cpp
+@@ -195,7 +195,7 @@
+         foreach(PolkitQt1::Identity *identity, identities) {
+             // First check to see if the user is valid
+             qDebug() << "User: " << identity;
+-            KUser user = KUser::KUser(identity->toString().remove("unix-user:"));
++            KUser user(identity->toString().remove("unix-user:"));
+             if (!user.isValid()) {
+                 kWarning() << "User invalid: " << user.loginName();
+                 continue;
diff --git a/sys-auth/polkit-kde/polkit-kde-0.95.1.ebuild b/sys-auth/polkit-kde/polkit-kde-0.95.1.ebuild
index 773649febacd..e483b17cdd0b 100644
--- a/sys-auth/polkit-kde/polkit-kde-0.95.1.ebuild
+++ b/sys-auth/polkit-kde/polkit-kde-0.95.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit-kde/polkit-kde-0.95.1.ebuild,v 1.2 2010/02/23 08:07:21 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit-kde/polkit-kde-0.95.1.ebuild,v 1.3 2010/04/11 21:09:12 dirtyepic Exp $
 
 EAPI="2"
 
@@ -28,3 +28,5 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 [[ ${PV} = *9999* ]] || S="${WORKDIR}/${MY_P}"
+
+PATCHES+="${FILESDIR}/${P}-gcc45.patch" # 314471 - fixed upstream for next version