File PackageKit-Qt-ff-7248b030c0.patch of Package PackageKit-Qt
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9b1b054..b1e1e97 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ set(CMAKE_BUILD_TYPE "Debug")
set(QPACKAGEKIT_VERSION_MAJOR "0")
set(QPACKAGEKIT_VERSION_MINOR "9")
-set(QPACKAGEKIT_VERSION_PATCH "2")
+set(QPACKAGEKIT_VERSION_PATCH "3")
set(QPACKAGEKIT_VERSION_SUFFIX "${VERSION_SUFFIX}")
set(QPACKAGEKIT_VERSION "${QPACKAGEKIT_VERSION_MAJOR}.${QPACKAGEKIT_VERSION_MINOR}.${QPACKAGEKIT_VERSION_PATCH}")
@@ -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}")
@@ -51,11 +52,11 @@ 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")
-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})
@@ -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/RELEASE b/RELEASE
index cb1f5e3..fe6dbc9 100644
--- a/RELEASE
+++ b/RELEASE
@@ -2,10 +2,10 @@ PackageKit-Qt Release Notes
1. Write NEWS entries for PackageKit-Qt in the same format as usual.
-git shortlog QPACKAGEKIT_0_8_8.. | grep -i -v trivial | grep -v Merge > NEWS.new
+git shortlog QPACKAGEKIT_0_9_2.. | grep -i -v trivial | grep -v Merge > NEWS.new
--------------------------------------------------------------------------------
-Version 0.9.2
+Version 0.9.3
~~~~~~~~~~~~~
Released: 2013-xx-xx
@@ -20,17 +20,17 @@ Bugfixes:
3. Commit changes in PackageKit-Qt git:
-git commit -a -m "Release version 0.9.2"
-git tag -s -f -m "Release 0.9.2" QPACKAGEKIT_0_9_2
+git commit -a -m "Release version 0.9.3"
+git tag -s -f -m "Release 0.9.3" QPACKAGEKIT_0_9_3
<gpg password>
git push --tags
git push
-4. run './release.sh --version=0.9.2 --git-tag=QPACKAGEKIT_0_9_2 --sign'
+4. run './release.sh --version=0.9.3 --git-tag=QPACKAGEKIT_0_9_3 --sign'
5. Upload tarball to:
-scp *.tar.* packagekit.org:/srv/www/html/releases/
+scp *.tar.* hughsient@annarchy.freedesktop.org:/srv/www.freedesktop.org/www/software/PackageKit/releases/
6. Do post release version bump in CMakeLists.txt
@@ -42,7 +42,7 @@ git push
8. Send an email to packagekit@lists.freedesktop.org
=================================================
-PackageKit-Qt 0.9.2 released!
+PackageKit-Qt 0.9.3 released!
Tarballs available here: http://www.packagekit.org/releases/
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8ef7906..c52e1b1 100755
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -55,18 +55,19 @@ 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 ()
-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)
@@ -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,13 +101,13 @@ 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/${LIBNAME}/PackageKit/;include/${LIBNAME}>")
+install(TARGETS ${LIBNAME} EXPORT PackageKitQtTargets DESTINATION ${CMAKE_INSTALL_LIBDIR})
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LIBNAME}.pc
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
)
install(FILES ${packagekitqt_HEADERS}
- DESTINATION include/PackageKit/${LIBNAME}
+ DESTINATION include/${LIBNAME}/PackageKit/
)
add_subdirectory(modules)
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
diff --git a/src/daemon.cpp b/src/daemon.cpp
index 621fb89..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),
@@ -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)
@@ -94,10 +75,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())) {
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/modules/packagekit-qt-config.cmake.in b/src/modules/packagekit-qt-config.cmake.in
index f9f4436..3dcf3f3 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@LIBNAME@.so" 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::@LIBNAME@")
+
+include("${CMAKE_CURRENT_LIST_DIR}/PackageKitQtTargets.cmake")
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
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;
