Commit 99393b81 authored by Jeff Huang's avatar Jeff Huang 🤔
Browse files

[skip-ci] polkit-qt: udpate to 0.113.0, remove Qt4 support

parent fecf919e
Pipeline #4138 skipped
# $Id: PKGBUILD 102633 2010-12-09 08:40:59Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributions from Arch:
# Maintainer: Antonio Rojas <arojas@archlinux.org>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgbase=polkit-qt
pkgname=('polkit-qt4' 'polkit-qt5')
pkgver=0.112.0+git20180107
pkgname=(polkit-qt5)
pkgver=0.113.0
pkgrel=1
pkgdesc='A library that allows developers to access PolicyKit API with a nice Qt-style API'
arch=('x86_64')
url='https://projects.kde.org/projects/kdesupport/polkit-qt-1'
license=('LGPL')
makedepends=('cmake' 'automoc4' 'polkit' 'qt' 'qt5-base')
#source=("http://download.kde.org/stable/apps/KDE4.x/admin/${pkgbase}-1-${pkgver}.tar.bz2")
source=("${pkgbase}::git+https://anongit.kde.org/polkit-qt-1.git#commit=cbecf60ac7b5c17cf37503d6675bf5542efbab29")
md5sums=('SKIP')
arch=(x86_64)
url='https://www.kde.org/'
license=(LGPL)
depends=(polkit qt5-base)
makedepends=(cmake)
source=("http://download.kde.org/stable/$pkgbase-1/$pkgbase-1-$pkgver.tar.xz"{,.sig})
sha256sums=('5b866a2954ef10ffb66156e2fe8ad0321b5528a8df2e4a91b02f5041ce5563a7'
'SKIP')
validpgpkeys=(D81C0CB38EB725EF6691C385BB463350D6EF31EF) # Heiko Becker <heirecka@exherbo.org>
prepare() {
mkdir build{,-qt5}
mkdir -p build
}
build() {
cd build
cmake ../${pkgbase} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
-DLIB_DESTINATION=/usr/lib \
-DUSE_QT4=ON
cmake ../$pkgbase-1-$pkgver \
-DCMAKE_INSTALL_PREFIX=/usr
make
cd ../build-qt5
cmake ../${pkgbase} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
-DLIB_DESTINATION=/usr/lib
make
}
package_polkit-qt4() {
depends=('polkit' 'qt')
replaces=("polkit-qt<${pkgver}")
provides=("polkit-qt=${pkgver}")
conflicts=("polkit-qt<${pkgver}")
cd build
make DESTDIR="${pkgdir}" install
}
package_polkit-qt5() {
depends=('polkit' 'qt5-base')
cd build-qt5
make DESTDIR="${pkgdir}" install
cd build
make DESTDIR="$pkgdir" install
}
commit 88c6e9334c8440721189ef7d020fa94d47f30f8b
Author: Harald Sitter <sitter@kde.org>
Date: Fri Aug 1 16:34:03 2014 +0200
do not use global static systembus instance
global static destruction order cannot be controlled and we need our bus
to disconnect from the consolekit signals, so use our own bus instance
to connect to systembus signals
REVIEW: 119545
diff --git a/core/polkitqt1-authority.cpp b/core/polkitqt1-authority.cpp
index dd014cf..f25354d 100644
--- a/core/polkitqt1-authority.cpp
+++ b/core/polkitqt1-authority.cpp
@@ -83,7 +83,10 @@ public:
// Polkit will return NULL on failures, hence we use it instead of 0
Private(Authority *qq) : q(qq)
, pkAuthority(NULL)
- , m_hasError(false) {}
+ , m_hasError(false)
+ , m_systemBus(0)
+ {
+ }
~Private();
@@ -103,6 +106,13 @@ public:
bool m_hasError;
Authority::ErrorCode m_lastError;
QString m_errorDetails;
+ // Local system bus. QDBusConnection::systemBus() may only be savely used
+ // inside a QCoreApplication scope as for example destruction of connected
+ // objects need to happen before the bus disappears. Since this class however
+ // is a global static and systemBus() internally is a global static we
+ // cannot assure destruction order. Instead we create a local copy of the
+ // global systemBus instance so we can make life time to our needs.
+ // This prevents crashes when cleaning up the global statics.
QDBusConnection *m_systemBus;
GCancellable *m_checkAuthorizationCancellable,
*m_enumerateActionsCancellable,
@@ -127,6 +137,7 @@ public:
Authority::Private::~Private()
{
+ delete m_systemBus;
g_object_unref(m_checkAuthorizationCancellable);
g_object_unref(m_enumerateActionsCancellable);
g_object_unref(m_registerAuthenticationAgentCancellable);
@@ -170,6 +181,9 @@ void Authority::Private::init()
g_type_init();
+ m_systemBus = new QDBusConnection(QDBusConnection::connectToBus(QDBusConnection::SystemBus,
+ QString("polkit_qt_system_bus")));
+
m_checkAuthorizationCancellable = g_cancellable_new();
m_enumerateActionsCancellable = g_cancellable_new();
m_registerAuthenticationAgentCancellable = g_cancellable_new();
@@ -219,7 +233,7 @@ void Authority::Private::init()
// then we need to extract all seats from ConsoleKit
QDBusMessage msg = QDBusMessage::createMethodCall(consoleKitService, consoleKitManagerPath, consoleKitManagerInterface, "GetSeats");
- msg = QDBusConnection::systemBus().call(msg);
+ msg = m_systemBus->call(msg);
if (!msg.arguments().isEmpty()) {
// this method returns a list with present seats
QList<QString> seats;
@@ -256,8 +270,7 @@ void Authority::Private::seatSignalsConnect(const QString &seat)
void Authority::Private::dbusSignalAdd(const QString &service, const QString &path, const QString &interface, const QString &name)
{
// FIXME: This code seems to be nonfunctional - it needs to be fixed somewhere (is it Qt BUG?)
- QDBusConnection::systemBus().connect(service, path, interface, name,
- q, SLOT(dbusFilter(QDBusMessage)));
+ m_systemBus->connect(service, path, interface, name, q, SLOT(dbusFilter(QDBusMessage)));
}
void Authority::Private::dbusFilter(const QDBusMessage &message)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment