Hello community, here is the log from the commit of package PackageKit-Qt for openSUSE:Factory checked in at 2014-11-28 08:45:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/PackageKit-Qt (Old) and /work/SRC/openSUSE:Factory/.PackageKit-Qt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "PackageKit-Qt" Changes: -------- --- /work/SRC/openSUSE:Factory/PackageKit-Qt/PackageKit-Qt.changes 2014-10-06 22:04:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.PackageKit-Qt.new/PackageKit-Qt.changes 2014-11-28 08:46:03.000000000 +0100 @@ -1,0 +2,26 @@ +Wed Nov 19 17:01:06 UTC 2014 - [email protected] + +- Update to version 0.9.5: + + New Features: Add operator== to bitfield. + + Bugfixes: + - Deprecate ::packageIcon methods. + - Disable namespacing and classes names on the generated + interfaces. + - Don't assume the target is packagekitqt5. + - Fix compilation due to not-set cmake variable. + - Fix documentation. + - Fix QPK include dir in cmake module. + - Properly export cmake targets. + - Remove daemon proxy conection to changed(). + - Remove RoleUpgradeSystem as it's not supported in 0.9.x + anymore. + - Remove the metatype registration for Transaction types. + - Support RPATH by default. + - Use GNUInstallDirs to determine most of used variables. + - Use "PackageKit" as the include namespace rather than the + library name. +- Drop PackageKit-Qt-ff-7248b030c0.patch and + 0001-Use-GNUInstallDirs-to-determine-most-of-used-variabl.patch: + Fixed upstream/No longer needed. + +------------------------------------------------------------------- PackageKit-Qt5.changes: same change Old: ---- 0001-Use-GNUInstallDirs-to-determine-most-of-used-variabl.patch PackageKit-Qt-0.9.2.tar.xz PackageKit-Qt-ff-7248b030c0.patch New: ---- PackageKit-Qt-0.9.5.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ PackageKit-Qt.spec ++++++ --- /var/tmp/diff_new_pack.tCv5GX/_old 2014-11-28 08:46:04.000000000 +0100 +++ /var/tmp/diff_new_pack.tCv5GX/_new 2014-11-28 08:46:04.000000000 +0100 @@ -27,7 +27,7 @@ Name: PackageKit-Qt %define _name PackageKit-Qt -Version: 0.9.2 +Version: 0.9.5 Release: 0 Summary: Simple software installation management software License: LGPL-2.1+ @@ -35,10 +35,6 @@ Url: http://packagekit.org/ Source: http://www.freedesktop.org/software/PackageKit/releases/%{_name}-%{version}.tar.xz Source99: pre_checkin.sh -# PATCH-FIX-UPSTREAM PackageKit-Qt-ff-7248b030c0.patch [email protected] -- Fast forward to git 7248b030c -Patch0: PackageKit-Qt-ff-7248b030c0.patch -# PATCH-FIX-UPSTREAM 0001-Use-GNUInstallDirs-to-determine-most-of-used-variabl.patch [email protected] -- Use GNUinstallDirs to determine relevant destination directories. Also removed unused vars. -Patch1: 0001-Use-GNUInstallDirs-to-determine-most-of-used-variabl.patch BuildRequires: PackageKit-devel >= %{version} BuildRequires: cmake BuildRequires: kde4-filesystem @@ -87,8 +83,6 @@ %prep %setup -q -n %{_name}-%{version} -%patch0 -p1 -%patch1 -p1 %build mkdir build @@ -116,7 +110,7 @@ %files devel %defattr(-,root,root) -%doc TODO MAINTAINERS RELEASE +%doc TODO MAINTAINERS %{_libdir}/libpackagekitqt?.so %{_libdir}/cmake/packagekitqt?/ %{_libdir}/pkgconfig/packagekitqt?.pc ++++++ PackageKit-Qt5.spec ++++++ --- /var/tmp/diff_new_pack.tCv5GX/_old 2014-11-28 08:46:04.000000000 +0100 +++ /var/tmp/diff_new_pack.tCv5GX/_new 2014-11-28 08:46:04.000000000 +0100 @@ -27,7 +27,7 @@ Name: PackageKit-Qt5 %define _name PackageKit-Qt -Version: 0.9.2 +Version: 0.9.5 Release: 0 Summary: Simple software installation management software License: LGPL-2.1+ @@ -35,10 +35,6 @@ Url: http://packagekit.org/ Source: http://www.freedesktop.org/software/PackageKit/releases/%{_name}-%{version}.tar.xz Source99: pre_checkin.sh -# PATCH-FIX-UPSTREAM PackageKit-Qt-ff-7248b030c0.patch [email protected] -- Fast forward to git 7248b030c -Patch0: PackageKit-Qt-ff-7248b030c0.patch -# PATCH-FIX-UPSTREAM 0001-Use-GNUInstallDirs-to-determine-most-of-used-variabl.patch [email protected] -- Use GNUinstallDirs to determine relevant destination directories. Also removed unused vars. -Patch1: 0001-Use-GNUInstallDirs-to-determine-most-of-used-variabl.patch BuildRequires: PackageKit-devel >= %{version} BuildRequires: cmake BuildRequires: kde4-filesystem @@ -87,8 +83,6 @@ %prep %setup -q -n %{_name}-%{version} -%patch0 -p1 -%patch1 -p1 %build mkdir build @@ -116,7 +110,7 @@ %files devel %defattr(-,root,root) -%doc TODO MAINTAINERS RELEASE +%doc TODO MAINTAINERS %{_libdir}/libpackagekitqt?.so %{_libdir}/cmake/packagekitqt?/ %{_libdir}/pkgconfig/packagekitqt?.pc ++++++ PackageKit-Qt-0.9.2.tar.xz -> PackageKit-Qt-0.9.5.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PackageKit-Qt-0.9.2/CMakeLists.txt new/PackageKit-Qt-0.9.5/CMakeLists.txt --- old/PackageKit-Qt-0.9.2/CMakeLists.txt 2014-04-29 14:39:27.000000000 +0200 +++ new/PackageKit-Qt-0.9.5/CMakeLists.txt 2014-10-10 17:11:54.000000000 +0200 @@ -6,9 +6,12 @@ set(CMAKE_BUILD_TYPE "Debug") +# Used to set installation paths +include(GNUInstallDirs) + set(QPACKAGEKIT_VERSION_MAJOR "0") set(QPACKAGEKIT_VERSION_MINOR "9") -set(QPACKAGEKIT_VERSION_PATCH "2") +set(QPACKAGEKIT_VERSION_PATCH "5") set(QPACKAGEKIT_VERSION_SUFFIX "${VERSION_SUFFIX}") set(QPACKAGEKIT_VERSION "${QPACKAGEKIT_VERSION_MAJOR}.${QPACKAGEKIT_VERSION_MINOR}.${QPACKAGEKIT_VERSION_PATCH}") @@ -33,6 +36,8 @@ set(QT_VERSION "4") endif(USE_QT5) +set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) set(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "QPK default install prefix" FORCE) @@ -41,27 +46,14 @@ # # Configure files # -set (PREFIXDIR "${CMAKE_INSTALL_PREFIX}") -set (DATADIR "${CMAKE_INSTALL_PREFIX}/share") -set (PKGDATADIR "${DATA_INSTALL_DIR}") -set (LIBDIR "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}") -set (PKGLIBDIR "${LIBDIR}/packagekit") set (GETTEXT_PACKAGE "packagekit") -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}) - set (PKQT_INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") -endif (IS_ABSOLUTE ${CMAKE_INSTALL_LIBDIR}) - configure_file(config.h.in ${CMAKE_BINARY_DIR}/config.h) # @@ -75,3 +67,9 @@ add_definitions(${MAINTAINER_CFLAGS}) add_subdirectory(src) + +install(EXPORT PackageKitQtTargets + DESTINATION "${CMAKECONFIG_INSTALL_DIR}" + FILE PackageKitQtTargets.cmake + NAMESPACE PK:: + COMPONENT Devel) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PackageKit-Qt-0.9.2/NEWS new/PackageKit-Qt-0.9.5/NEWS --- old/PackageKit-Qt-0.9.2/NEWS 2014-04-29 14:39:27.000000000 +0200 +++ new/PackageKit-Qt-0.9.5/NEWS 2014-10-10 17:11:54.000000000 +0200 @@ -1,3 +1,25 @@ +Version 0.9.5 +~~~~~~~~~~~~~ +Released: 2014-10-10 + +New Features: + - Add operator== to bitfield (Daniel Nicoletti) + +Bugfixes: + - Deprecate ::packageIcon methods (Aleix Pol) + - Disable namespacing and classes names on the generated interfaces (Daniel Nicoletti) + - Don't assume the target is packagekitqt5 (Aleix Pol) + - Fix compilation due to not-set cmake variable (Matthias Klumpp) + - Fix documentation (Aleix Pol) + - Fix QPK include dir in cmake module (Matthias Klumpp) + - Properly export cmake targets (Aleix Pol) + - Remove daemon proxy conection to changed() (Daniel Nicoletti) + - Remove RoleUpgradeSystem as it's not supported in 0.9.x anymore (Daniel Nicoletti) + - Remove the metatype registration for Transaction types (Daniel Nicoletti) + - Support RPATH by default (Aleix Pol) + - Use GNUInstallDirs to determine most of used variables (Hrvoje Senjan) + - Use "PackageKit" as the include namespace rather than the library name (Aleix Pol) + Version 0.9.2 ~~~~~~~~~~~~~ Released: 2013-04-29 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PackageKit-Qt-0.9.2/README new/PackageKit-Qt-0.9.5/README --- old/PackageKit-Qt-0.9.2/README 1970-01-01 01:00:00.000000000 +0100 +++ new/PackageKit-Qt-0.9.5/README 2014-10-10 17:11:54.000000000 +0200 @@ -0,0 +1,8 @@ +# PackageKit-Qt +Qt bindings for PackageKit + +## PackageKit +PackageKit is a DBUS abstraction layer that allows the session user to manage +packages in a secure way using a cross-distro, cross-architecture API. + +For more information, please see http://www.packagekit.org diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PackageKit-Qt-0.9.2/RELEASE new/PackageKit-Qt-0.9.5/RELEASE --- old/PackageKit-Qt-0.9.2/RELEASE 2014-04-29 14:39:27.000000000 +0200 +++ new/PackageKit-Qt-0.9.5/RELEASE 1970-01-01 01:00:00.000000000 +0100 @@ -1,49 +0,0 @@ -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 - --------------------------------------------------------------------------------- -Version 0.9.2 -~~~~~~~~~~~~~ -Released: 2013-xx-xx - -Notes: - -New Features: - -Bugfixes: --------------------------------------------------------------------------------- - -2. Update library version if new ABI or API in CMakeLists.txt - -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 -<gpg password> -git push --tags -git push - -4. run './release.sh --version=0.9.2 --git-tag=QPACKAGEKIT_0_9_2 --sign' - -5. Upload tarball to: - -scp *.tar.* packagekit.org:/srv/www/html/releases/ - -6. Do post release version bump in CMakeLists.txt - -7. Commit trivial changes: - -git commit -a -m "trivial: post release version bump" -git push - -8. Send an email to [email protected] - -================================================= -PackageKit-Qt 0.9.2 released! - -Tarballs available here: http://www.packagekit.org/releases/ - -================================================= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PackageKit-Qt-0.9.2/config.h.in new/PackageKit-Qt-0.9.5/config.h.in --- old/PackageKit-Qt-0.9.2/config.h.in 2014-04-29 14:39:27.000000000 +0200 +++ new/PackageKit-Qt-0.9.5/config.h.in 2014-10-10 17:11:54.000000000 +0200 @@ -7,15 +7,6 @@ /* Gettext Package */ #define GETTEXT_PACKAGE "@GETTEXT_PACKAGE@" -/* Paths */ -#define LOCALEDIR "@LOCALE_DIR@" -#define PKGDATADIR "@PKGDATADIR@" -#define PKGLIBDIR "@PKGLIBDIR@" -#define PREFIXDIR "@PREFIXDIR@" -#define DATADIR "@DATADIR@" -#define LIBDIR "@LIBDIR@" -#define BUILDDIR "@BUILDDIR@" - /* Name of package */ #define PACKAGE_NAME "packagekit-qt" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PackageKit-Qt-0.9.2/src/CMakeLists.txt new/PackageKit-Qt-0.9.5/src/CMakeLists.txt --- old/PackageKit-Qt-0.9.2/src/CMakeLists.txt 2014-04-29 14:39:27.000000000 +0200 +++ new/PackageKit-Qt-0.9.5/src/CMakeLists.txt 2014-10-10 17:11:54.000000000 +0200 @@ -11,16 +11,12 @@ # Set up Qt if (Qt5_FOUND) find_package(Qt5DBus REQUIRED) - find_package(Qt5Sql REQUIRED) include_directories(${Qt5Core_INCLUDE_DIRS} ${Qt5DBus_INCLUDE_DIRS} - ${Qt5Sql_INCLUDE_DIRS} ) add_definitions(${Qt5DBus_DEFINITIONS}) - add_definitions(${Qt5Sql_DEFINITIONS}) elseif (Qt4_FOUND) set(QT_USE_QTDBUS TRUE) - set(QT_USE_QTSQL TRUE) set(QT_DONT_USE_QTGUI TRUE) include(${QT_USE_FILE}) endif () @@ -55,18 +51,19 @@ 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 +84,7 @@ if (Qt5_FOUND) add_dependencies(${LIBNAME} mocs) target_link_libraries(${LIBNAME} - ${Qt5DBus_LIBRARIES} ${Qt5Sql_LIBRARIES} + LINK_PUBLIC Qt5::DBus ) elseif (Qt4_FOUND) target_link_libraries(${LIBNAME} @@ -99,13 +96,13 @@ ${CMAKE_CURRENT_BINARY_DIR}/${LIBNAME}.pc @ONLY ) - -install(TARGETS ${LIBNAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}) +target_include_directories(${LIBNAME} INTERFACE "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${LIBNAME}/PackageKit/;${CMAKE_INSTALL_INCLUDEDIR}/${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 ${CMAKE_INSTALL_INCLUDEDIR}/${LIBNAME}/PackageKit/ ) add_subdirectory(modules) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PackageKit-Qt-0.9.2/src/bitfield.cpp new/PackageKit-Qt-0.9.5/src/bitfield.cpp --- old/PackageKit-Qt-0.9.2/src/bitfield.cpp 2014-04-29 14:39:27.000000000 +0200 +++ new/PackageKit-Qt-0.9.5/src/bitfield.cpp 2014-10-10 17:11:54.000000000 +0200 @@ -2,7 +2,7 @@ using namespace PackageKit; -Bitfield::Bitfield () : m_val (0) +Bitfield::Bitfield () { } @@ -61,10 +61,15 @@ 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PackageKit-Qt-0.9.2/src/bitfield.h new/PackageKit-Qt-0.9.5/src/bitfield.h --- old/PackageKit-Qt-0.9.2/src/bitfield.h 2014-04-29 14:39:27.000000000 +0200 +++ new/PackageKit-Qt-0.9.5/src/bitfield.h 2014-10-10 17:11:54.000000000 +0200 @@ -2,6 +2,7 @@ #define PACKAGEKIT_BITFIELD_H #include <QtGlobal> +#include <QMetaType> namespace PackageKit { @@ -23,11 +24,14 @@ 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PackageKit-Qt-0.9.2/src/common.h new/PackageKit-Qt-0.9.5/src/common.h --- old/PackageKit-Qt-0.9.2/src/common.h 2014-04-29 14:39:27.000000000 +0200 +++ new/PackageKit-Qt-0.9.5/src/common.h 2014-10-10 17:11:54.000000000 +0200 @@ -34,5 +34,3 @@ #define AUTH_SYSTEM_SOURCES_REFRESH "org.freedesktop.packagekit.system-sources-refresh" #define AUTH_SYSTEM_NETWORK_PROXY_CONFIGURE "org.freedesktop.packagekit.system-network-proxy-configure" #define AUTH_CANCEL_FOREIGN "org.freedesktop.packagekit.cancel-foreign" - -#define PK_DESKTOP_DEFAULT_DATABASE LOCALSTATEDIR "/lib/PackageKit/desktop-files.db" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PackageKit-Qt-0.9.2/src/daemon.cpp new/PackageKit-Qt-0.9.5/src/daemon.cpp --- old/PackageKit-Qt-0.9.2/src/daemon.cpp 2014-04-29 14:39:27.000000000 +0200 +++ new/PackageKit-Qt-0.9.5/src/daemon.cpp 2014-10-10 17:11:54.000000000 +0200 @@ -19,9 +19,6 @@ * Boston, MA 02110-1301, USA. */ -#include <QtSql> -#include <QDebug> - #include "daemon.h" #include "daemonprivate.h" #include "transactionprivate.h" @@ -47,10 +44,10 @@ 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), @@ -58,33 +55,6 @@ QLatin1String("PropertiesChanged"), this, SLOT(propertiesChanged(QString,QVariantMap,QStringList))); - - // Set up database for desktop files - QSqlDatabase db; - db = QSqlDatabase::addDatabase("QSQLITE", PK_DESKTOP_DEFAULT_DATABASE); - db.setDatabaseName(PK_DESKTOP_DEFAULT_DATABASE); - 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 +64,7 @@ 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PackageKit-Qt-0.9.2/src/daemon.h new/PackageKit-Qt-0.9.5/src/daemon.h --- old/PackageKit-Qt-0.9.2/src/daemon.h 2014-04-29 14:39:27.000000000 +0200 +++ new/PackageKit-Qt-0.9.5/src/daemon.h 2014-10-10 17:11:54.000000000 +0200 @@ -277,8 +277,10 @@ /** * Returns the package icon from the \p packageID + * + * @deprecated use Appstream to fetch icons */ - Q_INVOKABLE static QString packageIcon(const QString &packageID); + Q_INVOKABLE QT_DEPRECATED static QString packageIcon(const QString &packageID); /** * Returns the string representing the enum @@ -364,7 +366,7 @@ * \note You need to manually restart the transaction which triggered the EULA. * \sa eulaRequired() * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *acceptEula(const QString &eulaID); @@ -372,7 +374,7 @@ * Download the given \p packages to a temp dir, if \p storeInCache is true * the download will be stored in the package manager cache * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *downloadPackages(const QStringList &packageIDs, bool storeInCache = false); @@ -380,7 +382,7 @@ * This is a convenience function to download this \p package * \sa downloadPackages(const QStringList &packageIDs, bool storeInCache = false) * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *downloadPackage(const QString &packageID, bool storeInCache = false); @@ -389,7 +391,7 @@ * * \sa category * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *getCategories(); @@ -402,7 +404,7 @@ * * \note This method emits \sa package() * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *dependsOn(const QStringList &packageIDs, Transaction::Filters filters = Transaction::FilterNone, bool recursive = false); @@ -410,7 +412,7 @@ * Convenience function to get the dependencies of this \p package * \sa dependsOn(const QStringList &packageIDs, Filters filters, bool recursive = false) * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *dependsOn(const QString &packageID, Transaction::Filters filters = Transaction::FilterNone, bool recursive = false); @@ -421,7 +423,7 @@ * \note This method emits \sa package() * with details set * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *getDetails(const QStringList &packageIDs); @@ -429,7 +431,7 @@ * Convenience function to get the details about this \p package * \sa getDetails(const QStringList &packageIDs) * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *getDetails(const QString &packageID); @@ -440,7 +442,7 @@ * \note This method emits \sa package() * with details set * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *getDetailsLocal(const QStringList &files); @@ -451,7 +453,7 @@ * \note This method emits \sa package() * with details set * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *getDetailsLocal(const QString &file); @@ -460,7 +462,7 @@ * * \note This method emits \sa files() * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *getFiles(const QStringList &packageIDs); @@ -468,7 +470,7 @@ * Convenience function to get the files contained in this \p package * \sa getFiles(const QStringList &packageIDs) * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *getFiles(const QString &packageIDs); @@ -477,7 +479,7 @@ * * \note This method emits \sa files() * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *getFilesLocal(const QStringList &files); @@ -486,7 +488,7 @@ * * \note This method emits \sa files() * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *getFilesLocal(const QString &file); @@ -496,7 +498,7 @@ * \note You must delete these transactions yourself * \note This method emits \sa transaction() * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *getOldTransactions(uint number); @@ -505,7 +507,7 @@ * * \note This method emits \sa package() * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *getPackages(Transaction::Filters filters = Transaction::FilterNone); @@ -514,7 +516,7 @@ * * \note This method emits \sa repository() * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *getRepoList(Transaction::Filters filters = Transaction::FilterNone); @@ -527,7 +529,7 @@ * * \note This method emits \sa package() * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *requiredBy(const QStringList &packageIDs, Transaction::Filters filters = Transaction::FilterNone, bool recursive = false); @@ -535,7 +537,7 @@ * Convenience function to get packages requiring this package * \sa requiredBy(const QStringList &packageIDs, Filters filters, bool recursive = false) * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *requiredBy(const QString &packageID, Transaction::Filters filters = Transaction::FilterNone, bool recursive = false); @@ -544,7 +546,7 @@ * * \note This method emits \sa updateDetail() * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *getUpdatesDetails(const QStringList &packageIDs); @@ -552,7 +554,7 @@ * Convenience function to get update details * \sa getUpdateDetail(const QStringList &packageIDs) * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *getUpdateDetail(const QString &packageID); @@ -563,7 +565,7 @@ * * \note This method emits \sa package() * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *getUpdates(Transaction::Filters filters = Transaction::FilterNone); @@ -572,7 +574,7 @@ * * \note This method emits \sa distroUpgrade() * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *getDistroUpgrades(); @@ -583,7 +585,7 @@ * * \note This method emits \sa package() and \sa changed() * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *installFiles(const QStringList &files, Transaction::TransactionFlags flags = Transaction::TransactionFlagOnlyTrusted); @@ -591,7 +593,7 @@ * Convenience function to install a file * \sa installFiles(const QStringList &files, TransactionFlags flags) * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *installFile(const QString &file, Transaction::TransactionFlags flags = Transaction::TransactionFlagOnlyTrusted); @@ -602,7 +604,7 @@ * * \note This method emits \sa package() and \sa changed() * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *installPackages(const QStringList &packageIDs, Transaction::TransactionFlags flags = Transaction::TransactionFlagOnlyTrusted); @@ -610,7 +612,7 @@ * Convenience function to install a package * \sa installPackages(const QStringList &packageIDs, TransactionFlags flags) * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *installPackage(const QString &packageID, Transaction::TransactionFlags flags = Transaction::TransactionFlagOnlyTrusted); @@ -619,7 +621,7 @@ * * \p type, \p keyId and \p package generally come from the Transaction::repoSignatureRequired * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *installSignature(Transaction::SigType type, const QString &keyID, const QString &packageID); @@ -628,7 +630,7 @@ * * \note This method emits \sa changed() * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *refreshCache(bool force); @@ -641,7 +643,7 @@ * * \note This method emits \sa package() and \sa changed() * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *removePackages(const QStringList &packageIDs, bool allowDeps = false, bool autoRemove = false, Transaction::TransactionFlags flags = Transaction::TransactionFlagOnlyTrusted); @@ -650,21 +652,21 @@ * * \sa removePackages(const PackageList &packages, bool allowDeps = false, bool autoRemove = false, TransactionFlags flags) * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *removePackage(const QString &packageID, bool allowDeps = false, bool autoRemove = false, Transaction::TransactionFlags flags = Transaction::TransactionFlagOnlyTrusted); /** * Repairs a broken system * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *repairSystem(Transaction::TransactionFlags flags = Transaction::TransactionFlagOnlyTrusted); /** * Activates or disables a repository * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *repoEnable(const QString &repoId, bool enable = true); @@ -673,14 +675,14 @@ * * \p autoremove packages from this repository * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *repoRemove(const QString &repoId, bool autoremove, Transaction::TransactionFlags flags = Transaction::TransactionFlagNone); /** * Sets a repository's parameter * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *repoSetData(const QString &repoId, const QString ¶meter, const QString &value); @@ -691,7 +693,7 @@ * * \note This method emits \sa package() * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *resolve(const QStringList &packageNames, Transaction::Filters filters = Transaction::FilterNone); @@ -699,7 +701,7 @@ * Convenience function to remove a package name * \sa resolve(const QStringList &packageNames, Transaction::Filters filters = Transaction::FilterNone) * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *resolve(const QString &packageName, Transaction::Filters filters = Transaction::FilterNone); @@ -710,7 +712,7 @@ * * \note This method emits \sa package() * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *searchFiles(const QStringList &search, Transaction::Filters filters = Transaction::FilterNone); @@ -718,7 +720,7 @@ * Convenience function to search for a file * \sa searchFiles(const QStringList &search, Transaction::Filters filters = Transaction::FilterNone) * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *searchFiles(const QString &search, Transaction::Filters filters = Transaction::FilterNone); @@ -729,7 +731,7 @@ * * \note This method emits \sa package() * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *searchDetails(const QStringList &search, Transaction::Filters filters = Transaction::FilterNone); @@ -737,7 +739,7 @@ * Convenience function to search by details * \sa searchDetails(const QStringList &search, Transaction::Filters filters = Transaction::FilterNone) * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *searchDetails(const QString &search, Transaction::Filters filters = Transaction::FilterNone); @@ -750,7 +752,7 @@ * * \note This method emits \sa package() * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *searchGroups(const QStringList &groups, Transaction::Filters filters = Transaction::FilterNone); @@ -758,7 +760,7 @@ * Convenience function to search by group string * \sa searchGroups(const QStringList &groups, Transaction::Filters filters = Transaction::FilterNone) * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *searchGroup(const QString &group, Transaction::Filters filters = Transaction::FilterNone); @@ -766,7 +768,7 @@ * Convenience function to search by group enum * \sa searchGroups(const QStringList &groups, Transaction::Filters filters = Transaction::FilterNone) * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *searchGroup(Transaction::Group group, Transaction::Filters filters = Transaction::FilterNone); @@ -777,7 +779,7 @@ * * \note This method emits \sa package() * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *searchGroups(Transaction::Groups group, Transaction::Filters filters = Transaction::FilterNone); @@ -788,7 +790,7 @@ * * \note This method emits \sa package() * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *searchNames(const QStringList &search, Transaction::Filters filters = Transaction::FilterNone); @@ -796,7 +798,7 @@ * Convenience function to search by names * \sa searchNames(const QStringList &search, Filters filters) * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *searchNames(const QString &search, Transaction::Filters filters = Transaction::FilterNone); @@ -806,7 +808,7 @@ * \p onlyTrusted indicates if this transaction is only allowed to install trusted packages * \note This method emits \sa package() and \sa changed() * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *updatePackages(const QStringList &packageIDs, Transaction::TransactionFlags flags = Transaction::TransactionFlagOnlyTrusted); @@ -814,7 +816,7 @@ * Convenience function to update a package * \sa updatePackages(const QStringList &packageIDs, TransactionFlags flags) * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *updatePackage(const QString &packageID, Transaction::TransactionFlags flags = Transaction::TransactionFlagOnlyTrusted); @@ -823,7 +825,7 @@ * * \note This method emits \sa package() * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *whatProvides(const QStringList &search, Transaction::Filters filters = Transaction::FilterNone); @@ -831,7 +833,7 @@ * Convenience function to search for what provides * \sa whatProvides(Provides type, const QStringList &search, Transaction::Filters filters = Transaction::FilterNone) * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ static Transaction *whatProvides(const QString &search, Transaction::Filters filters = Transaction::FilterNone); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PackageKit-Qt-0.9.2/src/daemonprivate.cpp new/PackageKit-Qt-0.9.5/src/daemonprivate.cpp --- old/PackageKit-Qt-0.9.2/src/daemonprivate.cpp 2014-04-29 14:39:27.000000000 +0200 +++ new/PackageKit-Qt-0.9.5/src/daemonprivate.cpp 2014-10-10 17:11:54.000000000 +0200 @@ -124,7 +124,7 @@ } 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PackageKit-Qt-0.9.2/src/daemonprivate.h new/PackageKit-Qt-0.9.5/src/daemonprivate.h --- old/PackageKit-Qt-0.9.2/src/daemonprivate.h 2014-04-29 14:39:27.000000000 +0200 +++ new/PackageKit-Qt-0.9.5/src/daemonprivate.h 2014-10-10 17:11:54.000000000 +0200 @@ -27,7 +27,7 @@ #include "daemon.h" -class DaemonProxy; +class OrgFreedesktopPackageKitInterface; namespace PackageKit { @@ -39,7 +39,7 @@ virtual ~DaemonPrivate() {} Daemon *q_ptr; - ::DaemonProxy *daemon; + ::OrgFreedesktopPackageKitInterface *daemon; QStringList hints; QStringList connectedSignals; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PackageKit-Qt-0.9.2/src/modules/packagekit-qt-config.cmake.in new/PackageKit-Qt-0.9.5/src/modules/packagekit-qt-config.cmake.in --- old/PackageKit-Qt-0.9.2/src/modules/packagekit-qt-config.cmake.in 2014-04-29 14:39:27.000000000 +0200 +++ new/PackageKit-Qt-0.9.5/src/modules/packagekit-qt-config.cmake.in 2014-10-10 17:11:54.000000000 +0200 @@ -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::@LIBNAME@") + +include("${CMAKE_CURRENT_LIST_DIR}/PackageKitQtTargets.cmake") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PackageKit-Qt-0.9.2/src/packagekitqt4.pc.in new/PackageKit-Qt-0.9.5/src/packagekitqt4.pc.in --- old/PackageKit-Qt-0.9.2/src/packagekitqt4.pc.in 2014-04-29 14:39:27.000000000 +0200 +++ new/PackageKit-Qt-0.9.5/src/packagekitqt4.pc.in 2014-10-10 17:11:54.000000000 +0200 @@ -1,11 +1,11 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=${prefix} -libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ -includedir=${prefix}/include +libdir=@CMAKE_INSTALL_FULL_LIBDIR@ +includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ Name: @LIBNAME@ Description: PackageKit is a system daemon for installing stuff. Version: @VERSION@ -Requires: QtCore, QtDBus, QtSql, QtXml +Requires: QtCore, QtDBus, QtXml Libs: -L${libdir} -l@LIBNAME@ Cflags: -I${includedir}/PackageKit/@LIBNAME@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PackageKit-Qt-0.9.2/src/packagekitqt5.pc.in new/PackageKit-Qt-0.9.5/src/packagekitqt5.pc.in --- old/PackageKit-Qt-0.9.2/src/packagekitqt5.pc.in 2014-04-29 14:39:27.000000000 +0200 +++ new/PackageKit-Qt-0.9.5/src/packagekitqt5.pc.in 2014-10-10 17:11:54.000000000 +0200 @@ -1,11 +1,11 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=${prefix} -libdir=@PKQT_INSTALL_LIBDIR@ -includedir=${prefix}/include +libdir=@CMAKE_INSTALL_FULL_LIBDIR@ +includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ Name: @LIBNAME@ Description: PackageKit is a system daemon for installing stuff. Version: @VERSION@ -Requires: Qt5Core, Qt5DBus, Qt5Sql, Qt5Xml +Requires: Qt5Core, Qt5DBus, Qt5Xml Libs: -L${libdir} -l@LIBNAME@ Cflags: -I${includedir}/PackageKit/@LIBNAME@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PackageKit-Qt-0.9.2/src/transaction.cpp new/PackageKit-Qt-0.9.5/src/transaction.cpp --- old/PackageKit-Qt-0.9.2/src/transaction.cpp 2014-04-29 14:39:27.000000000 +0200 +++ new/PackageKit-Qt-0.9.5/src/transaction.cpp 2014-10-10 17:11:54.000000000 +0200 @@ -26,7 +26,6 @@ #include "daemon.h" #include "common.h" -#include <QSqlQuery> #include <QDBusError> using namespace PackageKit; @@ -215,37 +214,7 @@ QString Transaction::packageIcon(const QString &packageID) { - QString path; - QSqlDatabase db = QSqlDatabase::database(PK_DESKTOP_DEFAULT_DATABASE); - if (!db.isOpen()) { - qDebug() << "Desktop files database is not open"; - return path; - } - - QSqlQuery q(db); - q.prepare("SELECT filename FROM cache WHERE package = :name"); - q.bindValue(":name", Transaction::packageName(packageID)); - if (q.exec()) { - if (q.next()) { - QFile desktopFile(q.value(0).toString()); - if (desktopFile.open(QIODevice::ReadOnly | QIODevice::Text)) { - while (!desktopFile.atEnd()) { - QByteArray line = desktopFile.readLine().trimmed(); - if (line.startsWith("Icon=")) { - path = line.mid(5); - break; - } - } - desktopFile.close(); - } else { - qDebug() << "Cannot open desktop file " << q.value(0).toString(); - } - } - } else { - qDebug() << "Error while running query " << q.executedQuery(); - } - - return path; + return QString(); } QString Transaction::lastPackage() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PackageKit-Qt-0.9.2/src/transaction.h new/PackageKit-Qt-0.9.5/src/transaction.h --- old/PackageKit-Qt-0.9.2/src/transaction.h 2014-04-29 14:39:27.000000000 +0200 +++ new/PackageKit-Qt-0.9.5/src/transaction.h 2014-10-10 17:11:54.000000000 +0200 @@ -140,7 +140,6 @@ RoleGetDistroUpgrades, RoleGetCategories, RoleGetOldTransactions, - RoleUpgradeSystem, // Since 0.6.11 RoleRepairSystem, // Since 0.7.2 RoleGetDetailsLocal, // Since 0.8.17 RoleGetFilesLocal, // Since 0.9.1 @@ -650,7 +649,7 @@ /** * Cancels the transaction * - * \warning check \sa error() to know if it the call has any error + * \warning check \sa errorCode() signal to know if it the call has any error */ Q_INVOKABLE QDBusPendingReply<> cancel(); @@ -676,8 +675,10 @@ /** * Returns the package icon from the \p packageID + * + * @deprecated use Appstream to fetch icons */ - static QString packageIcon(const QString &packageID); + static QT_DEPRECATED QString packageIcon(const QString &packageID); Q_SIGNALS: void allowCancelChanged(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PackageKit-Qt-0.9.2/src/transactionprivate.cpp new/PackageKit-Qt-0.9.5/src/transactionprivate.cpp --- old/PackageKit-Qt-0.9.2/src/transactionprivate.cpp 2014-04-29 14:39:27.000000000 +0200 +++ new/PackageKit-Qt-0.9.5/src/transactionprivate.cpp 2014-10-10 17:11:54.000000000 +0200 @@ -46,10 +46,10 @@ 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 @@ 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/PackageKit-Qt-0.9.2/src/transactionprivate.h new/PackageKit-Qt-0.9.5/src/transactionprivate.h --- old/PackageKit-Qt-0.9.2/src/transactionprivate.h 2014-04-29 14:39:27.000000000 +0200 +++ new/PackageKit-Qt-0.9.5/src/transactionprivate.h 2014-10-10 17:11:54.000000000 +0200 @@ -29,7 +29,7 @@ #include "transaction.h" -class TransactionProxy; +class OrgFreedesktopPackageKitTransactionInterface; namespace PackageKit { @@ -45,7 +45,7 @@ void runQueuedTransaction(); QDBusObjectPath tid; - ::TransactionProxy* p = 0; + ::OrgFreedesktopPackageKitTransactionInterface* p = 0; Transaction *q_ptr; QStringList connectedSignals; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
