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

[Andrea Scarpino]

    Date: Wednesday, January 26, 2011 @ 17:14:23
  Author: andrea
Revision: 107625

upstream release

Modified:
  polkit-kde/trunk/PKGBUILD
Deleted:
  polkit-kde/trunk/gcc4.5.patch
  polkit-kde/trunk/xdg-path.patch

----------------+
 PKGBUILD       |   26 ++++++++------------------
 gcc4.5.patch   |   14 --------------
 xdg-path.patch |   13 -------------
 3 files changed, 8 insertions(+), 45 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-01-26 22:13:47 UTC (rev 107624)
+++ PKGBUILD	2011-01-26 22:14:23 UTC (rev 107625)
@@ -1,36 +1,26 @@
-# $Id $
+# $Id: PKGBUILD 102634 2010-12-09 08:51:18Z andrea $
 # Maintainer: Andrea Scarpino <andrea at archlinux.org>
 # Contributor: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=polkit-kde
-pkgver=0.95.1
-pkgrel=2
-pkgdesc='KDE PolicyKit Authentication Agent'
+pkgver=0.99.0
+pkgrel=1
+pkgdesc='Daemon providing a polkit authentication UI for KDE'
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL')
 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'
-	'gcc4.5.patch')
-md5sums=('68e40d2a43335cb5876a1c8bc51c461b'
-         '84d4873e60c1b628bcbaaf38c7ab2f44'
-         '06caf1645510367eb253509240d3c8bd')
+source=("ftp://ftp.kde.org/pub/kde/stable/apps/KDE4.x/admin/${pkgname}-agent-1-${pkgver}.tar.bz2")
+md5sums=('a02d3fddc6270a88bceaf3ba604c92f8')
 
 build() {
-	cd ${srcdir}/${pkgname}-1-${pkgver}
-	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
-	cmake ../${pkgname}-1-${pkgver} \
+	cmake ../${pkgname}-agent-1-${pkgver} \
 		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_SKIP_RPATH=ON
+		-DCMAKE_INSTALL_PREFIX=/usr
 	make
 }
 

Deleted: gcc4.5.patch
===================================================================
--- gcc4.5.patch	2011-01-26 22:13:47 UTC (rev 107624)
+++ gcc4.5.patch	2011-01-26 22:14:23 UTC (rev 107625)
@@ -1,14 +0,0 @@
-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;

Deleted: xdg-path.patch
===================================================================
--- xdg-path.patch	2011-01-26 22:13:47 UTC (rev 107624)
+++ xdg-path.patch	2011-01-26 22:14:23 UTC (rev 107625)
@@ -1,13 +0,0 @@
---- agent/CMakeLists.txt	2009-12-23 12:31:29.000000000 +0100
-+++ agent/CMakeLists.txt	2010-02-10 21:26:05.183779591 +0100
-@@ -18,8 +18,8 @@
- 
- install(TARGETS polkit-kde-authentication-agent-1 DESTINATION ${LIBEXEC_INSTALL_DIR})
- 
--# Install .desktop file to the XDG_CONFIG_DIRS if exists, to the /etc/xdg/autostart otherwise
--set (DESKTOP_INSTALL_DIR $ENV{XDG_CONFIG_DIRS})
-+# Install .desktop file to the XDG_CONFIG_DIRS/autostart if exists, to the /etc/xdg/autostart otherwise
-+set (DESKTOP_INSTALL_DIR $ENV{XDG_CONFIG_DIRS}/autostart)
- if (DESKTOP_INSTALL_DIR)
- else (DESKTOP_INSTALL_DIR)
-   set (DESKTOP_INSTALL_DIR /etc/xdg/autostart)