Date: Tuesday, January 20, 2015 @ 10:42:33 Author: eworm Revision: 126292
upgpkg packagekit-qt 0.9.5-4 Added: packagekit-qt/trunk/PKGBUILD Deleted: packagekit-qt/trunk/0001-Remove-daemon-proxy-conection-to-changed.patch packagekit-qt/trunk/0002-Add-operator-to-bitfield.patch packagekit-qt/trunk/0003-Remove-the-metatype-registration-for-Transaction-typ.patch packagekit-qt/trunk/0004-Remove-RoleUpgradeSystem-as-it-s-not-supported-in-0..patch packagekit-qt/trunk/0005-Properly-export-cmake-targets.patch packagekit-qt/trunk/0006-Don-t-assume-the-target-is-packagekitqt5.patch packagekit-qt/trunk/0007-Fix-compilation-due-to-not-set-cmake-variable.patch packagekit-qt/trunk/0008-Fix-QPK-include-dir-in-cmake-module.patch packagekit-qt/trunk/0009-Disable-namespacing-and-classes-names-on-the-interfa.patch packagekit-qt/trunk/PKGBUILD -----------------------------------------------------------------+ 0001-Remove-daemon-proxy-conection-to-changed.patch | 28 -- 0002-Add-operator-to-bitfield.patch | 74 ----- 0003-Remove-the-metatype-registration-for-Transaction-typ.patch | 44 --- 0004-Remove-RoleUpgradeSystem-as-it-s-not-supported-in-0..patch | 25 - 0005-Properly-export-cmake-targets.patch | 101 ------- 0006-Don-t-assume-the-target-is-packagekitqt5.patch | 25 - 0007-Fix-compilation-due-to-not-set-cmake-variable.patch | 32 -- 0008-Fix-QPK-include-dir-in-cmake-module.patch | 25 - 0009-Disable-namespacing-and-classes-names-on-the-interfa.patch | 138 ---------- PKGBUILD | 136 +++------ 10 files changed, 53 insertions(+), 575 deletions(-) Deleted: 0001-Remove-daemon-proxy-conection-to-changed.patch =================================================================== --- 0001-Remove-daemon-proxy-conection-to-changed.patch 2015-01-20 09:09:12 UTC (rev 126291) +++ 0001-Remove-daemon-proxy-conection-to-changed.patch 2015-01-20 09:42:33 UTC (rev 126292) @@ -1,28 +0,0 @@ -From ec677018df575ef295b5a57b66436b24ded63850 Mon Sep 17 00:00:00 2001 -From: Daniel Nicoletti <[email protected]> -Date: Tue, 6 May 2014 12:42:28 -0300 -Subject: [PATCH 01/12] Remove daemon proxy conection to changed() - ---- - src/daemon.cpp | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/src/daemon.cpp b/src/daemon.cpp -index 621fb89..06907f4 100755 ---- a/src/daemon.cpp -+++ b/src/daemon.cpp -@@ -94,10 +94,7 @@ void DaemonPrivate::setupSignal(const QString &signal, bool connect) - const char *signalToConnect = 0; - const char *memberToConnect = 0; - -- if (signal == SIGNAL(changed())) { -- signalToConnect = SIGNAL(Changed()); -- memberToConnect = SIGNAL(changed()); -- } else if (signal == SIGNAL(repoListChanged())) { -+ if (signal == SIGNAL(repoListChanged())) { - signalToConnect = SIGNAL(RepoListChanged()); - memberToConnect = SIGNAL(repoListChanged()); - } else if (signal == SIGNAL(restartScheduled())) { --- -2.0.1 - Deleted: 0002-Add-operator-to-bitfield.patch =================================================================== --- 0002-Add-operator-to-bitfield.patch 2015-01-20 09:09:12 UTC (rev 126291) +++ 0002-Add-operator-to-bitfield.patch 2015-01-20 09:42:33 UTC (rev 126292) @@ -1,74 +0,0 @@ -From c7b3c1dde34409fba8fd80355338d7f3fc1feffe Mon Sep 17 00:00:00 2001 -From: Daniel Nicoletti <[email protected]> -Date: Tue, 6 May 2014 12:43:26 -0300 -Subject: [PATCH 02/12] Add operator== to bitfield - ---- - src/bitfield.cpp | 15 ++++++++++----- - src/bitfield.h | 6 +++++- - 2 files changed, 15 insertions(+), 6 deletions(-) - -diff --git a/src/bitfield.cpp b/src/bitfield.cpp -index c986905..68ef80c 100644 ---- a/src/bitfield.cpp -+++ b/src/bitfield.cpp -@@ -2,7 +2,7 @@ - - using namespace PackageKit; - --Bitfield::Bitfield () : m_val (0) -+Bitfield::Bitfield () - { - } - -@@ -61,10 +61,15 @@ Bitfield Bitfield::operator|= (Bitfield mask) - - Bitfield& Bitfield::operator= (const Bitfield& other) - { -- if (this == &other) -- return *this; -+ if (this == &other) -+ return *this; - -- m_val = other.m_val; -+ m_val = other.m_val; - -- return *this; -+ return *this; -+} -+ -+bool Bitfield::operator==(const Bitfield &other) -+{ -+ return m_val == other.m_val; - } -diff --git a/src/bitfield.h b/src/bitfield.h -index d7dd481..8535e46 100644 ---- a/src/bitfield.h -+++ b/src/bitfield.h -@@ -2,6 +2,7 @@ - #define PACKAGEKIT_BITFIELD_H - - #include <QtGlobal> -+#include <QMetaType> - - namespace PackageKit { - -@@ -23,11 +24,14 @@ public: - Bitfield operator|= (Bitfield mask); - - Bitfield& operator= (const Bitfield& other); -+ bool operator==(const Bitfield &other); - - private: -- qulonglong m_val; -+ qulonglong m_val = 0; - }; - - } // End namespace PackageKit - -+Q_DECLARE_METATYPE(PackageKit::Bitfield) -+ - #endif --- -2.0.1 - Deleted: 0003-Remove-the-metatype-registration-for-Transaction-typ.patch =================================================================== --- 0003-Remove-the-metatype-registration-for-Transaction-typ.patch 2015-01-20 09:09:12 UTC (rev 126291) +++ 0003-Remove-the-metatype-registration-for-Transaction-typ.patch 2015-01-20 09:42:33 UTC (rev 126292) @@ -1,44 +0,0 @@ -From 9e3a611a3c1177878df2f09b6c4e0bee13239ba3 Mon Sep 17 00:00:00 2001 -From: Daniel Nicoletti <[email protected]> -Date: Tue, 6 May 2014 12:44:51 -0300 -Subject: [PATCH 03/12] Remove the metatype registration for Transaction types - as is't a bit useless since it depends on the namespace being used better - leave this to the client to register - ---- - src/daemon.cpp | 19 ------------------- - 1 file changed, 19 deletions(-) - -diff --git a/src/daemon.cpp b/src/daemon.cpp -index 06907f4..fdea8a7 100755 ---- a/src/daemon.cpp -+++ b/src/daemon.cpp -@@ -66,25 +66,6 @@ Daemon::Daemon(QObject *parent) : - if (!db.open()) { - qDebug() << "Failed to initialize the desktop files database"; - } -- -- qRegisterMetaType<PackageKit::Daemon::Network>("PackageKit::Daemon::Network"); -- qRegisterMetaType<PackageKit::Daemon::Authorize>("PackageKit::Daemon::Authorize"); -- qRegisterMetaType<PackageKit::Transaction::InternalError>("PackageKit::Transaction::InternalError"); -- qRegisterMetaType<PackageKit::Transaction::Role>("PackageKit::Transaction::Role"); -- qRegisterMetaType<PackageKit::Transaction::Error>("PackageKit::Transaction::Error"); -- qRegisterMetaType<PackageKit::Transaction::Exit>("PackageKit::Transaction::Exit"); -- qRegisterMetaType<PackageKit::Transaction::Filter>("PackageKit::Transaction::Filter"); -- qRegisterMetaType<PackageKit::Transaction::Message>("PackageKit::Transaction::Message"); -- qRegisterMetaType<PackageKit::Transaction::Status>("PackageKit::Transaction::Status"); -- qRegisterMetaType<PackageKit::Transaction::MediaType>("PackageKit::Transaction::MediaType"); -- qRegisterMetaType<PackageKit::Transaction::DistroUpgrade>("PackageKit::Transaction::DistroUpgrade"); -- qRegisterMetaType<PackageKit::Transaction::TransactionFlag>("PackageKit::Transaction::TransactionFlag"); -- qRegisterMetaType<PackageKit::Transaction::TransactionFlags>("PackageKit::Transaction::TransactionFlags"); -- qRegisterMetaType<PackageKit::Transaction::Restart>("PackageKit::Transaction::Restart"); -- qRegisterMetaType<PackageKit::Transaction::UpdateState>("PackageKit::Transaction::UpdateState"); -- qRegisterMetaType<PackageKit::Transaction::Group>("PackageKit::Transaction::Group"); -- qRegisterMetaType<PackageKit::Transaction::Info>("PackageKit::Transaction::Info"); -- qRegisterMetaType<PackageKit::Transaction::SigType>("PackageKit::Transaction::SigType"); - } - - void DaemonPrivate::setupSignal(const QString &signal, bool connect) --- -2.0.1 - Deleted: 0004-Remove-RoleUpgradeSystem-as-it-s-not-supported-in-0..patch =================================================================== --- 0004-Remove-RoleUpgradeSystem-as-it-s-not-supported-in-0..patch 2015-01-20 09:09:12 UTC (rev 126291) +++ 0004-Remove-RoleUpgradeSystem-as-it-s-not-supported-in-0..patch 2015-01-20 09:42:33 UTC (rev 126292) @@ -1,25 +0,0 @@ -From d53989d7c8051ae0be95a91725646bd4f5fe38b9 Mon Sep 17 00:00:00 2001 -From: Daniel Nicoletti <[email protected]> -Date: Wed, 7 May 2014 16:16:25 -0300 -Subject: [PATCH 04/12] Remove RoleUpgradeSystem as it's not supported in 0.9.x - anymore - ---- - src/transaction.h | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/transaction.h b/src/transaction.h -index 2b03f41..7b17fc5 100644 ---- a/src/transaction.h -+++ b/src/transaction.h -@@ -140,7 +140,6 @@ public: - RoleGetDistroUpgrades, - RoleGetCategories, - RoleGetOldTransactions, -- RoleUpgradeSystem, // Since 0.6.11 - RoleRepairSystem, // Since 0.7.2 - RoleGetDetailsLocal, // Since 0.8.17 - RoleGetFilesLocal, // Since 0.9.1 --- -2.0.1 - Deleted: 0005-Properly-export-cmake-targets.patch =================================================================== --- 0005-Properly-export-cmake-targets.patch 2015-01-20 09:09:12 UTC (rev 126291) +++ 0005-Properly-export-cmake-targets.patch 2015-01-20 09:42:33 UTC (rev 126292) @@ -1,101 +0,0 @@ -From 8547dc427bd0d09faef7b26078adf39c2fe74e01 Mon Sep 17 00:00:00 2001 -From: Aleix Pol <[email protected]> -Date: Tue, 19 Aug 2014 18:54:46 +0200 -Subject: [PATCH 05/12] Properly export cmake targets - ---- - CMakeLists.txt | 7 +++++++ - src/CMakeLists.txt | 20 +++++++++++--------- - src/modules/packagekit-qt-config.cmake.in | 7 +++---- - 3 files changed, 21 insertions(+), 13 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index fa8978a..5df701d 100755 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -51,6 +51,7 @@ set (LOCALE_DIR "${DATADIR}/locale") - set (VERSION "${QPACKAGEKIT_VERSION}") - set (BUILDDIR "${CMAKE_BINARY_DIR}") - set (LOCALSTATEDIR "/var") -+set (CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${LIBNAME}/") - - add_definitions("-DLOCALSTATEDIR=\"${LOCALSTATEDIR}\"") - add_definitions("-std=gnu++11") -@@ -75,3 +76,9 @@ endif (DISABLE_MAINTAINER_CFLAGS) - add_definitions(${MAINTAINER_CFLAGS}) - - add_subdirectory(src) -+ -+install(EXPORT PackageKitQtTargets -+ DESTINATION "${CMAKECONFIG_INSTALL_DIR}" -+ FILE PackageKitQtTargets.cmake -+ NAMESPACE PK:: -+ COMPONENT Devel) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 8ef7906..d1176ec 100755 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -55,13 +55,14 @@ set(packagekitqt_SRC - details.cpp - ) - --find_file(PK_INTERFACE_XML org.freedesktop.PackageKit.xml -- PATHS ${CMAKE_INSTALL_PREFIX}/share/dbus-1/interfaces/ -+find_path(PK_INTERFACES_DIR org.freedesktop.PackageKit.xml -+ HINTS ${CMAKE_INSTALL_PREFIX} /usr -+ PATH_SUFFIXES share/dbus-1/interfaces/ - ) --find_file(PK_TRANSACTION_INTERFACE_XML org.freedesktop.PackageKit.Transaction.xml -- PATHS ${CMAKE_INSTALL_PREFIX}/share/dbus-1/interfaces/ --) --if (PK_INTERFACE_XML STREQUAL "PK_INTERFACE_XML-NOTFOUND" OR PK_TRANSACTION_INTERFACE_XML STREQUAL "PK_TRANSACTION_INTERFACE_XML-NOTFOUND") -+set(PK_INTERFACE_XML "${PK_INTERFACES_DIR}/org.freedesktop.PackageKit.xml") -+set(PK_TRANSACTION_INTERFACE_XML "${PK_INTERFACES_DIR}/org.freedesktop.PackageKit.Transaction.xml") -+ -+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 () - -@@ -87,7 +88,8 @@ set_target_properties(${LIBNAME} PROPERTIES VERSION ${QPACKAGEKIT_VERSION} SOVER - if (Qt5_FOUND) - add_dependencies(${LIBNAME} mocs) - target_link_libraries(${LIBNAME} -- ${Qt5DBus_LIBRARIES} ${Qt5Sql_LIBRARIES} -+ LINK_PUBLIC Qt5::DBus -+ LINK_PRIVATE Qt5::Sql - ) - elseif (Qt4_FOUND) - target_link_libraries(${LIBNAME} -@@ -99,8 +101,8 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${LIBNAME}.pc.in - ${CMAKE_CURRENT_BINARY_DIR}/${LIBNAME}.pc - @ONLY - ) -- --install(TARGETS ${LIBNAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+target_include_directories(${LIBNAME} INTERFACE "$<INSTALL_INTERFACE:include/PackageKit/>") -+install(TARGETS ${LIBNAME} EXPORT PackageKitQtTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LIBNAME}.pc - DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig - ) -diff --git a/src/modules/packagekit-qt-config.cmake.in b/src/modules/packagekit-qt-config.cmake.in -index f9f4436..a91b095 100644 ---- a/src/modules/packagekit-qt-config.cmake.in -+++ b/src/modules/packagekit-qt-config.cmake.in -@@ -1,11 +1,10 @@ - # - Config information for PackageKit-Qt@QT_VERSION@ - # This file defines: - # --# PackageKitQt@QT_VERSION@_INCLUDE_DIR - the PackageKitQt@QT_VERSION@ include directory - # PackageKitQt@QT_VERSION@_LIBRARIES - Link these to use PackageKitQt@QT_VERSION@ - - SET(prefix "@CMAKE_INSTALL_PREFIX@") - SET(exec_prefix "@CMAKE_INSTALL_PREFIX@") --SET(PackageKitQt@QT_VERSION@_LIBRARIES "@PKQT_INSTALL_LIBDIR@/lib@[email protected]" CACHE FILEPATH "Libraries for PackageKitQt@QT_VERSION@") --SET(PackageKitQt@QT_VERSION@_INCLUDE_DIR "@CMAKE_INSTALL_PREFIX@/include/PackageKit/@LIBNAME@" CACHE PATH "Include path for PackageKitQt@QT_VERSION@") --SET(PackageKitQt@QT_VERSION@_FOUND "TRUE") -+SET(PackageKitQt@QT_VERSION@_LIBRARIES "PK::packagekitqt5") -+ -+include("${CMAKE_CURRENT_LIST_DIR}/PackageKitQtTargets.cmake") --- -2.0.1 - Deleted: 0006-Don-t-assume-the-target-is-packagekitqt5.patch =================================================================== --- 0006-Don-t-assume-the-target-is-packagekitqt5.patch 2015-01-20 09:09:12 UTC (rev 126291) +++ 0006-Don-t-assume-the-target-is-packagekitqt5.patch 2015-01-20 09:42:33 UTC (rev 126292) @@ -1,25 +0,0 @@ -From 0d929b4afe1a761c53df5f1c719334712f05fa6b Mon Sep 17 00:00:00 2001 -From: Aleix Pol <[email protected]> -Date: Wed, 27 Aug 2014 16:08:59 +0200 -Subject: [PATCH 06/12] Don't assume the target is packagekitqt5 - -It can also be packagekitqt4 ---- - src/modules/packagekit-qt-config.cmake.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/modules/packagekit-qt-config.cmake.in b/src/modules/packagekit-qt-config.cmake.in -index a91b095..3dcf3f3 100644 ---- a/src/modules/packagekit-qt-config.cmake.in -+++ b/src/modules/packagekit-qt-config.cmake.in -@@ -5,6 +5,6 @@ - - SET(prefix "@CMAKE_INSTALL_PREFIX@") - SET(exec_prefix "@CMAKE_INSTALL_PREFIX@") --SET(PackageKitQt@QT_VERSION@_LIBRARIES "PK::packagekitqt5") -+SET(PackageKitQt@QT_VERSION@_LIBRARIES "PK::@LIBNAME@") - - include("${CMAKE_CURRENT_LIST_DIR}/PackageKitQtTargets.cmake") --- -2.0.1 - Deleted: 0007-Fix-compilation-due-to-not-set-cmake-variable.patch =================================================================== --- 0007-Fix-compilation-due-to-not-set-cmake-variable.patch 2015-01-20 09:09:12 UTC (rev 126291) +++ 0007-Fix-compilation-due-to-not-set-cmake-variable.patch 2015-01-20 09:42:33 UTC (rev 126292) @@ -1,32 +0,0 @@ -From ede40b16ce6b48a02ffda6c4dc56f1aac8590357 Mon Sep 17 00:00:00 2001 -From: Matthias Klumpp <[email protected]> -Date: Mon, 8 Sep 2014 21:52:04 +0200 -Subject: [PATCH 07/12] Fix compilation due to not-set cmake variable - ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5df701d..b1e1e97 100755 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -41,6 +41,7 @@ endif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) - # - # Configure files - # -+set (CMAKE_INSTALL_LIBDIR "lib/${CMAKE_LIBRARY_ARCHITECTURE}" CACHE PATH "Output directory for libraries") - set (PREFIXDIR "${CMAKE_INSTALL_PREFIX}") - set (DATADIR "${CMAKE_INSTALL_PREFIX}/share") - set (PKGDATADIR "${DATA_INSTALL_DIR}") -@@ -56,7 +57,6 @@ set (CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${LIBNAME}/") - add_definitions("-DLOCALSTATEDIR=\"${LOCALSTATEDIR}\"") - add_definitions("-std=gnu++11") - --set(CMAKE_INSTALL_LIBDIR "lib/${CMAKE_LIBRARY_ARCHITECTURE}" CACHE PATH "Output directory for libraries") - if (IS_ABSOLUTE ${CMAKE_INSTALL_LIBDIR}) - set (PKQT_INSTALL_LIBDIR ${CMAKE_INSTALL_LIBDIR}) - else (IS_ABSOLUTE ${CMAKE_INSTALL_LIBDIR}) --- -2.0.1 - Deleted: 0008-Fix-QPK-include-dir-in-cmake-module.patch =================================================================== --- 0008-Fix-QPK-include-dir-in-cmake-module.patch 2015-01-20 09:09:12 UTC (rev 126291) +++ 0008-Fix-QPK-include-dir-in-cmake-module.patch 2015-01-20 09:42:33 UTC (rev 126292) @@ -1,25 +0,0 @@ -From ad25d71c5725131db3991fb80594e0f9a74fa2ed Mon Sep 17 00:00:00 2001 -From: Matthias Klumpp <[email protected]> -Date: Mon, 8 Sep 2014 23:46:51 +0200 -Subject: [PATCH 08/12] Fix QPK include dir in cmake module - ---- - src/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index d1176ec..5037fb2 100755 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -101,7 +101,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${LIBNAME}.pc.in - ${CMAKE_CURRENT_BINARY_DIR}/${LIBNAME}.pc - @ONLY - ) --target_include_directories(${LIBNAME} INTERFACE "$<INSTALL_INTERFACE:include/PackageKit/>") -+target_include_directories(${LIBNAME} INTERFACE "$<INSTALL_INTERFACE:include/PackageKit/${LIBNAME}/>") - install(TARGETS ${LIBNAME} EXPORT PackageKitQtTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LIBNAME}.pc - DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig --- -2.0.1 - Deleted: 0009-Disable-namespacing-and-classes-names-on-the-interfa.patch =================================================================== --- 0009-Disable-namespacing-and-classes-names-on-the-interfa.patch 2015-01-20 09:09:12 UTC (rev 126291) +++ 0009-Disable-namespacing-and-classes-names-on-the-interfa.patch 2015-01-20 09:42:33 UTC (rev 126292) @@ -1,138 +0,0 @@ -From 3693ea5ed68b53fdb9e2d9c034dcda7b68798c89 Mon Sep 17 00:00:00 2001 -From: Daniel Nicoletti <[email protected]> -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 - Deleted: PKGBUILD =================================================================== --- PKGBUILD 2015-01-20 09:09:12 UTC (rev 126291) +++ PKGBUILD 2015-01-20 09:42:33 UTC (rev 126292) @@ -1,83 +0,0 @@ -# $Id -# Maintainer : BlackIkeEagle <ike DOT devolder AT gmail DOT com> - -pkgbase=packagekit-qt -pkgname=( - "${pkgbase}4" - "${pkgbase}" -) -pkgver=0.9.2 -pkgrel=2 -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"; - '0001-Remove-daemon-proxy-conection-to-changed.patch' - '0002-Add-operator-to-bitfield.patch' - '0003-Remove-the-metatype-registration-for-Transaction-typ.patch' - '0004-Remove-RoleUpgradeSystem-as-it-s-not-supported-in-0..patch' - '0005-Properly-export-cmake-targets.patch' - '0006-Don-t-assume-the-target-is-packagekitqt5.patch' - '0007-Fix-compilation-due-to-not-set-cmake-variable.patch' - '0008-Fix-QPK-include-dir-in-cmake-module.patch' - '0009-Disable-namespacing-and-classes-names-on-the-interfa.patch' -) -sha256sums=( - 'd5a20d2a477c7b77feaabb7d1eb10d00e2168f81ae4b08a34398bbeded12f4ce' - '15133ec8115cdd4c26276c1ac819b11d59238daf38e88673f7c448e07a20df0c' - '15d0481dd1e5b993750d4db05c55cb1086eec577cce27b95b234ae1b962094f9' - '810967071dfeb7e0d6ec4d75b5ffee5bc2a5ccd707b6c6ad28ac97f7e1b1997f' - 'b0e81c73c72b61f68f374f03895a6deb2ee0cfffad3ad99badae5ace1a89be89' - '93962313bfe61313803afb1262aafdf58fb273263c37ddc9f72d8041ebd8e7fc' - '227697bd204d3f0ec7def0d8d78bb9a7a13de787b23f68f2ab1aa8926111935a' - '582fc2e70817103756b2f62413cddb8cf56daa6a101d12971beeef1a4c895f05' - '896d9c83722e12c03e10c60f2291f881aa807ab6e5ed88c8e8b3aae6ea6deea6' - '47c9d5e8184a865fb4ffdc3bee5618b3b5997931f81607f93e762f192791a64d' -) - -prepare() { - cd "$srcdir/PackageKit-Qt-$pkgver" - - patch -p1 -i "$srcdir/0001-Remove-daemon-proxy-conection-to-changed.patch" - patch -p1 -i "$srcdir/0002-Add-operator-to-bitfield.patch" - patch -p1 -i "$srcdir/0003-Remove-the-metatype-registration-for-Transaction-typ.patch" - patch -p1 -i "$srcdir/0004-Remove-RoleUpgradeSystem-as-it-s-not-supported-in-0..patch" - patch -p1 -i "$srcdir/0005-Properly-export-cmake-targets.patch" - patch -p1 -i "$srcdir/0006-Don-t-assume-the-target-is-packagekitqt5.patch" - patch -p1 -i "$srcdir/0007-Fix-compilation-due-to-not-set-cmake-variable.patch" - patch -p1 -i "$srcdir/0008-Fix-QPK-include-dir-in-cmake-module.patch" - 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 -} Added: PKGBUILD =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2015-01-20 09:42:33 UTC (rev 126292) @@ -0,0 +1,53 @@ +# $Id$ +# Maintainer: Christian Hesse <[email protected]> +# Contributor: Antonio Rojas <[email protected]> + +pkgbase=packagekit-qt +pkgname=('packagekit-qt4' 'packagekit-qt5') +pkgver=0.9.5 +pkgrel=4 +arch=('i686' 'x86_64') +url='http://www.packagekit.org/' +license=('LGPL') +depends=('packagekit') +validpgpkeys=('163EB50119225DB3DF8F49EA17ACBA8DFA970E17') # Richard Hughes +source=("http://www.freedesktop.org/software/PackageKit/releases/PackageKit-Qt-${pkgver}.tar.xz"{,.asc}) +sha256sums=('f4fb60b82d845d887de57ef44481301f966291912116e416d981156faf3620f0' + 'SKIP') + +build() { + mkdir -p "${srcdir}/"{packagekit-qt4,packagekit-qt5} + + cd "${srcdir}/packagekit-qt4/" + + cmake ../PackageKit-Qt-${pkgver} \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_LIBDIR=lib + make + + cd "${srcdir}/packagekit-qt5/" + + cmake ../PackageKit-Qt-${pkgver} \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DUSE_QT5=ON + make +} + +package_packagekit-qt4() { + pkgdesc='Qt4 bindings for PackageKit' + depends+=('qt4') + + cd "${srcdir}/packagekit-qt4/" + make DESTDIR="${pkgdir}" install +} + +package_packagekit-qt5() { + pkgdesc='Qt5 bindings for PackageKit' + depends+=('qt5-base') + + cd "${srcdir}/packagekit-qt5/" + make DESTDIR="${pkgdir}" install +}
