[arch-commits] Commit in polkit-kde/trunk (PKGBUILD gcc4.5.patch)

[Andrea Scarpino]

    Date: Wednesday, September 8, 2010 @ 09:11:27
  Author: andrea
Revision: 90137

fix build using gcc 4.5 (FS#20772)

Added:
  polkit-kde/trunk/gcc4.5.patch
Modified:
  polkit-kde/trunk/PKGBUILD

--------------+
 PKGBUILD     |   19 ++++++++++++-------
 gcc4.5.patch |   14 ++++++++++++++
 2 files changed, 26 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2010-09-08 10:40:26 UTC (rev 90136)
+++ PKGBUILD    2010-09-08 13:11:27 UTC (rev 90137)
@@ -1,5 +1,6 @@
-# $Id: $
-# Maintainer: Pierre Schmitz <pie...@archlinux.de>
+# $Id $
+# Maintainer: Andrea Scarpino <and...@archlinux.org>
+# Contributor: Pierre Schmitz <pie...@archlinux.de>
 
 pkgname=polkit-kde
 pkgver=0.95.1
@@ -11,14 +12,18 @@
 depends=('kdelibs')
 makedepends=('cmake' 'automoc4')
 
source=("ftp://ftp.kde.org/pub/kde/stable/apps/KDE4.x/admin/${pkgname}-1-${pkgver}.tar.bz2";
-        'xdg-path.patch')
+        'xdg-path.patch'
+       'gcc4.5.patch')
 md5sums=('68e40d2a43335cb5876a1c8bc51c461b'
-         '84d4873e60c1b628bcbaaf38c7ab2f44')
+         '84d4873e60c1b628bcbaaf38c7ab2f44'
+         '06caf1645510367eb253509240d3c8bd')
 
 build() {
        cd ${srcdir}/${pkgname}-1-${pkgver}
-       patch -p0 -i ${srcdir}/xdg-path.patch || return 1
-       cd ..
+       patch -p0 -i ${srcdir}/xdg-path.patch
+       patch -Np4 -i ${srcdir}/gcc4.5.patch
+
+       cd ${srcdir}
        mkdir build
        cd build
        export XDG_CONFIG_DIRS=/etc/xdg
@@ -26,7 +31,7 @@
                -DCMAKE_BUILD_TYPE=Release \
                -DCMAKE_INSTALL_PREFIX=/usr \
                -DCMAKE_SKIP_RPATH=ON
-       make || return 1
+       make
 }
 
 package() {

Added: gcc4.5.patch
===================================================================
--- gcc4.5.patch                                (rev 0)
+++ gcc4.5.patch        2010-09-08 13:11:27 UTC (rev 90137)
@@ -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;