author | Andrea Scarpino
<andrea@archlinux.org> 2011-01-26 22:15:40 UTC |
committer | Andrea Scarpino
<andrea@archlinux.org> 2011-01-26 22:15:40 UTC |
parent | 6250b90b238acf28340d00210ac866b02901e207 |
PKGBUILD | +5 | -13 |
fix-deprecated-warnings.patch | +0 | -41 |
null-checking.patch | +0 | -14 |
diff --git a/PKGBUILD b/PKGBUILD index d2bfbd4..b71d737 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,28 +1,20 @@ +# $Id: PKGBUILD 102633 2010-12-09 08:40:59Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=polkit-qt -pkgver=0.96.1 -pkgrel=3 +pkgver=0.99.0 +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.kde.org/pub/kde/stable/apps/KDE4.x/admin/${pkgname}-1-${pkgver}.tar.bz2") +md5sums=('1c5b4113a2a167624b5f716b4f03a219') 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 diff --git a/fix-deprecated-warnings.patch b/fix-deprecated-warnings.patch deleted file mode 100644 index 7d1d25c..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_NONE, - subject->subject(), - objectPath.toAscii().data(), -+ NULL, - &error); - if (error != NULL) { - qWarning() << QString("Cannot register authentication agent: %1").arg(error->message); diff --git a/null-checking.patch b/null-checking.patch deleted file mode 100644 index 0ec2a8e..0000000 --- a/null-checking.patch +++ /dev/null @@ -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)