git » polkit-qt.git » commit 0998960

remove deprecated-warning.patch which seems to broke GUI (FS#21211)

author Andrea Scarpino
2010-10-12 15:15:02 UTC
committer Andrea Scarpino
2010-10-12 15:15:02 UTC
parent 54074c4a2085b5b16a7a1cb0218c2ccccb408a0d

remove deprecated-warning.patch which seems to broke GUI (FS#21211)

PKGBUILD +1 -4
fix-deprecated-warnings.patch +0 -41

diff --git a/PKGBUILD b/PKGBUILD
index c6acc36..53829c2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=polkit-qt
 pkgver=0.96.1
-pkgrel=1
+pkgrel=2
 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'
@@ -11,15 +11,12 @@ 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'
-         '2ff7e14cfa198eaca9189c15158adf37'
          'a34dfa8408cf7add41dd2c9c522a61ce')
 
 build() {
 	cd ${srcdir}/${pkgname}-1-${pkgver}
-	patch -Np0 -i ${srcdir}/fix-deprecated-warnings.patch
 	patch -Np0 -i ${srcdir}/null-checking.patch
 
 	cd ${srcdir}
diff --git a/fix-deprecated-warnings.patch b/fix-deprecated-warnings.patch
deleted file mode 100644
index fa136b0..0000000
--- a/fix-deprecated-warnings.patch
+++ /dev/null
@@ -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_RUN_IN_THREAD,
-                                             subject->subject(),
-                                             objectPath.toAscii().data(),
-+                                            NULL,
-                                             &error);
-     if (error != NULL) {
-         qWarning() << QString("Cannot register authentication agent: %1").arg(error->message);