Hello community, here is the log from the commit of package kpackage for openSUSE:Factory checked in at 2018-10-22 11:14:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kpackage (Old) and /work/SRC/openSUSE:Factory/.kpackage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kpackage" Mon Oct 22 11:14:34 2018 rev:48 rq:642337 version:5.51.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kpackage/kpackage.changes 2018-10-01 08:08:10.598296247 +0200 +++ /work/SRC/openSUSE:Factory/.kpackage.new/kpackage.changes 2018-10-22 11:14:37.179702633 +0200 @@ -1,0 +2,19 @@ +Tue Oct 16 08:02:29 UTC 2018 - Luca Beltrame <[email protected]> + +- Run spec-cleaner + +------------------------------------------------------------------- +Mon Oct 15 11:50:37 UTC 2018 - [email protected] + +- Update to 5.51.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.51.0.php +- Changes since 5.50.0: + * Use reference in for loop for type with non-trivial copy constructor + * Move Qt5::DBus to the 'PRIVATE' link targets + * Fix compile with strict compiler flags + * Emit signals when a package is installed/uninstalled + * Fix minor EBN issues + +------------------------------------------------------------------- Old: ---- kpackage-5.50.0.tar.xz New: ---- kpackage-5.51.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kpackage.spec ++++++ --- /var/tmp/diff_new_pack.AUJr5V/_old 2018-10-22 11:14:37.647702125 +0200 +++ /var/tmp/diff_new_pack.AUJr5V/_new 2018-10-22 11:14:37.651702121 +0200 @@ -12,23 +12,23 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%define _tar_path 5.50 +%define _tar_path 5.51 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_without lang Name: kpackage -Version: 5.50.0 +Version: 5.51.0 Release: 0 Summary: Manage user installable packages of non-binary assets License: LGPL-2.1-or-later Group: System/GUI/KDE -URL: http://www.kde.org +URL: https://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz Source1: baselibs.conf BuildRequires: cmake >= 3.0 @@ -40,8 +40,9 @@ BuildRequires: kdoctools-devel >= %{_kf5_bugfix_version} BuildRequires: kf5-filesystem BuildRequires: ki18n-devel >= %{_kf5_bugfix_version} -BuildRequires: cmake(Qt5Core) >= 5.6.0 -BuildRequires: cmake(Qt5Test) >= 5.6.0 +BuildRequires: cmake(Qt5Core) >= 5.8.0 +BuildRequires: cmake(Qt5DBus) >= 5.8.0 +BuildRequires: cmake(Qt5Test) >= 5.8.0 %if %{with lang} Recommends: %{name}-lang %endif ++++++ kpackage-5.50.0.tar.xz -> kpackage-5.51.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.50.0/CMakeLists.txt new/kpackage-5.51.0/CMakeLists.txt --- old/kpackage-5.50.0/CMakeLists.txt 2018-09-02 21:29:44.000000000 +0200 +++ new/kpackage-5.51.0/CMakeLists.txt 2018-10-08 10:19:12.000000000 +0200 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.50.0") # handled by release scripts -set(KF5_DEP_VERSION "5.50.0") # handled by release scripts +set(KF5_VERSION "5.51.0") # handled by release scripts +set(KF5_DEP_VERSION "5.51.0") # handled by release scripts project(KPackage VERSION ${KF5_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.50.0 NO_MODULE) +find_package(ECM 5.51.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -45,7 +45,7 @@ set (REQUIRED_QT_VERSION 5.8.0) -find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE COMPONENTS Core) +find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE COMPONENTS Core DBus) find_package(KF5Archive ${KF5_DEP_VERSION} REQUIRED) find_package(KF5I18n ${KF5_DEP_VERSION} REQUIRED) @@ -85,7 +85,11 @@ kdoctools_install(po) endif() endif() - +add_definitions(-DQT_NO_CAST_FROM_ASCII) +add_definitions(-DQT_NO_CAST_TO_ASCII) +add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT) +add_definitions(-DQT_NO_URL_CAST_FROM_STRING) +add_definitions(-DQT_USE_QSTRINGBUILDER) add_subdirectory(src) if (BUILD_TESTING) add_subdirectory(autotests) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.50.0/KF5PackageMacros.cmake new/kpackage-5.51.0/KF5PackageMacros.cmake --- old/kpackage-5.50.0/KF5PackageMacros.cmake 2018-09-02 21:29:44.000000000 +0200 +++ new/kpackage-5.51.0/KF5PackageMacros.cmake 2018-10-08 10:19:12.000000000 +0200 @@ -159,7 +159,7 @@ COMMAND ${CMAKE_COMMAND} -DINSTALL_DIR=${install_dir} -DROOT=${root} -DCOMPONENT=${component} -DDIRECTORY=${DIRECTORY} -D OUTPUTFILE=${OUTPUTFILE} -P ${kpackagedir}/qrc.cmake DEPENDS ${component}-${root}-metadata-json) set(GENERATED_RCC_CONTENTS "${CMAKE_CURRENT_BINARY_DIR}/${component}-contents.rcc") - # add_custom_target depends on ALL target so qrc is run everytime + # add_custom_target depends on ALL target so qrc is run every time # it doesn't have OUTPUT property so it's considered out-of-date every build add_custom_target(${component}-${root}-contents-rcc ALL COMMENT "Generating ${component}-contents.rcc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.50.0/autotests/plasmoidpackagetest.cpp new/kpackage-5.51.0/autotests/plasmoidpackagetest.cpp --- old/kpackage-5.50.0/autotests/plasmoidpackagetest.cpp 2018-09-02 21:29:44.000000000 +0200 +++ new/kpackage-5.51.0/autotests/plasmoidpackagetest.cpp 2018-10-08 10:19:12.000000000 +0200 @@ -35,7 +35,7 @@ void PlasmoidPackageTest::initTestCase() { - QStandardPaths::enableTestMode(true); + QStandardPaths::setTestModeEnabled(true); } void PlasmoidPackageTest::init() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.50.0/autotests/rccpackagetest.cpp new/kpackage-5.51.0/autotests/rccpackagetest.cpp --- old/kpackage-5.50.0/autotests/rccpackagetest.cpp 2018-09-02 21:29:44.000000000 +0200 +++ new/kpackage-5.51.0/autotests/rccpackagetest.cpp 2018-10-08 10:19:12.000000000 +0200 @@ -30,7 +30,7 @@ void RccPackageTest::initTestCase() { - QStandardPaths::enableTestMode(true); + QStandardPaths::setTestModeEnabled(true); QString destination = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QStringLiteral("/plasma/plasmoids/testpackage-rcc/"); QDir dir; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.50.0/po/ast/libkpackage5.po new/kpackage-5.51.0/po/ast/libkpackage5.po --- old/kpackage-5.50.0/po/ast/libkpackage5.po 2018-09-02 21:29:44.000000000 +0200 +++ new/kpackage-5.51.0/po/ast/libkpackage5.po 2018-10-08 10:19:12.000000000 +0200 @@ -1,13 +1,13 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# enolp <[email protected]>, 2016. +# enolp <[email protected]>, 2016, 2018. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-08-16 09:05+0200\n" -"PO-Revision-Date: 2016-12-30 01:01+0100\n" +"PO-Revision-Date: 2018-10-07 21:43+0100\n" "Last-Translator: enolp <[email protected]>\n" "Language-Team: Asturian <[email protected]>\n" "Language: ast\n" @@ -90,7 +90,7 @@ #: kpackage/packageloader.cpp:70 #, kde-format msgid "Miscellaneous" -msgstr "Miscelaina" +msgstr "Miscelánea" #: kpackage/packageloader.cpp:71 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.50.0/po/id/libkpackage5.po new/kpackage-5.51.0/po/id/libkpackage5.po --- old/kpackage-5.50.0/po/id/libkpackage5.po 2018-09-02 21:29:44.000000000 +0200 +++ new/kpackage-5.51.0/po/id/libkpackage5.po 2018-10-08 10:19:12.000000000 +0200 @@ -9,8 +9,8 @@ "Project-Id-Version: plasmapkg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-08-16 09:05+0200\n" -"PO-Revision-Date: 2018-07-23 06:27+0700\n" -"Last-Translator: wantoyo <[email protected]>\n" +"PO-Revision-Date: 2018-10-03 22:32+0700\n" +"Last-Translator: Wantoyo <[email protected]>\n" "Language-Team: Indonesian <[email protected]>\n" "Language: id\n" "MIME-Version: 1.0\n" @@ -228,12 +228,12 @@ #: kpackage/private/packages.cpp:65 #, kde-format msgid "Images" -msgstr "Citra" +msgstr "Image" #: kpackage/private/packages.cpp:66 #, kde-format msgid "Themed Images" -msgstr "Citra Bertema" +msgstr "Image Bertema" #: kpackage/private/packages.cpp:72 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.50.0/po/ru/libkpackage5.po new/kpackage-5.51.0/po/ru/libkpackage5.po --- old/kpackage-5.50.0/po/ru/libkpackage5.po 2018-09-02 21:29:44.000000000 +0200 +++ new/kpackage-5.51.0/po/ru/libkpackage5.po 2018-10-08 10:19:12.000000000 +0200 @@ -8,7 +8,7 @@ # Leonid Kanter <[email protected]>, 2008. # Andrey Cherepanov <[email protected]>, 2008, 2009. # Nick Shaforostoff <[email protected]>, 2009. -# Alexander Potashev <[email protected]>, 2010, 2011, 2014, 2015, 2016, 2017. +# Alexander Potashev <[email protected]>, 2010, 2011, 2014, 2015, 2016, 2017, 2018. # Alexander Lakhin <[email protected]>, 2013. # Yuri Efremov <[email protected]>, 2013. msgid "" @@ -16,7 +16,7 @@ "Project-Id-Version: libplasma\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-08-16 09:05+0200\n" -"PO-Revision-Date: 2017-10-03 15:55+0300\n" +"PO-Revision-Date: 2018-09-12 15:33+0300\n" "Last-Translator: Alexander Potashev <[email protected]>\n" "Language-Team: Russian <[email protected]>\n" "Language: ru\n" @@ -403,37 +403,32 @@ #: kpackagetool/kpackagetool.cpp:697 #, kde-format msgid "Generating %1%2" -msgstr "" +msgstr "Создание %1%2" #: kpackagetool/kpackagetool.cpp:699 -#, fuzzy, kde-format -#| msgid "Generating %1/kpluginindex.json" +#, kde-format msgid "Didn't write %1%2" -msgstr "Создание %1/kpluginindex.json" +msgstr "Не записано %1%2" #: kpackagetool/kpackagetool.cpp:710 #, kde-format msgid "Generating %1/%2" -msgstr "" +msgstr "Создание %1/%2" #: kpackagetool/kpackagetool.cpp:712 -#, fuzzy, kde-format -#| msgid "Generating %1/kpluginindex.json" +#, kde-format msgid "Cannot write %1/%2" -msgstr "Создание %1/kpluginindex.json" +msgstr "Не удалось записать %1/%2" #: kpackagetool/kpackagetool.cpp:730 kpackagetool/kpackagetool.cpp:744 -#, fuzzy, kde-format -#| msgid "Could not open package file: %1" +#, kde-format msgid "Could not remove index file %1" -msgstr "Не удалось открыть пакет: %1" +msgstr "Не удалось удалить файл индекса %1" #: kpackagetool/kpackagetool.cpp:732 kpackagetool/kpackagetool.cpp:746 -#, fuzzy, kde-format -#| msgctxt "@title:window %1 is the name of the containment" -#| msgid "Remove %1" +#, kde-format msgid "Removed %1" -msgstr "Удалить виджет «%1»" +msgstr "Удалено %1" #: kpackagetool/kpackagetool.cpp:757 #, kde-format @@ -553,19 +548,15 @@ "не подан ключ -g, требуемые действия выполняются в домашнем каталоге." #: kpackagetool/options.h:65 -#, fuzzy, kde-format -#| msgid "" -#| "Recreate the plugin index. To be used in: conjunction with either the " -#| "option -t or -g. Recreates the index for the given type or package root. " -#| "Operates in the user directory, unless -g is used" +#, kde-format msgid "" "Remove the plugin index. To be used in: conjunction with either the option -" "t or -g. Recreates the index for the given type or package root. Operates in " "the user directory, unless -g is used" msgstr "" -"Создать заново индекс модулей. Ключ используется совместно с ключом -t или -" -"g. Создаёт индекс для указанного типа или корневого каталога пакетов. Если " -"не подан ключ -g, требуемые действия выполняются в домашнем каталоге." +"Удалить индекс модулей. Ключ используется совместно с ключом -t или -g. " +"Повторно создаёт индекс для указанного типа или корневого каталога пакетов. " +"Если не подан ключ -g, требуемые действия выполняются в домашнем каталоге." #: kpackagetool/options.h:71 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.50.0/po/zh_CN/libkpackage5.po new/kpackage-5.51.0/po/zh_CN/libkpackage5.po --- old/kpackage-5.50.0/po/zh_CN/libkpackage5.po 2018-09-02 21:29:44.000000000 +0200 +++ new/kpackage-5.51.0/po/zh_CN/libkpackage5.po 2018-10-08 10:19:12.000000000 +0200 @@ -9,8 +9,8 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-08-16 09:05+0200\n" -"PO-Revision-Date: 2018-08-30 13:09\n" -"Last-Translator: guoyunhebrave <[email protected]>\n" +"PO-Revision-Date: 2018-09-28 19:46\n" +"Last-Translator: guoyunhe <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.50.0/src/kpackage/CMakeLists.txt new/kpackage-5.51.0/src/kpackage/CMakeLists.txt --- old/kpackage-5.50.0/src/kpackage/CMakeLists.txt 2018-09-02 21:29:44.000000000 +0200 +++ new/kpackage-5.51.0/src/kpackage/CMakeLists.txt 2018-10-08 10:19:12.000000000 +0200 @@ -38,6 +38,7 @@ #KF5::Service # For kplugininfo.h and kservice.h KF5::CoreAddons PRIVATE + Qt5::DBus KF5::Archive KF5::I18n ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.50.0/src/kpackage/package.cpp new/kpackage-5.51.0/src/kpackage/package.cpp --- old/kpackage-5.50.0/src/kpackage/package.cpp 2018-09-02 21:29:44.000000000 +0200 +++ new/kpackage-5.51.0/src/kpackage/package.cpp 2018-10-08 10:19:12.000000000 +0200 @@ -367,7 +367,7 @@ //We are an installed package if (d->tempRoot.isEmpty()) { prefix = fileType == "metadata" ? d->path : (d->path + contentsPrefix); - //We are a compressed package temporarly uncompressed in /tmp + //We are a compressed package temporarily uncompressed in /tmp } else { prefix = fileType == "metadata" ? d->tempRoot : (d->tempRoot + contentsPrefix); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.50.0/src/kpackage/package.h new/kpackage-5.51.0/src/kpackage/package.h --- old/kpackage-5.50.0/src/kpackage/package.h 2018-09-02 21:29:44.000000000 +0200 +++ new/kpackage-5.51.0/src/kpackage/package.h 2018-10-08 10:19:12.000000000 +0200 @@ -91,7 +91,7 @@ PackageOpenError, /**< Can't open the package file for reading */ MetadataFileMissingError, /**< The package doesn't have a metadata.desktop file */ PluginNameMissingError, /**< The metadata.desktop file doesn't specify a plugin name */ - PluginNameInvalidError, /**< The plugin name contains charaters different from letters, digits, dots and underscores */ + PluginNameInvalidError, /**< The plugin name contains characters different from letters, digits, dots and underscores */ UpdatePackageTypeMismatchError, /**< A package with this plugin name was already installed, but has a different type in the metadata.desktop file */ OldVersionRemovalError, /**< Failed to remove the old version of the package during an upgrade */ NewerVersionAlreadyInstalledError, /**< We tried to update, but the same version or a newer one is already installed */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.50.0/src/kpackage/packageloader.cpp new/kpackage-5.51.0/src/kpackage/packageloader.cpp --- old/kpackage-5.50.0/src/kpackage/packageloader.cpp 2018-09-02 21:29:44.000000000 +0200 +++ new/kpackage-5.51.0/src/kpackage/packageloader.cpp 2018-10-08 10:19:12.000000000 +0200 @@ -51,7 +51,7 @@ QSet<QString> PackageLoaderPrivate::knownCategories() { - // this is to trick the tranlsation tools into making the correct + // this is to trick the translation tools into making the correct // strings for translation QSet<QString> categories = s_customCategories; categories << QStringLiteral(I18N_NOOP("Accessibility")).toLower() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.50.0/src/kpackage/private/package_p.h new/kpackage-5.51.0/src/kpackage/private/package_p.h --- old/kpackage-5.50.0/src/kpackage/private/package_p.h 2018-09-02 21:29:44.000000000 +0200 +++ new/kpackage-5.51.0/src/kpackage/private/package_p.h 2018-10-08 10:19:12.000000000 +0200 @@ -26,7 +26,7 @@ #include <QString> #include <QSharedData> #include <QPointer> - +#include <QHash> namespace KPackage { @@ -35,11 +35,11 @@ //leaving the PackageJob with a dangling pointer //we need some way to invalidate the Package* pointer if it gets deleted -//we can't just take a copy in the packagejob as we need to detatch and update the *original* KPackage object +//we can't just take a copy in the packagejob as we need to detach and update the *original* KPackage object //without changing anything else which happened to share the same KPackage::d //TODO KF6 - make KPackage::install()'s KJob return a new Package copy rather than modify -//an existing opbject. +//an existing object. class PackageDeletionNotifier : public QObject { Q_OBJECT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.50.0/src/kpackage/private/packagejob.cpp new/kpackage-5.51.0/src/kpackage/private/packagejob.cpp --- old/kpackage-5.50.0/src/kpackage/private/packagejob.cpp 2018-09-02 21:29:44.000000000 +0200 +++ new/kpackage-5.51.0/src/kpackage/private/packagejob.cpp 2018-10-08 10:19:12.000000000 +0200 @@ -25,6 +25,9 @@ #include "kpackage_debug.h" +#include <QDBusConnection> +#include <QDBusMessage> + namespace KPackage { class PackageJobPrivate @@ -48,8 +51,6 @@ } }); - connect(d->thread, SIGNAL(finished(bool,QString)), - SLOT(slotFinished(bool,QString)), Qt::QueuedConnection); connect(d->thread, &PackageJobThread::installPathChanged, this, [this](const QString &installPath) { if (d->package) { @@ -83,16 +84,45 @@ void PackageJob::install(const QString &src, const QString &dest) { + + connect(d->thread, &PackageJobThread::finished, this, [=](bool ok, const QString &error) { + if (ok) { + const QString pluginId = d->package->metadata().pluginId(); + const QStringList serviceTypes = d->package->metadata().serviceTypes(); + for (auto& packageType: serviceTypes) { + auto msg = QDBusMessage::createSignal(QStringLiteral("/KPackage/") + packageType, QStringLiteral("org.kde.plasma.kpackage"), QStringLiteral("packageInstalled")); + msg.setArguments({pluginId}); + QDBusConnection::sessionBus().send(msg); + } + } + slotFinished(ok, error); + }, Qt::QueuedConnection); d->thread->install(src, dest); } void PackageJob::update(const QString &src, const QString &dest) { + connect(d->thread, &PackageJobThread::finished, this, [=](bool ok, const QString &error) { + slotFinished(ok, error); + }, Qt::QueuedConnection); d->thread->update(src, dest); } void PackageJob::uninstall(const QString &installationPath) { + //capture first as uninstalling wipes d->package + const QString pluginId = d->package->metadata().pluginId(); + const QStringList serviceTypes = d->package->metadata().serviceTypes(); + connect(d->thread, &PackageJobThread::finished, this, [=](bool ok, const QString &error) { + if (ok) { + for (auto& packageType: serviceTypes) { + auto msg = QDBusMessage::createSignal(QStringLiteral("/KPackage/") + packageType, QStringLiteral("org.kde.plasma.kpackage"), QStringLiteral("packageUninstalled")); + msg.setArguments({pluginId}); + QDBusConnection::sessionBus().send(msg); + } + } + slotFinished(ok, error); + }, Qt::QueuedConnection); d->thread->uninstall(installationPath); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.50.0/src/kpackage/private/packagejobthread.cpp new/kpackage-5.51.0/src/kpackage/private/packagejobthread.cpp --- old/kpackage-5.50.0/src/kpackage/private/packagejobthread.cpp 2018-09-02 21:29:44.000000000 +0200 +++ new/kpackage-5.51.0/src/kpackage/private/packagejobthread.cpp 2018-10-08 10:19:12.000000000 +0200 @@ -347,7 +347,7 @@ KPluginMetaData oldMeta(targetName + QLatin1String("/metadata.desktop")); if (oldMeta.serviceTypes() != meta.serviceTypes()) { - d->errorMessage = i18n("The new package has a different type from the old version already installed.", meta.version(), meta.pluginId(), oldMeta.version()); + d->errorMessage = i18n("The new package has a different type from the old version already installed."); d->errorCode = Package::JobError::UpdatePackageTypeMismatchError; } else if (isVersionNewer(oldMeta.version(), meta.version())) { const bool ok = uninstallPackage(targetName); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.50.0/src/kpackage/private/packagejobthread_p.h new/kpackage-5.51.0/src/kpackage/private/packagejobthread_p.h --- old/kpackage-5.50.0/src/kpackage/private/packagejobthread_p.h 2018-09-02 21:29:44.000000000 +0200 +++ new/kpackage-5.51.0/src/kpackage/private/packagejobthread_p.h 2018-10-08 10:19:12.000000000 +0200 @@ -65,7 +65,7 @@ void installPathChanged(const QString &installPath); private: - //OperationType says wether we want to install, update or any + //OperationType says whether we want to install, update or any //new similar operation it will be expanded bool installDependency(const QUrl &src); bool installPackage(const QString &src, const QString &dest, OperationType operation); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.50.0/src/kpackagetool/kpackagetool.cpp new/kpackage-5.51.0/src/kpackagetool/kpackagetool.cpp --- old/kpackage-5.50.0/src/kpackagetool/kpackagetool.cpp 2018-09-02 21:29:44.000000000 +0200 +++ new/kpackage-5.51.0/src/kpackagetool/kpackagetool.cpp 2018-10-08 10:19:12.000000000 +0200 @@ -481,7 +481,7 @@ // Be super aggressive in finding a NoDisplay property. It can be a top-level property or // inside the KPlugin object, it also can be either a stringy type or a bool type. Try all // possible scopes and type conversions to find NoDisplay - for (const auto object : { i.rawData(), rootObject }) { + for (const auto& object : { i.rawData(), rootObject }) { if (object.value(QLatin1String("NoDisplay")).toBool(false) || // Standard value is unprocessed string we'll need to deal with. object.value(QLatin1String("NoDisplay")).toString() == QStringLiteral("true")) { @@ -687,7 +687,7 @@ } Q_FOREACH(auto const &p, QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, d->packageRoot, QStandardPaths::LocateDirectory)) { - for (const auto &_proot: packageRoots) { + for (const auto &_proot: qAsConst(packageRoots)) { QFileInfo packageDirInfo(QStringLiteral("%1%2").arg(p, _proot)); if (!packageDirInfo.isWritable()) { continue;
