[arch-commits] Commit in polkit-qt/trunk (PKGBUILD fix-deprecated-warnings.patch)

[Andrea Scarpino]

    Date: Tuesday, October 12, 2010 @ 15:57:39
  Author: andrea
Revision: 94949

upgpkg: polkit-qt 0.96.1-3
re-added a modified version of deprecated-warnings patch which fix crash on logout/shutdown (FS#21223)

Added:
  polkit-qt/trunk/fix-deprecated-warnings.patch
Modified:
  polkit-qt/trunk/PKGBUILD

-------------------------------+
 PKGBUILD                      |    6 ++++-
 fix-deprecated-warnings.patch |   41 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-10-12 19:49:08 UTC (rev 94948)
+++ PKGBUILD	2010-10-12 19:57:39 UTC (rev 94949)
@@ -4,7 +4,7 @@
 
 pkgname=polkit-qt
 pkgver=0.96.1
-pkgrel=2
+pkgrel=3
 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'
@@ -12,12 +12,16 @@
 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')
 
 build() {
 	cd ${srcdir}/${pkgname}-1-${pkgver}
+
+	patch -Np0 -i ${srcdir}/fix-deprecated-warnings.patch
 	patch -Np0 -i ${srcdir}/null-checking.patch
 
 	cd ${srcdir}

Added: fix-deprecated-warnings.patch
===================================================================
--- fix-deprecated-warnings.patch	                        (rev 0)
+++ fix-deprecated-warnings.patch	2010-10-12 19:57:39 UTC (rev 94949)
@@ -0,0 +1,41 @@
+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);