Hello community, here is the log from the commit of package kpackage for openSUSE:Factory checked in at 2017-03-28 15:11:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kpackage (Old) and /work/SRC/openSUSE:Factory/.kpackage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kpackage" Tue Mar 28 15:11:36 2017 rev:29 rq:481529 version:5.32.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kpackage/kpackage.changes 2017-03-03 17:04:32.544399907 +0100 +++ /work/SRC/openSUSE:Factory/.kpackage.new/kpackage.changes 2017-03-28 15:11:38.431495911 +0200 @@ -1,0 +2,14 @@ +Sun Mar 19 14:50:51 CET 2017 - [email protected] + +- Update to 5.32.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.32.0.php +- Changes since 5.31.0: + * Commit translations from l10n-kf5 + * Upgrade ECM and KF5 version requirements for 5.32.0 release. + * finish support for opening compressed packages + * Upgrade KF5 version to 5.32.0. + * Upgrade Qt5 version requirement to 5.6.0. + +------------------------------------------------------------------- Old: ---- kpackage-5.31.0.tar.xz New: ---- kpackage-5.32.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kpackage.spec ++++++ --- /var/tmp/diff_new_pack.UvGqHO/_old 2017-03-28 15:11:39.027411492 +0200 +++ /var/tmp/diff_new_pack.UvGqHO/_new 2017-03-28 15:11:39.031410925 +0200 @@ -17,9 +17,9 @@ %bcond_without lang -%define _tar_path 5.31 +%define _tar_path 5.32 Name: kpackage -Version: 5.31.0 +Version: 5.32.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 3.0 ++++++ kpackage-5.31.0.tar.xz -> kpackage-5.32.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.31.0/CMakeLists.txt new/kpackage-5.32.0/CMakeLists.txt --- old/kpackage-5.31.0/CMakeLists.txt 2017-02-05 12:07:51.000000000 +0100 +++ new/kpackage-5.32.0/CMakeLists.txt 2017-03-04 17:18:07.000000000 +0100 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.31.0") # handled by release scripts -set(KF5_DEP_VERSION "5.31.0") # handled by release scripts +set(KF5_VERSION "5.32.0") # handled by release scripts +set(KF5_DEP_VERSION "5.32.0") # handled by release scripts project(KPackage VERSION ${KF5_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.31.0 NO_MODULE) +find_package(ECM 5.32.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) @@ -37,7 +37,7 @@ ################# now find all used packages ################# -set (REQUIRED_QT_VERSION "5.3.0") +set (REQUIRED_QT_VERSION 5.6.0) find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE COMPONENTS Core) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.31.0/po/ca@valencia/libkpackage5.po new/kpackage-5.32.0/po/ca@valencia/libkpackage5.po --- old/kpackage-5.31.0/po/ca@valencia/libkpackage5.po 2017-02-05 12:07:51.000000000 +0100 +++ new/kpackage-5.32.0/po/ca@valencia/libkpackage5.po 2017-03-04 17:18:07.000000000 +0100 @@ -10,7 +10,7 @@ "Project-Id-Version: libkpackage5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-02-03 04:08+0100\n" -"PO-Revision-Date: 2017-01-05 19:36+0100\n" +"PO-Revision-Date: 2017-02-03 18:39+0100\n" "Last-Translator: Josep Ma. Ferrer <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" "Language: ca@valencia\n" @@ -342,7 +342,7 @@ #: kpackagetool/kpackagetool.cpp:461 #, kde-format msgid "%1 has NoDisplay enabled\n" -msgstr "" +msgstr "El %1 té activat «NoDisplay»\n" #: kpackagetool/kpackagetool.cpp:523 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.31.0/po/cs/libkpackage5.po new/kpackage-5.32.0/po/cs/libkpackage5.po --- old/kpackage-5.31.0/po/cs/libkpackage5.po 2017-02-05 12:07:51.000000000 +0100 +++ new/kpackage-5.32.0/po/cs/libkpackage5.po 2017-03-04 17:18:07.000000000 +0100 @@ -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. +# Vít Pelčák <[email protected]>, 2010, 2011, 2013, 2014, 2015, 2016, 2017. # Lukáš Tinkl <[email protected]>, 2010, 2012. # msgid "" @@ -8,7 +8,7 @@ "Project-Id-Version: plasmapkg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-02-03 04:08+0100\n" -"PO-Revision-Date: 2016-12-09 09:12+0100\n" +"PO-Revision-Date: 2017-02-21 14:18+0100\n" "Last-Translator: Vít Pelčák <[email protected]>\n" "Language-Team: Czech <[email protected]>\n" "Language: cs\n" @@ -23,7 +23,7 @@ #: kpackage/package.cpp:54 #, kde-format msgid "Desktop file that describes this package." -msgstr "" +msgstr "Soubor desktop, který popisuje tento balíček." #: kpackage/packageloader.cpp:70 #, kde-format @@ -181,7 +181,7 @@ #, kde-format msgid "" "Impossible to remove the old installation of %1 located at %2. error: %3" -msgstr "" +msgstr "Není možné odebrat starou instalaci %1 umístěnou v %2. Chyba: %3" #: kpackage/private/packagejobthread.cpp:359 #, kde-format @@ -196,7 +196,7 @@ #: kpackage/private/packagejobthread.cpp:378 #, kde-format msgid "Could not install dependency: '%1'" -msgstr "" +msgstr "Nelze nainstalovat závislost: '%1'" #: kpackage/private/packagejobthread.cpp:390 #, kde-format @@ -509,4 +509,4 @@ #, kde-format msgctxt "Do not translate <path>" msgid "Outputs the metadata for the package <path>" -msgstr "" +msgstr "Zobrazí metadata balíčku <path>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.31.0/po/da/libkpackage5.po new/kpackage-5.32.0/po/da/libkpackage5.po --- old/kpackage-5.31.0/po/da/libkpackage5.po 2017-02-05 12:07:51.000000000 +0100 +++ new/kpackage-5.32.0/po/da/libkpackage5.po 2017-03-04 17:18:07.000000000 +0100 @@ -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. # -# Martin Schlander <[email protected]>, 2014, 2015, 2016. +# Martin Schlander <[email protected]>, 2014, 2015, 2016, 2017. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-02-03 04:08+0100\n" -"PO-Revision-Date: 2016-08-07 14:20+0100\n" +"PO-Revision-Date: 2017-02-25 18:36+0100\n" "Last-Translator: Martin Schlander <[email protected]>\n" "Language-Team: Danish <[email protected]>\n" "Language: da\n" @@ -178,11 +178,10 @@ "installeret." #: kpackage/private/packagejobthread.cpp:355 -#, fuzzy, kde-format -#| msgid "Impossible to remove the old installation of %1 located at %2" +#, kde-format msgid "" "Impossible to remove the old installation of %1 located at %2. error: %3" -msgstr "Kan ikke fjerne den gamle installation af %1 placeret i %2" +msgstr "Kan ikke fjerne den gamle installation af %1 placeret i %2. Fejl: %3" #: kpackage/private/packagejobthread.cpp:359 #, kde-format @@ -195,10 +194,9 @@ msgstr "%1 findes allerede" #: kpackage/private/packagejobthread.cpp:378 -#, fuzzy, kde-format -#| msgid "Could not find requested component: %1" +#, kde-format msgid "Could not install dependency: '%1'" -msgstr "Kunne ikke finde den anmodede komponent: %1" +msgstr "Kunne ikke installere afhængighed: \"%1\"" #: kpackage/private/packagejobthread.cpp:390 #, kde-format @@ -337,7 +335,7 @@ #: kpackagetool/kpackagetool.cpp:461 #, kde-format msgid "%1 has NoDisplay enabled\n" -msgstr "" +msgstr "%1 har NoDisplay aktiveret\n" #: kpackagetool/kpackagetool.cpp:523 #, kde-format @@ -454,6 +452,8 @@ "plugin, e.g. KPackage/Generic, Plasma/Theme, Plasma/Wallpaper, Plasma/" "Applet, etc." msgstr "" +"Type af pakke, som svarer til tjenestetypen for pakke-pluginet, f.eks. " +"KPackage/generisk, Plasma/tema, Plasma/baggrundsbillede, Plasma/applet, osv." #: kpackagetool/main.cpp:64 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.31.0/po/es/libkpackage5.po new/kpackage-5.32.0/po/es/libkpackage5.po --- old/kpackage-5.31.0/po/es/libkpackage5.po 2017-02-05 12:07:51.000000000 +0100 +++ new/kpackage-5.32.0/po/es/libkpackage5.po 2017-03-04 17:18:07.000000000 +0100 @@ -7,8 +7,8 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-02-03 04:08+0100\n" -"PO-Revision-Date: 2017-01-05 19:49+0100\n" -"Last-Translator: Eloy <[email protected]>\n" +"PO-Revision-Date: 2017-02-03 12:38+0100\n" +"Last-Translator: Eloy Cuadra <[email protected]>\n" "Language-Team: Spanish <[email protected]>\n" "Language: es\n" "MIME-Version: 1.0\n" @@ -338,7 +338,7 @@ #: kpackagetool/kpackagetool.cpp:461 #, kde-format msgid "%1 has NoDisplay enabled\n" -msgstr "" +msgstr "%1 tiene activado «NoDisplay»\n" #: kpackagetool/kpackagetool.cpp:523 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.31.0/po/it/libkpackage5.po new/kpackage-5.32.0/po/it/libkpackage5.po --- old/kpackage-5.31.0/po/it/libkpackage5.po 2017-02-05 12:07:51.000000000 +0100 +++ new/kpackage-5.32.0/po/it/libkpackage5.po 2017-03-04 17:18:07.000000000 +0100 @@ -9,7 +9,7 @@ "Project-Id-Version: plasmapkg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-02-03 04:08+0100\n" -"PO-Revision-Date: 2017-01-07 21:03+0100\n" +"PO-Revision-Date: 2017-02-05 09:36+0100\n" "Last-Translator: Vincenzo Reale <[email protected]>\n" "Language-Team: Italian <[email protected]>\n" "Language: it\n" @@ -341,7 +341,7 @@ #: kpackagetool/kpackagetool.cpp:461 #, kde-format msgid "%1 has NoDisplay enabled\n" -msgstr "" +msgstr "%1 ha NoDisplay abilitato\n" #: kpackagetool/kpackagetool.cpp:523 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.31.0/po/nb/libkpackage5.po new/kpackage-5.32.0/po/nb/libkpackage5.po --- old/kpackage-5.31.0/po/nb/libkpackage5.po 2017-02-05 12:07:51.000000000 +0100 +++ new/kpackage-5.32.0/po/nb/libkpackage5.po 2017-03-04 17:18:07.000000000 +0100 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: plasmapkg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-01-10 07:46+0100\n" +"POT-Creation-Date: 2017-02-03 04:08+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" @@ -299,7 +299,7 @@ "Du må enten oppgi «install» (installer), «remove» (fjern), " "«upgrade» (oppgrader) eller «list» (vis oversikt). …" -#: kpackagetool/kpackagetool.cpp:371 kpackagetool/kpackagetool.cpp:443 +#: kpackagetool/kpackagetool.cpp:371 kpackagetool/kpackagetool.cpp:455 #, kde-format msgid "Error: Can't find plugin metadata: %1\n" msgstr "" @@ -334,7 +334,12 @@ msgid " Path : %1" msgstr " Sti : %1" -#: kpackagetool/kpackagetool.cpp:506 +#: kpackagetool/kpackagetool.cpp:461 +#, kde-format +msgid "%1 has NoDisplay enabled\n" +msgstr "" + +#: kpackagetool/kpackagetool.cpp:523 #, kde-format msgctxt "" "The user entered conflicting options packageroot and global, this is the " @@ -346,77 +351,77 @@ "Pakkeroten og globale innstillinger er i konflikt med hverandre, velg bare " "én." -#: kpackagetool/kpackagetool.cpp:534 +#: kpackagetool/kpackagetool.cpp:551 #, kde-format msgid "Addon Name" msgstr "Navn på tillegg" -#: kpackagetool/kpackagetool.cpp:535 +#: kpackagetool/kpackagetool.cpp:552 #, kde-format msgid "Service Type" msgstr "Tjenestetype" -#: kpackagetool/kpackagetool.cpp:536 +#: kpackagetool/kpackagetool.cpp:553 #, kde-format msgid "Path" msgstr "Sti" -#: kpackagetool/kpackagetool.cpp:579 +#: kpackagetool/kpackagetool.cpp:596 #, kde-format msgid "Package types that are installable with this tool:" msgstr "Pakketyper som kan installeres med dette verktøyet:" -#: kpackagetool/kpackagetool.cpp:580 +#: kpackagetool/kpackagetool.cpp:597 #, kde-format msgid "Built in:" msgstr "innebygd:" -#: kpackagetool/kpackagetool.cpp:583 +#: kpackagetool/kpackagetool.cpp:600 #, kde-format msgid "KPackage/Generic" msgstr "KPackage/Generisk" -#: kpackagetool/kpackagetool.cpp:584 +#: kpackagetool/kpackagetool.cpp:601 #, kde-format msgid "KPackage/GenericQML" msgstr "KPackage/GeneriskQML" -#: kpackagetool/kpackagetool.cpp:592 +#: kpackagetool/kpackagetool.cpp:609 #, kde-format msgid "Provided by plugins:" msgstr "Levert av programtillegg:" -#: kpackagetool/kpackagetool.cpp:617 kpackagetool/kpackagetool.cpp:626 +#: kpackagetool/kpackagetool.cpp:634 kpackagetool/kpackagetool.cpp:643 #, kde-format msgid "Generating %1/kpluginindex.json" msgstr "Genererer %1/kpluginindex.json" -#: kpackagetool/kpackagetool.cpp:636 +#: kpackagetool/kpackagetool.cpp:653 #, kde-format msgid "Successfully upgraded %1" msgstr "Vellykket oppgradert %1" -#: kpackagetool/kpackagetool.cpp:638 +#: kpackagetool/kpackagetool.cpp:655 #, kde-format msgid "Successfully installed %1" msgstr "Vellykket installert %1" -#: kpackagetool/kpackagetool.cpp:641 +#: kpackagetool/kpackagetool.cpp:658 #, kde-format msgid "Error: Installation of %1 failed: %2" msgstr "Feil: Installasjon av %1 mislyktes: %2" -#: kpackagetool/kpackagetool.cpp:653 +#: kpackagetool/kpackagetool.cpp:670 #, kde-format msgid "Upgrading package from file: %1" msgstr "Oppgraderer pakke fra fil: %1" -#: kpackagetool/kpackagetool.cpp:658 +#: kpackagetool/kpackagetool.cpp:675 #, kde-format msgid "Successfully uninstalled %1" msgstr "Vellykket avinstallert %1" -#: kpackagetool/kpackagetool.cpp:660 +#: kpackagetool/kpackagetool.cpp:677 #, 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.31.0/po/nn/libkpackage5.po new/kpackage-5.32.0/po/nn/libkpackage5.po --- old/kpackage-5.31.0/po/nn/libkpackage5.po 2017-02-05 12:07:51.000000000 +0100 +++ new/kpackage-5.32.0/po/nn/libkpackage5.po 2017-03-04 17:18:07.000000000 +0100 @@ -1,13 +1,13 @@ # Translation of libkpackage5 to Norwegian Nynorsk # -# Karl Ove Hufthammer <[email protected]>, 2008, 2015, 2016. +# Karl Ove Hufthammer <[email protected]>, 2008, 2015, 2016, 2017. # Eirik U. Birkeland <[email protected]>, 2008, 2009, 2010, 2011. msgid "" msgstr "" "Project-Id-Version: plasmapkg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-02-03 04:08+0100\n" -"PO-Revision-Date: 2016-10-15 09:13+0100\n" +"PO-Revision-Date: 2017-02-22 19:37+0100\n" "Last-Translator: Karl Ove Hufthammer <[email protected]>\n" "Language-Team: Norwegian Nynorsk <[email protected]>\n" "Language: nn\n" @@ -182,6 +182,7 @@ msgid "" "Impossible to remove the old installation of %1 located at %2. error: %3" msgstr "" +"Umogleg å fjerna den gamle installasjonen av %1 frå %2. Feilmelding: %3" #: kpackage/private/packagejobthread.cpp:359 #, kde-format @@ -196,7 +197,7 @@ #: kpackage/private/packagejobthread.cpp:378 #, kde-format msgid "Could not install dependency: '%1'" -msgstr "" +msgstr "Klarte ikkje avhengnad: «%1»" #: kpackage/private/packagejobthread.cpp:390 #, kde-format @@ -337,7 +338,7 @@ #: kpackagetool/kpackagetool.cpp:461 #, kde-format msgid "%1 has NoDisplay enabled\n" -msgstr "" +msgstr "%1 har «NoDisplay» slått på\n" #: kpackagetool/kpackagetool.cpp:523 #, kde-format @@ -379,7 +380,7 @@ #: kpackagetool/kpackagetool.cpp:600 #, kde-format msgid "KPackage/Generic" -msgstr "KPackage/Generic" +msgstr "KPackage/generisk" #: kpackagetool/kpackagetool.cpp:601 #, kde-format @@ -453,6 +454,9 @@ "plugin, e.g. KPackage/Generic, Plasma/Theme, Plasma/Wallpaper, Plasma/" "Applet, etc." msgstr "" +"Pakketypen, som høyrer til tenestetypen for pakke-programtillegget, for " +"eksempel «KPackage/generisk», «Plasma/tema», «Plasma/bakgrunnsbilete» eller " +"«Plasma/skjermelement»." #: kpackagetool/main.cpp:64 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.31.0/po/pl/libkpackage5.po new/kpackage-5.32.0/po/pl/libkpackage5.po --- old/kpackage-5.31.0/po/pl/libkpackage5.po 2017-02-05 12:07:51.000000000 +0100 +++ new/kpackage-5.32.0/po/pl/libkpackage5.po 2017-03-04 17:18:07.000000000 +0100 @@ -7,7 +7,7 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-02-03 04:08+0100\n" -"PO-Revision-Date: 2017-01-22 08:41+0100\n" +"PO-Revision-Date: 2017-02-18 07:19+0100\n" "Last-Translator: Łukasz Wojniłowicz <[email protected]>\n" "Language-Team: Polish <[email protected]>\n" "Language: pl\n" @@ -334,7 +334,7 @@ #: kpackagetool/kpackagetool.cpp:461 #, kde-format msgid "%1 has NoDisplay enabled\n" -msgstr "" +msgstr "%1 ma włączony BezWyświetlacza\n" #: kpackagetool/kpackagetool.cpp:523 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.31.0/po/sl/libkpackage5.po new/kpackage-5.32.0/po/sl/libkpackage5.po --- old/kpackage-5.31.0/po/sl/libkpackage5.po 2017-02-05 12:07:51.000000000 +0100 +++ new/kpackage-5.32.0/po/sl/libkpackage5.po 2017-03-04 17:18:07.000000000 +0100 @@ -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. # -# Andrej Mernik <[email protected]>, 2014, 2015, 2016. +# Andrej Mernik <[email protected]>, 2014, 2015, 2016, 2017. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-02-03 04:08+0100\n" -"PO-Revision-Date: 2016-11-22 21:46+0100\n" +"PO-Revision-Date: 2017-02-12 18:40+0100\n" "Last-Translator: Andrej Mernik <[email protected]>\n" "Language-Team: Slovenian <[email protected]>\n" "Language: sl\n" @@ -16,7 +16,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n" "%100==4 ? 3 : 0);\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 2.0\n" #: kpackage/package.cpp:54 #, kde-format @@ -195,10 +195,9 @@ msgstr "%1 že obstaja" #: kpackage/private/packagejobthread.cpp:378 -#, fuzzy, kde-format -#| msgid "Could not install dependency: %1" +#, kde-format msgid "Could not install dependency: '%1'" -msgstr "Ni bilo mogoče namestiti odvisnosti: %1" +msgstr "Ni bilo mogoče namestiti odvisnosti: »%1«" #: kpackage/private/packagejobthread.cpp:390 #, kde-format @@ -337,7 +336,7 @@ #: kpackagetool/kpackagetool.cpp:461 #, kde-format msgid "%1 has NoDisplay enabled\n" -msgstr "" +msgstr "%1 ima omogočen NoDisplay\n" #: kpackagetool/kpackagetool.cpp:523 #, kde-format @@ -453,6 +452,8 @@ "plugin, e.g. KPackage/Generic, Plasma/Theme, Plasma/Wallpaper, Plasma/" "Applet, etc." msgstr "" +"Vrsta paketa, ki ustreza vrsti storitve vstavka paketa, npr. KPackage/" +"Splošno, Plasma/Tema, Plasma/Ozadje, Plasma/Aplet, itd." #: kpackagetool/main.cpp:64 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.31.0/po/sr/libkpackage5.po new/kpackage-5.32.0/po/sr/libkpackage5.po --- old/kpackage-5.31.0/po/sr/libkpackage5.po 2017-02-05 12:07:51.000000000 +0100 +++ new/kpackage-5.32.0/po/sr/libkpackage5.po 2017-03-04 17:18:07.000000000 +0100 @@ -6,7 +6,7 @@ "Project-Id-Version: libkpackage5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-02-03 04:08+0100\n" -"PO-Revision-Date: 2017-01-06 21:01+0100\n" +"PO-Revision-Date: 2017-02-10 23:07+0100\n" "Last-Translator: Chusslove Illich <[email protected]>\n" "Language-Team: Serbian <[email protected]>\n" "Language: sr\n" @@ -366,7 +366,7 @@ #: kpackagetool/kpackagetool.cpp:461 #, kde-format msgid "%1 has NoDisplay enabled\n" -msgstr "" +msgstr "%1 има активирано NoDisplay\n" #: kpackagetool/kpackagetool.cpp:523 #, kde-format @@ -377,8 +377,7 @@ "The packageroot and global options conflict with each other, please select " "only one." msgstr "" -"Опције <icode>packageroot</icode> и <icode>global</icode> искључују једна " -"другу, задајте само једну од њих." +"Опције packageroot и global искључују једна другу, задајте само једну од њих." # >> @title:column #: kpackagetool/kpackagetool.cpp:551 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.31.0/po/sr@ijekavian/libkpackage5.po new/kpackage-5.32.0/po/sr@ijekavian/libkpackage5.po --- old/kpackage-5.31.0/po/sr@ijekavian/libkpackage5.po 2017-02-05 12:07:51.000000000 +0100 +++ new/kpackage-5.32.0/po/sr@ijekavian/libkpackage5.po 2017-03-04 17:18:07.000000000 +0100 @@ -6,7 +6,7 @@ "Project-Id-Version: libkpackage5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-02-03 04:08+0100\n" -"PO-Revision-Date: 2017-01-06 21:01+0100\n" +"PO-Revision-Date: 2017-02-10 23:07+0100\n" "Last-Translator: Chusslove Illich <[email protected]>\n" "Language-Team: Serbian <[email protected]>\n" "Language: sr@ijekavian\n" @@ -366,7 +366,7 @@ #: kpackagetool/kpackagetool.cpp:461 #, kde-format msgid "%1 has NoDisplay enabled\n" -msgstr "" +msgstr "%1 има активирано NoDisplay\n" #: kpackagetool/kpackagetool.cpp:523 #, kde-format @@ -377,8 +377,7 @@ "The packageroot and global options conflict with each other, please select " "only one." msgstr "" -"Опције <icode>packageroot</icode> и <icode>global</icode> искључују једна " -"другу, задајте само једну од њих." +"Опције packageroot и global искључују једна другу, задајте само једну од њих." # >> @title:column #: kpackagetool/kpackagetool.cpp:551 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.31.0/po/sr@ijekavianlatin/libkpackage5.po new/kpackage-5.32.0/po/sr@ijekavianlatin/libkpackage5.po --- old/kpackage-5.31.0/po/sr@ijekavianlatin/libkpackage5.po 2017-02-05 12:07:51.000000000 +0100 +++ new/kpackage-5.32.0/po/sr@ijekavianlatin/libkpackage5.po 2017-03-04 17:18:07.000000000 +0100 @@ -6,7 +6,7 @@ "Project-Id-Version: libkpackage5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-02-03 04:08+0100\n" -"PO-Revision-Date: 2017-01-06 21:01+0100\n" +"PO-Revision-Date: 2017-02-10 23:07+0100\n" "Last-Translator: Chusslove Illich <[email protected]>\n" "Language-Team: Serbian <[email protected]>\n" "Language: sr@ijekavianlatin\n" @@ -366,7 +366,7 @@ #: kpackagetool/kpackagetool.cpp:461 #, kde-format msgid "%1 has NoDisplay enabled\n" -msgstr "" +msgstr "%1 ima aktivirano NoDisplay\n" #: kpackagetool/kpackagetool.cpp:523 #, kde-format @@ -377,8 +377,8 @@ "The packageroot and global options conflict with each other, please select " "only one." msgstr "" -"Opcije <icode>packageroot</icode> i <icode>global</icode> isključuju jedna " -"drugu, zadajte samo jednu od njih." +"Opcije packageroot i global isključuju jedna drugu, zadajte samo jednu od " +"njih." # >> @title:column #: kpackagetool/kpackagetool.cpp:551 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.31.0/po/sr@latin/libkpackage5.po new/kpackage-5.32.0/po/sr@latin/libkpackage5.po --- old/kpackage-5.31.0/po/sr@latin/libkpackage5.po 2017-02-05 12:07:51.000000000 +0100 +++ new/kpackage-5.32.0/po/sr@latin/libkpackage5.po 2017-03-04 17:18:07.000000000 +0100 @@ -6,7 +6,7 @@ "Project-Id-Version: libkpackage5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-02-03 04:08+0100\n" -"PO-Revision-Date: 2017-01-06 21:01+0100\n" +"PO-Revision-Date: 2017-02-10 23:07+0100\n" "Last-Translator: Chusslove Illich <[email protected]>\n" "Language-Team: Serbian <[email protected]>\n" "Language: sr@latin\n" @@ -366,7 +366,7 @@ #: kpackagetool/kpackagetool.cpp:461 #, kde-format msgid "%1 has NoDisplay enabled\n" -msgstr "" +msgstr "%1 ima aktivirano NoDisplay\n" #: kpackagetool/kpackagetool.cpp:523 #, kde-format @@ -377,8 +377,8 @@ "The packageroot and global options conflict with each other, please select " "only one." msgstr "" -"Opcije <icode>packageroot</icode> i <icode>global</icode> isključuju jedna " -"drugu, zadajte samo jednu od njih." +"Opcije packageroot i global isključuju jedna drugu, zadajte samo jednu od " +"njih." # >> @title:column #: kpackagetool/kpackagetool.cpp:551 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpackage-5.31.0/src/kpackage/package.cpp new/kpackage-5.32.0/src/kpackage/package.cpp --- old/kpackage-5.31.0/src/kpackage/package.cpp 2017-02-05 12:07:51.000000000 +0100 +++ new/kpackage-5.32.0/src/kpackage/package.cpp 2017-03-04 17:18:07.000000000 +0100 @@ -296,10 +296,22 @@ // make sure that the base path is also canonical // this was not the case until 5.8, making this check fail e.g. if /home is a symlink // which in turn would make plasmashell not find the .qml files - Q_ASSERT(QDir(path).exists()); - Q_ASSERT(path == QStringLiteral("/") || QDir(path).canonicalPath() + '/' == path); - if (canonicalPath.startsWith(path)) { - return true; + //installed package + if (tempRoot.isEmpty()) { + Q_ASSERT(QDir(path).exists()); + Q_ASSERT(path == QStringLiteral("/") || QDir(path).canonicalPath() + '/' == path); + + if (canonicalPath.startsWith(path)) { + return true; + } + //temporary compressed package + } else { + Q_ASSERT(QDir(tempRoot).exists()); + Q_ASSERT(tempRoot == QStringLiteral("/") || QDir(tempRoot).canonicalPath() + '/' == tempRoot); + + if (canonicalPath.startsWith(tempRoot)) { + return true; + } } qWarning() << "Path traversal attempt detected:" << canonicalPath << "is not inside" << path; return false; @@ -347,7 +359,14 @@ //Nested loop, but in the medium case resolves to just one iteration //qDebug() << "prefixes:" << prefixes.count() << prefixes; foreach (const QString &contentsPrefix, d->contentsPrefixPaths) { - const QString prefix = fileType == "metadata" ? d->path : (d->path + contentsPrefix); + QString prefix; + //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 + } else { + prefix = fileType == "metadata" ? d->tempRoot : (d->tempRoot + contentsPrefix); + } foreach (const QString &path, paths) { QString file = prefix + path;
