Date: Saturday, October 9, 2010 @ 06:54:23 Author: andrea Revision: 94661
upgpkg: polkit-qt 0.96.1-1 upstream release; new source URL and fixes segfault when logout/shutdown from KDE (FS#21101) Added: polkit-qt/trunk/fix-deprecated-warnings.patch polkit-qt/trunk/null-checking.patch Modified: polkit-qt/trunk/PKGBUILD -------------------------------+ PKGBUILD | 24 +++++++++++++++-------- fix-deprecated-warnings.patch | 41 ++++++++++++++++++++++++++++++++++++++++ null-checking.patch | 14 +++++++++++++ 3 files changed, 71 insertions(+), 8 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-10-09 09:58:52 UTC (rev 94660) +++ PKGBUILD 2010-10-09 10:54:23 UTC (rev 94661) @@ -1,8 +1,9 @@ -# $Id: $ -# Maintainer: Pierre Schmitz <[email protected]> +# $Id$ +# Maintainer: Andrea Scarpino <[email protected]> +# Contributor: Pierre Schmitz <[email protected]> pkgname=polkit-qt -pkgver=0.95.1 +pkgver=0.96.1 pkgrel=1 pkgdesc='A library that allows developers to access PolicyKit API with a nice Qt-style API' arch=('i686' 'x86_64') @@ -10,18 +11,25 @@ license=('LGPL') depends=('polkit' 'qt') makedepends=('cmake' 'automoc4') -source=("ftp://ftp.kde.org/pub/kde/stable/${pkgname}-1/${pkgname}-1-${pkgver}.tar.bz2";) -md5sums=('b5c5017058ab0f3bc7eb337a7c66e0bc') +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} mkdir build cd build cmake ../${pkgname}-1-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_SKIP_RPATH=ON - make || return 1 + -DCMAKE_INSTALL_PREFIX=/usr + make } package() { Added: fix-deprecated-warnings.patch =================================================================== --- fix-deprecated-warnings.patch (rev 0) +++ fix-deprecated-warnings.patch 2010-10-09 10:54:23 UTC (rev 94661) @@ -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_RUN_IN_THREAD, + subject->subject(), + objectPath.toAscii().data(), ++ NULL, + &error); + if (error != NULL) { + qWarning() << QString("Cannot register authentication agent: %1").arg(error->message); Added: null-checking.patch =================================================================== --- null-checking.patch (rev 0) +++ null-checking.patch 2010-10-09 10:54:23 UTC (rev 94661) @@ -0,0 +1,14 @@ +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)
