[arch-commits] Commit in polkit-qt (4 files)

[Andrea Scarpino]

    Date: Sunday, November 21, 2010 @ 06:08:38
  Author: andrea
Revision: 100193

prepare KDE 4.6 requirements

Added:
  polkit-qt/kde-unstable/
Modified:
  polkit-qt/kde-unstable/PKGBUILD	(contents, properties)
Deleted:
  polkit-qt/kde-unstable/fix-deprecated-warnings.patch
  polkit-qt/kde-unstable/null-checking.patch

-------------------------------+
 PKGBUILD                      |   18 ++++-------------
 fix-deprecated-warnings.patch |   41 ----------------------------------------
 null-checking.patch           |   14 -------------
 3 files changed, 5 insertions(+), 68 deletions(-)

Modified: kde-unstable/PKGBUILD
===================================================================
--- trunk/PKGBUILD	2010-11-21 10:48:12 UTC (rev 100192)
+++ kde-unstable/PKGBUILD	2010-11-21 11:08:38 UTC (rev 100193)
@@ -3,27 +3,19 @@
 # Contributor: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=polkit-qt
-pkgver=0.96.1
-pkgrel=3
+pkgver=git20101121
+pkgrel=1
 pkgdesc='A library that allows developers to access PolicyKit API with a nice Qt-style API'
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('LGPL')
 depends=('polkit' 'qt')
 makedepends=('cmake' 'automoc4')
-source=("ftp://ftp.kde.org/pub/kde/stable/apps/KDE4.x/admin/${pkgname}-1-${pkgver}.tar.bz2"
-	'fix-deprecated-warnings.patch'
-	'null-checking.patch')
-md5sums=('7d122aa67c6786ea7d0bb023701693a1'
-         '374d07ff3fb9984f71681bb719813bc4'
-         'a34dfa8408cf7add41dd2c9c522a61ce')
+source=("ftp://ftp.archlinux.org/other/kde/${pkgname}-1-${pkgver}.tar.bz2")
+md5sums=('56d3d64e2dc535ac0bca38856105a34a')
+options=('force')
 
 build() {
-	cd ${srcdir}/${pkgname}-1-${pkgver}
-
-	patch -Np0 -i ${srcdir}/fix-deprecated-warnings.patch
-	patch -Np0 -i ${srcdir}/null-checking.patch
-
 	cd ${srcdir}
 	mkdir build
 	cd build


Property changes on: polkit-qt/kde-unstable/PKGBUILD
___________________________________________________________________
Added: svn:keywords
   + Id

Deleted: kde-unstable/fix-deprecated-warnings.patch
===================================================================
--- trunk/fix-deprecated-warnings.patch	2010-11-21 10:48:12 UTC (rev 100192)
+++ kde-unstable/fix-deprecated-warnings.patch	2010-11-21 11:08:38 UTC (rev 100193)
@@ -1,41 +0,0 @@
-Index: core/polkitqt1-authority.cpp
-===================================================================
---- core/polkitqt1-authority.cpp	(revision 1183413)
-+++ core/polkitqt1-authority.cpp	(working copy)
-@@ -177,12 +177,17 @@
-     m_revokeTemporaryAuthorizationsCancellable = g_cancellable_new();
-     m_revokeTemporaryAuthorizationCancellable = g_cancellable_new();
- 
-+    GError *gerror = NULL;
-     if (pkAuthority == NULL) {
--        pkAuthority = polkit_authority_get();
-+        pkAuthority = polkit_authority_get_sync(NULL, &gerror);
-+        if (gerror != NULL) {
-+            setError(E_GetAuthority, gerror->message);
-+            g_error_free(gerror);
-+            return;
-+        }
-     }
- 
-     if (pkAuthority == NULL) {
--        (E_GetAuthority);
-         return;
-     }
- 
-Index: agent/polkitqt1-agent-listener.cpp
-===================================================================
---- agent/polkitqt1-agent-listener.cpp	(revision 1183413)
-+++ agent/polkitqt1-agent-listener.cpp	(working copy)
-@@ -73,9 +73,11 @@
- {
-     GError *error = NULL;
- 
--    bool r = polkit_agent_register_listener(d->listener,
-+    bool r = polkit_agent_listener_register(d->listener,
-+                                            POLKIT_AGENT_REGISTER_FLAGS_NONE,
-                                             subject->subject(),
-                                             objectPath.toAscii().data(),
-+                                            NULL,
-                                             &error);
-     if (error != NULL) {
-         qWarning() << QString("Cannot register authentication agent: %1").arg(error->message);

Deleted: kde-unstable/null-checking.patch
===================================================================
--- trunk/null-checking.patch	2010-11-21 10:48:12 UTC (rev 100192)
+++ kde-unstable/null-checking.patch	2010-11-21 11:08:38 UTC (rev 100193)
@@ -1,14 +0,0 @@
-Index: agent/polkitqt1-agent-listener.cpp
-===================================================================
---- agent/polkitqt1-agent-listener.cpp	(revision 1183495)
-+++ agent/polkitqt1-agent-listener.cpp	(working copy)
-@@ -66,7 +66,8 @@
-     qDebug("Destroying listener");
- 
-     ListenerAdapter::instance()->removeListener(this);
--    g_object_unref(d->listener);
-+    if (d->listener != NULL)
-+        g_object_unref(d->listener);
- }
- 
- bool Listener::registerListener(PolkitQt1::Subject *subject, const QString &objectPath)