Hello community, here is the log from the commit of package kpackage for openSUSE:Factory checked in at 2018-05-18 14:22:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kpackage (Old) and /work/SRC/openSUSE:Factory/.kpackage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kpackage" Fri May 18 14:22:53 2018 rev:43 rq:607579 version:5.46.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kpackage/kpackage.changes 2018-04-19 15:17:51.939259120 +0200 +++ /work/SRC/openSUSE:Factory/.kpackage.new/kpackage.changes 2018-05-18 14:22:56.241305772 +0200 @@ -1,0 +2,15 @@ +Sun May 13 21:03:05 UTC 2018 - [email protected] + +- Update to 5.46.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.46.0.php +- Changes since 5.45.0: + * Use override + * Add missing explicit + * use KDE_INSTALL_DATADIR instead of FULL_DATADIR + * Warning-- + * Add donate urls to test data + * Add override + +------------------------------------------------------------------- Old: ---- kpackage-5.45.0.tar.xz New: ---- kpackage-5.46.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kpackage.spec ++++++ --- /var/tmp/diff_new_pack.UB1lxm/_old 2018-05-18 14:22:56.881282280 +0200 +++ /var/tmp/diff_new_pack.UB1lxm/_new 2018-05-18 14:22:56.881282280 +0200 @@ -17,13 +17,13 @@ %bcond_without lang -%define _tar_path 5.45 +%define _tar_path 5.46 # 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: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} Name: kpackage -Version: 5.45.0 +Version: 5.46.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 3.0 ++++++ kpackage-5.45.0.tar.xz -> kpackage-5.46.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.45.0/CMakeLists.txt new/kpackage-5.46.0/CMakeLists.txt --- old/kpackage-5.45.0/CMakeLists.txt 2018-04-07 21:37:56.000000000 +0200 +++ new/kpackage-5.46.0/CMakeLists.txt 2018-05-05 14:59:32.000000000 +0200 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.45.0") # handled by release scripts -set(KF5_DEP_VERSION "5.45.0") # handled by release scripts +set(KF5_VERSION "5.46.0") # handled by release scripts +set(KF5_DEP_VERSION "5.46.0") # handled by release scripts project(KPackage VERSION ${KF5_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.45.0 NO_MODULE) +find_package(ECM 5.46.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) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.45.0/KF5PackageMacros.cmake new/kpackage-5.46.0/KF5PackageMacros.cmake --- old/kpackage-5.45.0/KF5PackageMacros.cmake 2018-04-07 21:37:56.000000000 +0200 +++ new/kpackage-5.46.0/KF5PackageMacros.cmake 2018-05-05 14:59:32.000000000 +0200 @@ -161,6 +161,6 @@ COMMENT "Generating ${component}-contents.rcc" COMMAND Qt5::rcc "${kpkgqrc}" --binary -o "${GENERATED_RCC_CONTENTS}" DEPENDS ${component}-${root}-metadata-json ${component}-${root}-qrc) - install(FILES ${GENERATED_RCC_CONTENTS} DESTINATION ${KDE_INSTALL_FULL_DATADIR}/${install_dir}/${root}/${component}/ RENAME contents.rcc) + install(FILES ${GENERATED_RCC_CONTENTS} DESTINATION ${KDE_INSTALL_DATADIR}/${install_dir}/${root}/${component}/ RENAME contents.rcc) endfunction() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.45.0/autotests/data/testfallbackpackage/testfallbackpackage.testappdataxml new/kpackage-5.46.0/autotests/data/testfallbackpackage/testfallbackpackage.testappdataxml --- old/kpackage-5.45.0/autotests/data/testfallbackpackage/testfallbackpackage.testappdataxml 2018-04-07 21:37:56.000000000 +0200 +++ new/kpackage-5.46.0/autotests/data/testfallbackpackage/testfallbackpackage.testappdataxml 2018-05-05 14:59:32.000000000 +0200 @@ -35,6 +35,7 @@ <name xml:lang="x-test">xxTest Fallback Packagexx</name> <name xml:lang="zh_CN">测试回退包</name> <name xml:lang="zh_TW">測試預設套件</name> + <url type="donation">https://www.kde.org/donate.php?app=org.kde.testfallbackpackage</url> <developer_name>Marco Martin <[email protected]></developer_name> <project_license>GPL-2.0+</project_license> <metadata_license>CC0-1.0</metadata_license> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.45.0/autotests/data/testjsonmetadatapackage/testjsonmetadatapackage.testappdataxml new/kpackage-5.46.0/autotests/data/testjsonmetadatapackage/testjsonmetadatapackage.testappdataxml --- old/kpackage-5.45.0/autotests/data/testjsonmetadatapackage/testjsonmetadatapackage.testappdataxml 2018-04-07 21:37:56.000000000 +0200 +++ new/kpackage-5.46.0/autotests/data/testjsonmetadatapackage/testjsonmetadatapackage.testappdataxml 2018-05-05 14:59:32.000000000 +0200 @@ -2,6 +2,7 @@ <component> <id>org.kde.testjsonpackage</id> <name>Test JSON Package</name> + <url type="donation">https://www.kde.org/donate.php?app=org.kde.testjsonpackage</url> <developer_name>Aleix <[email protected]></developer_name> <project_license>GPL-2.0+</project_license> <metadata_license>CC0-1.0</metadata_license> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.45.0/autotests/data/testpackage/testpackage.testappdataxml new/kpackage-5.46.0/autotests/data/testpackage/testpackage.testappdataxml --- old/kpackage-5.45.0/autotests/data/testpackage/testpackage.testappdataxml 2018-04-07 21:37:56.000000000 +0200 +++ new/kpackage-5.46.0/autotests/data/testpackage/testpackage.testappdataxml 2018-05-05 14:59:32.000000000 +0200 @@ -45,6 +45,7 @@ <name xml:lang="zh_CN">测试包</name> <name xml:lang="zh_TW">測試套件</name> <summary>fancy shmancy summary</summary> + <url type="donation">https://www.kde.org/donate.php?app=org.kde.testpackage</url> <developer_name>Joe Blow <[email protected]></developer_name> <icon type="stock">plasma</icon> <project_license>GPL-2.0+</project_license> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.45.0/autotests/data/testpackagesdep/testpackagesdep.testappdataxml new/kpackage-5.46.0/autotests/data/testpackagesdep/testpackagesdep.testappdataxml --- old/kpackage-5.45.0/autotests/data/testpackagesdep/testpackagesdep.testappdataxml 2018-04-07 21:37:56.000000000 +0200 +++ new/kpackage-5.46.0/autotests/data/testpackagesdep/testpackagesdep.testappdataxml 2018-05-05 14:59:32.000000000 +0200 @@ -2,6 +2,7 @@ <component> <id>org.kde.testpackagesdep</id> <name>Test Packages with Dependencies</name> + <url type="donation">https://www.kde.org/donate.php?app=org.kde.testpackagesdep</url> <developer_name>Aleix <[email protected]></developer_name> <project_license>GPL-2.0+</project_license> <metadata_license>CC0-1.0</metadata_license> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.45.0/autotests/data/testpackagesdepinvalid/testpackagesdepinvalid.testappdataxml new/kpackage-5.46.0/autotests/data/testpackagesdepinvalid/testpackagesdepinvalid.testappdataxml --- old/kpackage-5.45.0/autotests/data/testpackagesdepinvalid/testpackagesdepinvalid.testappdataxml 2018-04-07 21:37:56.000000000 +0200 +++ new/kpackage-5.46.0/autotests/data/testpackagesdepinvalid/testpackagesdepinvalid.testappdataxml 2018-05-05 14:59:32.000000000 +0200 @@ -2,6 +2,7 @@ <component> <id>org.kde.testpackagesdepinvalid</id> <name>Test Packages with Dependencies</name> + <url type="donation">https://www.kde.org/donate.php?app=org.kde.testpackagesdepinvalid</url> <developer_name>Bhushan <[email protected]></developer_name> <project_license>GPL-2.0+</project_license> <metadata_license>CC0-1.0</metadata_license> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.45.0/autotests/packagestructuretest.cpp new/kpackage-5.46.0/autotests/packagestructuretest.cpp --- old/kpackage-5.45.0/autotests/packagestructuretest.cpp 2018-04-07 21:37:56.000000000 +0200 +++ new/kpackage-5.46.0/autotests/packagestructuretest.cpp 2018-05-05 14:59:32.000000000 +0200 @@ -44,7 +44,7 @@ { Q_OBJECT public: - void initPackage(KPackage::Package *package) Q_DECL_OVERRIDE + void initPackage(KPackage::Package *package) override { package->addDirectoryDefinition("images", QStringLiteral("images/"), i18n("Images")); @@ -56,7 +56,7 @@ package->addFileDefinition("screenshot", QStringLiteral("screenshot.png"), i18n("Screenshot")); package->setAllowExternalPaths(true); } - void pathChanged(KPackage::Package *package) Q_DECL_OVERRIDE + void pathChanged(KPackage::Package *package) override { static bool guard = false; @@ -95,11 +95,11 @@ { Q_OBJECT public: - void initPackage(KPackage::Package *package) Q_DECL_OVERRIDE + void initPackage(KPackage::Package *package) override { package->addDirectoryDefinition("ui", QStringLiteral("ui/"), i18n("User interface")); } - void pathChanged(KPackage::Package *package) Q_DECL_OVERRIDE + void pathChanged(KPackage::Package *package) override { if (!package->metadata().isValid()) { return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.45.0/autotests/plasmoidstructure.h new/kpackage-5.46.0/autotests/plasmoidstructure.h --- old/kpackage-5.45.0/autotests/plasmoidstructure.h 2018-04-07 21:37:56.000000000 +0200 +++ new/kpackage-5.46.0/autotests/plasmoidstructure.h 2018-05-05 14:59:32.000000000 +0200 @@ -30,7 +30,7 @@ { Q_OBJECT public: - void initPackage(Package *package) Q_DECL_OVERRIDE; + void initPackage(Package *package) override; }; } // namespace KPackage diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.45.0/po/cs/libkpackage5.po new/kpackage-5.46.0/po/cs/libkpackage5.po --- old/kpackage-5.45.0/po/cs/libkpackage5.po 2018-04-07 21:37:56.000000000 +0200 +++ new/kpackage-5.46.0/po/cs/libkpackage5.po 2018-05-05 14:59:32.000000000 +0200 @@ -1,6 +1,6 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# Vít Pelčák <[email protected]>, 2010, 2011, 2013, 2014, 2015, 2016, 2017. +# Vít Pelčák <[email protected]>, 2010, 2011, 2013, 2014, 2015, 2016, 2017, 2018. # Lukáš Tinkl <[email protected]>, 2010, 2012. # msgid "" @@ -8,8 +8,8 @@ "Project-Id-Version: plasmapkg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-03-19 03:21+0100\n" -"PO-Revision-Date: 2017-08-07 17:42+0100\n" -"Last-Translator: Vít Pelčák <[email protected]>\n" +"PO-Revision-Date: 2018-04-13 13:43+0100\n" +"Last-Translator: Vit Pelcak <[email protected]>\n" "Language-Team: Czech <[email protected]>\n" "Language: cs\n" "MIME-Version: 1.0\n" @@ -186,7 +186,7 @@ #: kpackage/private/packagejobthread.cpp:359 #, kde-format msgid "Not installing version %1 of %2. Version %3 already installed." -msgstr "" +msgstr "Neinstaluji %2 ve verzi %1. Již je nainstalována verze %3." #: kpackage/private/packagejobthread.cpp:363 #, kde-format @@ -387,7 +387,7 @@ #: kpackagetool/kpackagetool.cpp:697 #, kde-format msgid "Generating %1%2" -msgstr "" +msgstr "Generuji %1%2" #: kpackagetool/kpackagetool.cpp:699 #, kde-format @@ -397,22 +397,22 @@ #: kpackagetool/kpackagetool.cpp:710 #, kde-format msgid "Generating %1/%2" -msgstr "" +msgstr "Generuji %1/%2" #: kpackagetool/kpackagetool.cpp:712 #, kde-format msgid "Cannot write %1/%2" -msgstr "" +msgstr "Nelze zapisovat do %1/%2" #: kpackagetool/kpackagetool.cpp:730 kpackagetool/kpackagetool.cpp:744 #, kde-format msgid "Could not remove index file %1" -msgstr "" +msgstr "Nelze odstranit soubor indexu %1" #: kpackagetool/kpackagetool.cpp:732 kpackagetool/kpackagetool.cpp:746 #, kde-format msgid "Removed %1" -msgstr "" +msgstr "Odstraněno %1" #: kpackagetool/kpackagetool.cpp:757 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.45.0/po/eu/libkpackage5.po new/kpackage-5.46.0/po/eu/libkpackage5.po --- old/kpackage-5.45.0/po/eu/libkpackage5.po 2018-04-07 21:37:56.000000000 +0200 +++ new/kpackage-5.46.0/po/eu/libkpackage5.po 2018-05-05 14:59:32.000000000 +0200 @@ -1,16 +1,16 @@ # Translation of libkpackage5.po to Euskara/Basque (eu). -# Copyright (C) 2017, Free Software Foundation, Inc. +# Copyright (C) 2017-2018, Free Software Foundation. # This file is distributed under the same license as the frameworks package. # KDE Euskaratzeko proiektuaren arduraduna <[email protected]>. # # Translators: -# Iñigo Salvador Azurmendi <[email protected]>, 2017. +# Iñigo Salvador Azurmendi <[email protected]>, 2017, 2018. msgid "" msgstr "" "Project-Id-Version: libkpackage5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-03-19 03:21+0100\n" -"PO-Revision-Date: 2017-10-17 21:42+0100\n" +"PO-Revision-Date: 2018-05-01 23:27+0100\n" "Last-Translator: Iñigo Salvador Azurmendi <[email protected]>\n" "Language-Team: Basque <[email protected]>\n" "Language: eu\n" @@ -395,35 +395,32 @@ #: kpackagetool/kpackagetool.cpp:697 #, kde-format msgid "Generating %1%2" -msgstr "" +msgstr "Sortzen %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 sortzen" +msgstr "Ez da idatzi %1%2" #: kpackagetool/kpackagetool.cpp:710 #, kde-format msgid "Generating %1/%2" -msgstr "" +msgstr "Sortzen %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 sortzen" +msgstr "Ezin da idatzi %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 "Ezin izan da ireki pakete fitxategia: %1" +msgstr "Ezin izan da kendu aurkibide fitxategia: %1" #: kpackagetool/kpackagetool.cpp:732 kpackagetool/kpackagetool.cpp:746 #, kde-format msgid "Removed %1" -msgstr "" +msgstr "Kenduta %1" #: kpackagetool/kpackagetool.cpp:757 #, kde-format @@ -542,18 +539,14 @@ "Erabiltzailearen direktorioan jarduten da, -g erabili ezean" #: 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 "" -"Birsortu pluginaren indizea. Honela erabiltzeko: -t edo -g aukeretako " -"batekin. Adierazitako erro pakete motarentzako indizea birsortzen du." +"Kendu pluginaren indizea. Honela erabiltzeko: -t edo -g aukeretako batekin " +"batera. Adierazitako mota edo erro paketearentzako aurkibidea birsortzen du. " "Erabiltzailearen direktorioan jarduten da, -g erabili ezean" #: kpackagetool/options.h:71 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.45.0/po/nb/libkpackage5.po new/kpackage-5.46.0/po/nb/libkpackage5.po --- old/kpackage-5.45.0/po/nb/libkpackage5.po 2018-04-07 21:37:56.000000000 +0200 +++ new/kpackage-5.46.0/po/nb/libkpackage5.po 2018-05-05 14:59:32.000000000 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: plasmapkg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-12-15 03:10+0100\n" +"POT-Creation-Date: 2018-03-19 03:21+0100\n" "PO-Revision-Date: 2015-04-30 08:45+0200\n" "Last-Translator: Bjørn Steensrud <[email protected]>\n" "Language-Team: Norwegian Bokmål <[email protected]>\n" @@ -334,7 +334,7 @@ msgid " Path : %1" msgstr " Sti : %1" -#: kpackagetool/kpackagetool.cpp:560 +#: kpackagetool/kpackagetool.cpp:568 #, kde-format msgctxt "" "The user entered conflicting options packageroot and global, this is the " @@ -346,102 +346,102 @@ "Pakkeroten og globale innstillinger er i konflikt med hverandre, velg bare " "én." -#: kpackagetool/kpackagetool.cpp:588 +#: kpackagetool/kpackagetool.cpp:596 #, kde-format msgid "Addon Name" msgstr "Navn på tillegg" -#: kpackagetool/kpackagetool.cpp:589 +#: kpackagetool/kpackagetool.cpp:597 #, kde-format msgid "Service Type" msgstr "Tjenestetype" -#: kpackagetool/kpackagetool.cpp:590 +#: kpackagetool/kpackagetool.cpp:598 #, kde-format msgid "Path" msgstr "Sti" -#: kpackagetool/kpackagetool.cpp:633 +#: kpackagetool/kpackagetool.cpp:641 #, kde-format msgid "Package types that are installable with this tool:" msgstr "Pakketyper som kan installeres med dette verktøyet:" -#: kpackagetool/kpackagetool.cpp:634 +#: kpackagetool/kpackagetool.cpp:642 #, kde-format msgid "Built in:" msgstr "innebygd:" -#: kpackagetool/kpackagetool.cpp:637 +#: kpackagetool/kpackagetool.cpp:645 #, kde-format msgid "KPackage/Generic" msgstr "KPackage/Generisk" -#: kpackagetool/kpackagetool.cpp:638 +#: kpackagetool/kpackagetool.cpp:646 #, kde-format msgid "KPackage/GenericQML" msgstr "KPackage/GeneriskQML" -#: kpackagetool/kpackagetool.cpp:646 +#: kpackagetool/kpackagetool.cpp:654 #, kde-format msgid "Provided by plugins:" msgstr "Levert av programtillegg:" -#: kpackagetool/kpackagetool.cpp:689 +#: kpackagetool/kpackagetool.cpp:697 #, kde-format msgid "Generating %1%2" msgstr "" -#: kpackagetool/kpackagetool.cpp:691 +#: kpackagetool/kpackagetool.cpp:699 #, kde-format msgid "Didn't write %1%2" msgstr "" -#: kpackagetool/kpackagetool.cpp:702 +#: kpackagetool/kpackagetool.cpp:710 #, kde-format msgid "Generating %1/%2" msgstr "" -#: kpackagetool/kpackagetool.cpp:704 +#: kpackagetool/kpackagetool.cpp:712 #, kde-format msgid "Cannot write %1/%2" msgstr "" -#: kpackagetool/kpackagetool.cpp:722 kpackagetool/kpackagetool.cpp:736 +#: kpackagetool/kpackagetool.cpp:730 kpackagetool/kpackagetool.cpp:744 #, kde-format msgid "Could not remove index file %1" msgstr "" -#: kpackagetool/kpackagetool.cpp:724 kpackagetool/kpackagetool.cpp:738 +#: kpackagetool/kpackagetool.cpp:732 kpackagetool/kpackagetool.cpp:746 #, kde-format msgid "Removed %1" msgstr "" -#: kpackagetool/kpackagetool.cpp:749 +#: kpackagetool/kpackagetool.cpp:757 #, kde-format msgid "Successfully upgraded %1" msgstr "Vellykket oppgradert %1" -#: kpackagetool/kpackagetool.cpp:751 +#: kpackagetool/kpackagetool.cpp:759 #, kde-format msgid "Successfully installed %1" msgstr "Vellykket installert %1" -#: kpackagetool/kpackagetool.cpp:754 +#: kpackagetool/kpackagetool.cpp:762 #, kde-format msgid "Error: Installation of %1 failed: %2" msgstr "Feil: Installasjon av %1 mislyktes: %2" -#: kpackagetool/kpackagetool.cpp:766 +#: kpackagetool/kpackagetool.cpp:774 #, kde-format msgid "Upgrading package from file: %1" msgstr "Oppgraderer pakke fra fil: %1" -#: kpackagetool/kpackagetool.cpp:771 +#: kpackagetool/kpackagetool.cpp:779 #, kde-format msgid "Successfully uninstalled %1" msgstr "Vellykket avinstallert %1" -#: kpackagetool/kpackagetool.cpp:773 +#: kpackagetool/kpackagetool.cpp:781 #, kde-format msgid "Error: Uninstallation of %1 failed: %2" msgstr "Feil: Avinstallasjon av %1 mislyktes: %2" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.45.0/po/nn/libkpackage5.po new/kpackage-5.46.0/po/nn/libkpackage5.po --- old/kpackage-5.45.0/po/nn/libkpackage5.po 2018-04-07 21:37:56.000000000 +0200 +++ new/kpackage-5.46.0/po/nn/libkpackage5.po 2018-05-05 14:59:32.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: plasmapkg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-12-15 03:10+0100\n" +"POT-Creation-Date: 2018-03-19 03:21+0100\n" "PO-Revision-Date: 2018-03-12 19:15+0100\n" "Last-Translator: Karl Ove Hufthammer <[email protected]>\n" "Language-Team: Norwegian Nynorsk <[email protected]>\n" @@ -335,7 +335,7 @@ msgid " Path : %1" msgstr " Adresse: %1" -#: kpackagetool/kpackagetool.cpp:560 +#: kpackagetool/kpackagetool.cpp:568 #, kde-format msgctxt "" "The user entered conflicting options packageroot and global, this is the " @@ -347,102 +347,102 @@ "Pakkerota og dei globale innstillingane er i konflikt med kvarandre. Du må " "velja berre éin av dei." -#: kpackagetool/kpackagetool.cpp:588 +#: kpackagetool/kpackagetool.cpp:596 #, kde-format msgid "Addon Name" msgstr "Tilleggsnamn" -#: kpackagetool/kpackagetool.cpp:589 +#: kpackagetool/kpackagetool.cpp:597 #, kde-format msgid "Service Type" msgstr "Tenestetype" -#: kpackagetool/kpackagetool.cpp:590 +#: kpackagetool/kpackagetool.cpp:598 #, kde-format msgid "Path" msgstr "Adresse" -#: kpackagetool/kpackagetool.cpp:633 +#: kpackagetool/kpackagetool.cpp:641 #, kde-format msgid "Package types that are installable with this tool:" msgstr "Pakketypar som du kan installera med dette verktøyet:" -#: kpackagetool/kpackagetool.cpp:634 +#: kpackagetool/kpackagetool.cpp:642 #, kde-format msgid "Built in:" msgstr "Innebygd:" -#: kpackagetool/kpackagetool.cpp:637 +#: kpackagetool/kpackagetool.cpp:645 #, kde-format msgid "KPackage/Generic" msgstr "KPackage/generisk" -#: kpackagetool/kpackagetool.cpp:638 +#: kpackagetool/kpackagetool.cpp:646 #, kde-format msgid "KPackage/GenericQML" msgstr "KPackage/GenericQML" -#: kpackagetool/kpackagetool.cpp:646 +#: kpackagetool/kpackagetool.cpp:654 #, kde-format msgid "Provided by plugins:" msgstr "Levert av programtillegg:" -#: kpackagetool/kpackagetool.cpp:689 +#: kpackagetool/kpackagetool.cpp:697 #, kde-format msgid "Generating %1%2" msgstr "Genererer %1%2" -#: kpackagetool/kpackagetool.cpp:691 +#: kpackagetool/kpackagetool.cpp:699 #, kde-format msgid "Didn't write %1%2" msgstr "Skreiv ikkje %1%2" -#: kpackagetool/kpackagetool.cpp:702 +#: kpackagetool/kpackagetool.cpp:710 #, kde-format msgid "Generating %1/%2" msgstr "Genererer %1/%2" -#: kpackagetool/kpackagetool.cpp:704 +#: kpackagetool/kpackagetool.cpp:712 #, kde-format msgid "Cannot write %1/%2" msgstr "Kan ikkje skriva %1/%2" -#: kpackagetool/kpackagetool.cpp:722 kpackagetool/kpackagetool.cpp:736 +#: kpackagetool/kpackagetool.cpp:730 kpackagetool/kpackagetool.cpp:744 #, kde-format msgid "Could not remove index file %1" msgstr "Klarte ikkje fjerna indeksfila %1" -#: kpackagetool/kpackagetool.cpp:724 kpackagetool/kpackagetool.cpp:738 +#: kpackagetool/kpackagetool.cpp:732 kpackagetool/kpackagetool.cpp:746 #, kde-format msgid "Removed %1" msgstr "Fjerna %1" -#: kpackagetool/kpackagetool.cpp:749 +#: kpackagetool/kpackagetool.cpp:757 #, kde-format msgid "Successfully upgraded %1" msgstr "%1 vart oppgradert" -#: kpackagetool/kpackagetool.cpp:751 +#: kpackagetool/kpackagetool.cpp:759 #, kde-format msgid "Successfully installed %1" msgstr "%1 vart installert" -#: kpackagetool/kpackagetool.cpp:754 +#: kpackagetool/kpackagetool.cpp:762 #, kde-format msgid "Error: Installation of %1 failed: %2" msgstr "Feil: Klarte ikkje installera %1: %2" -#: kpackagetool/kpackagetool.cpp:766 +#: kpackagetool/kpackagetool.cpp:774 #, kde-format msgid "Upgrading package from file: %1" msgstr "Oppgraderar pakke frå fil: %1" -#: kpackagetool/kpackagetool.cpp:771 +#: kpackagetool/kpackagetool.cpp:779 #, kde-format msgid "Successfully uninstalled %1" msgstr "%1 vart avinstallert" -#: kpackagetool/kpackagetool.cpp:773 +#: kpackagetool/kpackagetool.cpp:781 #, kde-format msgid "Error: Uninstallation of %1 failed: %2" msgstr "Feil: Klarte ikkje avinstallera %1: %2" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.45.0/po/zh_CN/libkpackage5.po new/kpackage-5.46.0/po/zh_CN/libkpackage5.po --- old/kpackage-5.45.0/po/zh_CN/libkpackage5.po 2018-04-07 21:37:56.000000000 +0200 +++ new/kpackage-5.46.0/po/zh_CN/libkpackage5.po 2018-05-05 14:59:32.000000000 +0200 @@ -9,7 +9,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-03-19 03:21+0100\n" -"PO-Revision-Date: 2018-04-05 09:21-0400\n" +"PO-Revision-Date: 2018-04-26 05:21-0400\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.45.0/src/kpackage/private/packagejob_p.h new/kpackage-5.46.0/src/kpackage/private/packagejob_p.h --- old/kpackage-5.45.0/src/kpackage/private/packagejob_p.h 2018-04-07 21:37:56.000000000 +0200 +++ new/kpackage-5.46.0/src/kpackage/private/packagejob_p.h 2018-05-05 14:59:32.000000000 +0200 @@ -34,9 +34,9 @@ public: PackageJob(Package *package, QObject *parent = nullptr); - ~PackageJob(); + ~PackageJob() override; - void start() Q_DECL_OVERRIDE; + void start() override; void install(const QString &src, const QString &dest); void update(const QString &src, const QString &dest); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.45.0/src/kpackage/private/packagejobthread.cpp new/kpackage-5.46.0/src/kpackage/private/packagejobthread.cpp --- old/kpackage-5.45.0/src/kpackage/private/packagejobthread.cpp 2018-04-07 21:37:56.000000000 +0200 +++ new/kpackage-5.46.0/src/kpackage/private/packagejobthread.cpp 2018-05-05 14:59:32.000000000 +0200 @@ -466,7 +466,7 @@ Package::JobError PackageJobThread::errorCode() const { - return (Package::JobError)d->errorCode; + return static_cast<Package::JobError>(d->errorCode); } } // namespace KPackage diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.45.0/src/kpackage/private/packagejobthread_p.h new/kpackage-5.46.0/src/kpackage/private/packagejobthread_p.h --- old/kpackage-5.45.0/src/kpackage/private/packagejobthread_p.h 2018-04-07 21:37:56.000000000 +0200 +++ new/kpackage-5.46.0/src/kpackage/private/packagejobthread_p.h 2018-05-05 14:59:32.000000000 +0200 @@ -49,7 +49,7 @@ Update }; - PackageJobThread(QObject *parent = nullptr); + explicit PackageJobThread(QObject *parent = nullptr); virtual ~PackageJobThread(); bool install(const QString &src, const QString &dest); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.45.0/src/kpackage/private/packages_p.h new/kpackage-5.46.0/src/kpackage/private/packages_p.h --- old/kpackage-5.45.0/src/kpackage/private/packages_p.h 2018-04-07 21:37:56.000000000 +0200 +++ new/kpackage-5.46.0/src/kpackage/private/packages_p.h 2018-05-05 14:59:32.000000000 +0200 @@ -26,25 +26,25 @@ { Q_OBJECT public: - void initPackage(KPackage::Package *package) Q_DECL_OVERRIDE; + void initPackage(KPackage::Package *package) override; protected: virtual QString mainScriptConfigKey() const; - void pathChanged(KPackage::Package *package) Q_DECL_OVERRIDE; + void pathChanged(KPackage::Package *package) override; }; class GenericPackage : public ChangeableMainScriptPackage { Q_OBJECT public: - void initPackage(KPackage::Package *package) Q_DECL_OVERRIDE; + void initPackage(KPackage::Package *package) override; }; class GenericQMLPackage : public GenericPackage { Q_OBJECT public: - void initPackage(KPackage::Package *package) Q_DECL_OVERRIDE; + void initPackage(KPackage::Package *package) override; }; #endif // LIBS_KPACKAGE_PACKAGES_P_H
