[arch-commits] Commit in (5 files)
Ike Devolder
idevolder at archlinux.org
Mon Sep 29 14:35:13 UTC 2014
Date: Monday, September 29, 2014 @ 16:35:13
Author: idevolder
Revision: 119783
packagekit-qt :: 0.9.2
Added:
packagekit-qt/
packagekit-qt/repos/
packagekit-qt/trunk/
packagekit-qt/trunk/0009-Disable-namespacing-and-classes-names-on-the-interfa.patch
packagekit-qt/trunk/PKGBUILD
-----------------------------------------------------------------+
0009-Disable-namespacing-and-classes-names-on-the-interfa.patch | 138 ++++++++++
PKGBUILD | 59 ++++
2 files changed, 197 insertions(+)
Added: packagekit-qt/trunk/0009-Disable-namespacing-and-classes-names-on-the-interfa.patch
===================================================================
--- packagekit-qt/trunk/0009-Disable-namespacing-and-classes-names-on-the-interfa.patch (rev 0)
+++ packagekit-qt/trunk/0009-Disable-namespacing-and-classes-names-on-the-interfa.patch 2014-09-29 14:35:13 UTC (rev 119783)
@@ -0,0 +1,138 @@
+From 3693ea5ed68b53fdb9e2d9c034dcda7b68798c89 Mon Sep 17 00:00:00 2001
+From: Daniel Nicoletti <dantti12 at gmail.com>
+Date: Tue, 16 Sep 2014 08:56:19 -0300
+Subject: [PATCH 09/12] Disable namespacing and classes names on the interfaces
+ generated by qdbusxml2cpp so the org.fdo.PackageKit.Offiline interface
+ doesn't clash the PackageKit typedef of org.fdo.PackageKit
+
+---
+ src/CMakeLists.txt | 4 ++--
+ src/daemon.cpp | 8 ++++----
+ src/daemonprivate.cpp | 2 +-
+ src/daemonprivate.h | 4 ++--
+ src/transactionprivate.cpp | 10 +++++-----
+ src/transactionprivate.h | 4 ++--
+ 6 files changed, 16 insertions(+), 16 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 5037fb2..9d5210f 100755
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -66,8 +66,8 @@ if (NOT PK_INTERFACE_XML OR NOT PK_TRANSACTION_INTERFACE_XML)
+ message (FATAL_ERROR "Unable to find PackageKit DBus specifications! Please install PackageKit to continue!")
+ endif ()
+
+-set_source_files_properties(${PK_INTERFACE_XML} PROPERTIES CLASSNAME DaemonProxy)
+-set_source_files_properties(${PK_TRANSACTION_INTERFACE_XML} PROPERTIES CLASSNAME TransactionProxy)
++set_source_files_properties(${PK_INTERFACE_XML} PROPERTIES NO_NAMESPACE true)
++set_source_files_properties(${PK_TRANSACTION_INTERFACE_XML} PROPERTIES NO_NAMESPACE true)
+
+ if (Qt5_FOUND)
+ qt5_add_dbus_interface(packagekitqt_SRC ${PK_INTERFACE_XML} daemonproxy)
+diff --git a/src/daemon.cpp b/src/daemon.cpp
+index fdea8a7..442ef55 100755
+--- a/src/daemon.cpp
++++ b/src/daemon.cpp
+@@ -47,10 +47,10 @@ Daemon::Daemon(QObject *parent) :
+ d_ptr(new DaemonPrivate(this))
+ {
+ Q_D(Daemon);
+- d->daemon = new ::DaemonProxy(QLatin1String(PK_NAME),
+- QLatin1String(PK_PATH),
+- QDBusConnection::systemBus(),
+- this);
++ d->daemon = new ::OrgFreedesktopPackageKitInterface(QLatin1String(PK_NAME),
++ QLatin1String(PK_PATH),
++ QDBusConnection::systemBus(),
++ this);
+
+ QDBusConnection::systemBus().connect(QLatin1String(PK_NAME),
+ QLatin1String(PK_PATH),
+diff --git a/src/daemonprivate.cpp b/src/daemonprivate.cpp
+index 6a52f14..25ba55b 100644
+--- a/src/daemonprivate.cpp
++++ b/src/daemonprivate.cpp
+@@ -124,7 +124,7 @@ void DaemonPrivate::updateProperties(const QVariantMap &properties)
+ } else if (property == QLatin1String("DistroId")) {
+ distroId = value.toString();
+ } else if (property == QLatin1String("Filters")) {
+- filters = static_cast<Transaction::Filters>(value.toULongLong());
++ filters = static_cast<Transaction::Filters>(value.toUInt());
+ } else if (property == QLatin1String("Groups")) {
+ groups = static_cast<Transaction::Groups>(value.toULongLong());
+ } else if (property == QLatin1String("Locked")) {
+diff --git a/src/daemonprivate.h b/src/daemonprivate.h
+index abc03a7..b8c2b6c 100644
+--- a/src/daemonprivate.h
++++ b/src/daemonprivate.h
+@@ -27,7 +27,7 @@
+
+ #include "daemon.h"
+
+-class DaemonProxy;
++class OrgFreedesktopPackageKitInterface;
+
+ namespace PackageKit {
+
+@@ -39,7 +39,7 @@ protected:
+ virtual ~DaemonPrivate() {}
+
+ Daemon *q_ptr;
+- ::DaemonProxy *daemon;
++ ::OrgFreedesktopPackageKitInterface *daemon;
+ QStringList hints;
+ QStringList connectedSignals;
+
+diff --git a/src/transactionprivate.cpp b/src/transactionprivate.cpp
+index 7a87aec..2c73899 100644
+--- a/src/transactionprivate.cpp
++++ b/src/transactionprivate.cpp
+@@ -46,10 +46,10 @@ void TransactionPrivate::setup(const QDBusObjectPath &transactionId)
+ Q_Q(Transaction);
+
+ tid = transactionId;
+- p = new TransactionProxy(QLatin1String(PK_NAME),
+- tid.path(),
+- QDBusConnection::systemBus(),
+- q);
++ p = new OrgFreedesktopPackageKitTransactionInterface(QLatin1String(PK_NAME),
++ tid.path(),
++ QDBusConnection::systemBus(),
++ q);
+ if (!Daemon::global()->hints().isEmpty()) {
+ q->setHints(Daemon::global()->hints());
+ }
+@@ -329,7 +329,7 @@ void TransactionPrivate::updateProperties(const QVariantMap &properties)
+ status = static_cast<Transaction::Status>(value.toUInt());
+ QMetaObject::invokeMethod(q, "statusChanged", Qt::QueuedConnection);
+ } else if (property == QLatin1String("TransactionFlags")) {
+- transactionFlags = static_cast<Transaction::TransactionFlags>(value.toULongLong());
++ transactionFlags = static_cast<Transaction::TransactionFlags>(value.toUInt());
+ QMetaObject::invokeMethod(q, "transactionFlagsChanged", Qt::QueuedConnection);
+ } else if (property == QLatin1String("Uid")) {
+ uid = value.toUInt();
+diff --git a/src/transactionprivate.h b/src/transactionprivate.h
+index 895cfac..72860d8 100644
+--- a/src/transactionprivate.h
++++ b/src/transactionprivate.h
+@@ -29,7 +29,7 @@
+
+ #include "transaction.h"
+
+-class TransactionProxy;
++class OrgFreedesktopPackageKitTransactionInterface;
+
+ namespace PackageKit {
+
+@@ -45,7 +45,7 @@ protected:
+ void runQueuedTransaction();
+
+ QDBusObjectPath tid;
+- ::TransactionProxy* p = 0;
++ ::OrgFreedesktopPackageKitTransactionInterface* p = 0;
+ Transaction *q_ptr;
+ QStringList connectedSignals;
+
+--
+2.0.1
+
Added: packagekit-qt/trunk/PKGBUILD
===================================================================
--- packagekit-qt/trunk/PKGBUILD (rev 0)
+++ packagekit-qt/trunk/PKGBUILD 2014-09-29 14:35:13 UTC (rev 119783)
@@ -0,0 +1,59 @@
+# $Id
+# Maintainer : BlackIkeEagle <ike DOT devolder AT gmail DOT com>
+
+pkgbase=packagekit-qt
+pkgname=(
+ "${pkgbase}4"
+ "${pkgbase}"
+)
+pkgver=0.9.2
+pkgrel=1
+arch=('i686' 'x86_64')
+license=('LGPLv2')
+url="http://www.packagekit.org/"
+makedepends=(
+"packagekit" 'qt4' 'cmake' 'qt5-base'
+)
+source=(
+ "http://www.freedesktop.org/software/PackageKit/releases/PackageKit-Qt-$pkgver.tar.xz"
+ '0009-Disable-namespacing-and-classes-names-on-the-interfa.patch'
+)
+sha256sums=(
+ 'd5a20d2a477c7b77feaabb7d1eb10d00e2168f81ae4b08a34398bbeded12f4ce'
+ '47c9d5e8184a865fb4ffdc3bee5618b3b5997931f81607f93e762f192791a64d'
+)
+
+prepare() {
+ cd "$srcdir/PackageKit-Qt-$pkgver"
+
+ patch -p1 -i "$srcdir/0009-Disable-namespacing-and-classes-names-on-the-interfa.patch"
+
+ mkdir "qt4"
+ mkdir "qt5"
+}
+
+build() {
+ cd "$srcdir/PackageKit-Qt-$pkgver/qt4"
+ cmake -DCMAKE_INSTALL_LIBDIR:PATH=lib ..
+ make
+
+ cd "$srcdir/PackageKit-Qt-$pkgver/qt5"
+ cmake -DCMAKE_INSTALL_LIBDIR:PATH=lib -DUSE_QT5=1 ..
+ make
+}
+
+package_packagekit-qt4() {
+ pkgdesc="QT4 bindings for PackageKit"
+ depends=('packagekit' 'qt4')
+
+ cd "$srcdir/PackageKit-Qt-$pkgver/qt4"
+ make DESTDIR="$pkgdir" install
+}
+
+package_packagekit-qt() {
+ pkgdesc="QT5 bindings for PackageKit"
+ depends=('packagekit' 'qt5-base')
+
+ cd "$srcdir/PackageKit-Qt-$pkgver/qt5"
+ make DESTDIR="$pkgdir" install
+}
Property changes on: packagekit-qt/trunk/PKGBUILD
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
More information about the arch-commits
mailing list