Hello community, here is the log from the commit of package kcoreaddons for openSUSE:Factory checked in at 2017-09-19 16:22:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcoreaddons (Old) and /work/SRC/openSUSE:Factory/.kcoreaddons.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kcoreaddons" Tue Sep 19 16:22:39 2017 rev:48 rq:526633 version:5.38.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kcoreaddons/kcoreaddons.changes 2017-08-24 17:55:50.451337127 +0200 +++ /work/SRC/openSUSE:Factory/.kcoreaddons.new/kcoreaddons.changes 2017-09-19 16:22:41.273321211 +0200 @@ -1,0 +2,13 @@ +Tue Sep 12 07:11:16 CEST 2017 - [email protected] + +- Update to 5.38.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.38.0.php +- Changes since 5.37.0: + * DesktopFileParser: add fallback lookup in ":/kservicetypes5/*" + * Add support for uninstalled plugins in kcoreaddons_add_plugin + * Do not leak symbols of pimpl classes, protect with Q_DECL_HIDDEN + * desktopfileparser: Fix non-compliant key/value parsing. (kde#310674) + +------------------------------------------------------------------- Old: ---- kcoreaddons-5.37.0.tar.xz New: ---- kcoreaddons-5.38.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcoreaddons.spec ++++++ --- /var/tmp/diff_new_pack.RGJe5e/_old 2017-09-19 16:22:42.017216360 +0200 +++ /var/tmp/diff_new_pack.RGJe5e/_new 2017-09-19 16:22:42.021215796 +0200 @@ -18,9 +18,13 @@ %bcond_without lang %define lname libKF5CoreAddons5 -%define _tar_path 5.37 +%define _tar_path 5.38 +# 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: kcoreaddons -Version: 5.37.0 +Version: 5.38.0 Release: 0 BuildRequires: cmake >= 3.0 BuildRequires: extra-cmake-modules >= %{_tar_path} ++++++ kcoreaddons-5.37.0.tar.xz -> kcoreaddons-5.38.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.37.0/CMakeLists.txt new/kcoreaddons-5.38.0/CMakeLists.txt --- old/kcoreaddons-5.37.0/CMakeLists.txt 2017-08-06 19:58:54.000000000 +0200 +++ new/kcoreaddons-5.38.0/CMakeLists.txt 2017-09-03 10:02:31.000000000 +0200 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.37.0") # handled by release scripts +set(KF5_VERSION "5.38.0") # handled by release scripts project(KCoreAddons VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.37.0 NO_MODULE) +find_package(ECM 5.38.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/kcoreaddons-5.37.0/KF5CoreAddonsMacros.cmake new/kcoreaddons-5.38.0/KF5CoreAddonsMacros.cmake --- old/kcoreaddons-5.37.0/KF5CoreAddonsMacros.cmake 2017-08-06 19:58:54.000000000 +0200 +++ new/kcoreaddons-5.38.0/KF5CoreAddonsMacros.cmake 2017-09-03 10:02:31.000000000 +0200 @@ -138,6 +138,11 @@ add_library(${plugin} MODULE ${KCA_ADD_PLUGIN_SOURCES}) set_property(TARGET ${plugin} APPEND PROPERTY AUTOGEN_TARGET_DEPENDS ${json}) + # If find_package(ECM 5.38) or higher is called, output the plugin in a INSTALL_NAMESPACE subfolder. + # See https://community.kde.org/Guidelines_and_HOWTOs/Making_apps_run_uninstalled + if(NOT ("${ECM_GLOBAL_FIND_VERSION}" VERSION_LESS "5.38.0")) + set_target_properties(${plugin} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${KCA_ADD_PLUGIN_INSTALL_NAMESPACE}") + endif() if (NOT KCA_ADD_PLUGIN_INSTALL_NAMESPACE) message(FATAL_ERROR "Must specify INSTALL_NAMESPACE for ${plugin}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.37.0/autotests/desktoptojsontest.cpp new/kcoreaddons-5.38.0/autotests/desktoptojsontest.cpp --- old/kcoreaddons-5.37.0/autotests/desktoptojsontest.cpp 2017-08-06 19:58:54.000000000 +0200 +++ new/kcoreaddons-5.38.0/autotests/desktoptojsontest.cpp 2017-09-03 10:02:31.000000000 +0200 @@ -163,7 +163,7 @@ // test conversion of a currently existing .desktop file (excluding most of the translations): QByteArray kdevInput = "[Desktop Entry]\n" - "Type=Service\n" + "Type = Service\n" "Icon=text-x-c++src\n" "Exec=blubb\n" "Comment=C/C++ Language Support\n" @@ -276,7 +276,7 @@ // test conversion of kcookiejar.desktop (for some reason the wrong boolean values were committed) QByteArray kcookiejarInput = "[Desktop Entry]\n" - "Type=Service\n" + "Type= Service\n" "Name=Cookie Jar\n" "Comment=Stores network cookies\n" "X-KDE-ServiceTypes=KDEDModule\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.37.0/po/ca/kcoreaddons5_qt.po new/kcoreaddons-5.38.0/po/ca/kcoreaddons5_qt.po --- old/kcoreaddons-5.37.0/po/ca/kcoreaddons5_qt.po 2017-08-06 19:58:54.000000000 +0200 +++ new/kcoreaddons-5.38.0/po/ca/kcoreaddons5_qt.po 2017-09-03 10:02:31.000000000 +0200 @@ -4,7 +4,7 @@ # version 3 or later versions approved by the membership of KDE e.V. # # Sebastià Pla i Sanz <[email protected]>, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007. -# Antoni Bella Pérez <[email protected]>, 2003, 2006, 2011, 2012, 2013, 2014. +# Antoni Bella Pérez <[email protected]>, 2003, 2006, 2011, 2012, 2013, 2014, 2017. # Albert Astals Cid <[email protected]>, 2004, 2005, 2007. # Josep Ma. Ferrer <[email protected]>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017. # Robert Millan <[email protected]>, 2009. @@ -14,14 +14,14 @@ "Project-Id-Version: kcoreaddons5_qt\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-03-23 01:50+0000\n" -"PO-Revision-Date: 2017-01-17 22:54+0100\n" -"Last-Translator: Josep Ma. Ferrer <[email protected]>\n" +"PO-Revision-Date: 2017-08-12 19:21+0100\n" +"Last-Translator: Antoni Bella Pérez <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" "Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 2.0\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: &\n" "X-Qt-Contexts: true\n" @@ -182,7 +182,7 @@ #: lib/kaboutdata.cpp:1171 msgctxt "KAboutData CLI|" msgid "Please use http://bugs.kde.org to report bugs." -msgstr "Si us plau, useu http://bugs.kde.org per a informar d'errors." +msgstr "Si us plau, useu http://bugs.kde.org per a informar dels errors." #: lib/kaboutdata.cpp:1173 #, qt-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.37.0/po/ca@valencia/kcoreaddons5_qt.po new/kcoreaddons-5.38.0/po/ca@valencia/kcoreaddons5_qt.po --- old/kcoreaddons-5.37.0/po/ca@valencia/kcoreaddons5_qt.po 2017-08-06 19:58:54.000000000 +0200 +++ new/kcoreaddons-5.38.0/po/ca@valencia/kcoreaddons5_qt.po 2017-09-03 10:02:31.000000000 +0200 @@ -4,7 +4,7 @@ # version 3 or later versions approved by the membership of KDE e.V. # # Sebastià Pla i Sanz <[email protected]>, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007. -# Antoni Bella Pérez <[email protected]>, 2003, 2006, 2011, 2012, 2013, 2014. +# Antoni Bella Pérez <[email protected]>, 2003, 2006, 2011, 2012, 2013, 2014, 2017. # Albert Astals Cid <[email protected]>, 2004, 2005, 2007. # Josep Ma. Ferrer <[email protected]>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017. # Robert Millan <[email protected]>, 2009. @@ -14,14 +14,14 @@ "Project-Id-Version: kcoreaddons5_qt\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-03-23 01:50+0000\n" -"PO-Revision-Date: 2017-01-17 22:54+0100\n" -"Last-Translator: Josep Ma. Ferrer <[email protected]>\n" +"PO-Revision-Date: 2017-08-12 19:21+0100\n" +"Last-Translator: Antoni Bella Pérez <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" "Language: ca@valencia\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 2.0\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: &\n" "X-Qt-Contexts: true\n" @@ -182,7 +182,7 @@ #: lib/kaboutdata.cpp:1171 msgctxt "KAboutData CLI|" msgid "Please use http://bugs.kde.org to report bugs." -msgstr "Per favor, useu http://bugs.kde.org per a informar d'errors." +msgstr "Per favor, useu http://bugs.kde.org per a informar dels errors." #: lib/kaboutdata.cpp:1173 #, qt-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.37.0/po/eu/kcoreaddons5_qt.po new/kcoreaddons-5.38.0/po/eu/kcoreaddons5_qt.po --- old/kcoreaddons-5.37.0/po/eu/kcoreaddons5_qt.po 2017-08-06 19:58:54.000000000 +0200 +++ new/kcoreaddons-5.38.0/po/eu/kcoreaddons5_qt.po 2017-09-03 10:02:31.000000000 +0200 @@ -1,203 +1,147 @@ -# translation of kdelibs4.po to Euskara/Basque (eu) -# KDE: EUSKERA TRANSLATION -# Copyright (C) 1999,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011, Free Software Foundation, Inc. +# Translation of kcoreaddons5_qt.po to Euskara/Basque (eu) +# Copyright (C) 1999-2017, Free Software Foundation, Inc. +# This file is distributed under the same license as the frameworks package. +# KDE Euskarateko proiektuaren arduraduna <[email protected]>. # -# Marcos <[email protected]>, 2002,2003, 2004, 2005. +# Translators: +# Marcos <[email protected]>, 2002,2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010. # Ion Gaztañaga <[email protected]>, 2005. -# marcos <[email protected]>, 2006, 2007, 2008, 2009, 2010. # Iñaki Larrañaga Murgoitio <[email protected]>, 2009. -# Iñigo Salvador Azurmendi <[email protected]>, 2010, 2011, 2012, 2013, 2014. +# Iñigo Salvador Azurmendi <[email protected]>, 2010, 2011, 2012, 2013, 2014, 2017. msgid "" msgstr "" -"Project-Id-Version: kdelibs4\n" +"Project-Id-Version: kcoreaddons5_qt\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-03-23 01:50+0000\n" -"PO-Revision-Date: 2014-03-02 19:49+0100\n" +"PO-Revision-Date: 2017-08-19 20:48+0100\n" "Last-Translator: Iñigo Salvador Azurmendi <[email protected]>\n" "Language-Team: Basque <[email protected]>\n" "Language: eu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 2.0\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Qt-Contexts: true\n" #: lib/kaboutdata.cpp:291 -#, fuzzy -#| msgid "" -#| "No licensing terms for this program have been specified.\n" -#| "Please check the documentation or the source for any\n" -#| "licensing terms.\n" msgctxt "KAboutLicense|" msgid "" "No licensing terms for this program have been specified.\n" "Please check the documentation or the source for any\n" "licensing terms.\n" msgstr "" -"Programa honek ez du lizentziarik zehaztuta.\n" -"Irakurri iturburua edo dokumentazioa\n" -"lizentziaren bat duen egiaztatzeko.\n" +"Programa honentzako ez da lizentzia baldintzarik zehaztu.\n" +"Aztertu dokumentazioa edo iturburua lizentzia baldintza\n" +"bila.\n" #: lib/kaboutdata.cpp:301 -#, fuzzy, qt-format -#| msgid "This program is distributed under the terms of the %1." +#, qt-format msgctxt "KAboutLicense|" msgid "This program is distributed under the terms of the %1." -msgstr "Programa hau %1 lizentzia pean banatzen da." +msgstr "Programa hau %1 lizentziapean banatzen da." #: lib/kaboutdata.cpp:347 -#, fuzzy -#| msgctxt "@item license (short name)" -#| msgid "GPL v2" msgctxt "KAboutLicense|@item license (short name)" msgid "GPL v2" msgstr "GPL v2" #: lib/kaboutdata.cpp:348 -#, fuzzy -#| msgctxt "@item license" -#| msgid "GNU General Public License Version 2" msgctxt "KAboutLicense|@item license" msgid "GNU General Public License Version 2" -msgstr "GNU General Public License Version 2" +msgstr "" +"GNU General Public License Version 2 - GNUren Lizentzia Publiko Orokorraren " +"2. bertsioa" #: lib/kaboutdata.cpp:351 -#, fuzzy -#| msgctxt "@item license (short name)" -#| msgid "LGPL v2" msgctxt "KAboutLicense|@item license (short name)" msgid "LGPL v2" msgstr "LGPL v2" #: lib/kaboutdata.cpp:352 -#, fuzzy -#| msgctxt "@item license" -#| msgid "GNU Lesser General Public License Version 2" msgctxt "KAboutLicense|@item license" msgid "GNU Lesser General Public License Version 2" -msgstr "GNU Lesser General Public License Version 2" +msgstr "" +"GNU Lesser General Public License Version 2 - GNUren Lizentzia Publiko Ez " +"hain Orokorraren 2. bertsioa" #: lib/kaboutdata.cpp:355 -#, fuzzy -#| msgctxt "@item license (short name)" -#| msgid "BSD License" msgctxt "KAboutLicense|@item license (short name)" msgid "BSD License" msgstr "BSD lizentzia" #: lib/kaboutdata.cpp:356 -#, fuzzy -#| msgctxt "@item license (short name)" -#| msgid "BSD License" msgctxt "KAboutLicense|@item license" msgid "BSD License" msgstr "BSD lizentzia" #: lib/kaboutdata.cpp:359 -#, fuzzy -#| msgctxt "@item license" -#| msgid "Artistic License" msgctxt "KAboutLicense|@item license (short name)" msgid "Artistic License" -msgstr "Lizentzia artistikoa" +msgstr "Artistic License - Lizentzia Artistikoa" #: lib/kaboutdata.cpp:360 -#, fuzzy -#| msgctxt "@item license" -#| msgid "Artistic License" msgctxt "KAboutLicense|@item license" msgid "Artistic License" -msgstr "Lizentzia artistikoa" +msgstr "Artistic License - Lizentzia Artistikoa" #: lib/kaboutdata.cpp:363 -#, fuzzy -#| msgctxt "@item license (short name)" -#| msgid "QPL v1.0" msgctxt "KAboutLicense|@item license (short name)" msgid "QPL v1.0" msgstr "QPL v1.0" #: lib/kaboutdata.cpp:364 -#, fuzzy -#| msgctxt "@item license" -#| msgid "Q Public License" msgctxt "KAboutLicense|@item license" msgid "Q Public License" -msgstr "Q lizentzia publikoa" +msgstr "Q Public License - Q lizentzia publikoa" #: lib/kaboutdata.cpp:367 -#, fuzzy -#| msgctxt "@item license (short name)" -#| msgid "GPL v3" msgctxt "KAboutLicense|@item license (short name)" msgid "GPL v3" msgstr "GPL v3" #: lib/kaboutdata.cpp:368 -#, fuzzy -#| msgctxt "@item license" -#| msgid "GNU General Public License Version 3" msgctxt "KAboutLicense|@item license" msgid "GNU General Public License Version 3" -msgstr "GNU General Public License Version 3" +msgstr "" +"GNU General Public License Version 3 - GNUren Lizentzia Publiko Orokorraren " +"3. bertsioa" #: lib/kaboutdata.cpp:371 -#, fuzzy -#| msgctxt "@item license (short name)" -#| msgid "LGPL v3" msgctxt "KAboutLicense|@item license (short name)" msgid "LGPL v3" msgstr "LGPL v3" #: lib/kaboutdata.cpp:372 -#, fuzzy -#| msgctxt "@item license" -#| msgid "GNU Lesser General Public License Version 3" msgctxt "KAboutLicense|@item license" msgid "GNU Lesser General Public License Version 3" -msgstr "GNU Lesser General Public License Version 3" +msgstr "" +"GNU Lesser General Public License Version 3 - GNUren Lizentzia Publiko Ez " +"hain Orokorraren 3. bertsioa" #: lib/kaboutdata.cpp:375 -#, fuzzy -#| msgctxt "@item license (short name)" -#| msgid "LGPL v2" msgctxt "KAboutLicense|@item license (short name)" msgid "LGPL v2.1" -msgstr "LGPL v2" +msgstr "LGPL v2.1" #: lib/kaboutdata.cpp:376 -#, fuzzy -#| msgctxt "@item license" -#| msgid "GNU Lesser General Public License Version 2" msgctxt "KAboutLicense|@item license" msgid "GNU Lesser General Public License Version 2.1" -msgstr "GNU Lesser General Public License Version 2" +msgstr "" +"GNU Lesser General Public License Version 2.1 - GNUren Lizentzia Publiko Ez " +"hain Orokorraren 2.1 bertsioa" #: lib/kaboutdata.cpp:380 -#, fuzzy -#| msgctxt "@item license" -#| msgid "Custom" msgctxt "KAboutLicense|@item license" msgid "Custom" msgstr "Pertsonalizatua" #: lib/kaboutdata.cpp:383 -#, fuzzy -#| msgctxt "@item license" -#| msgid "Not specified" msgctxt "KAboutLicense|@item license" msgid "Not specified" -msgstr "Ez da adierazten" +msgstr "Zehaztu gabe" #: lib/kaboutdata.cpp:918 -#, fuzzy -#| msgctxt "replace this with information about your translation team" -#| msgid "" -#| "<p>KDE is translated into many languages thanks to the work of the " -#| "translation teams all over the world.</p><p>For more information on KDE " -#| "internationalization visit <a href=\"http://l10n.kde.org\";>http://l10n."; -#| "kde.org</a></p>" msgctxt "KAboutData|replace this with information about your translation team" msgid "" "<p>KDE is translated into many languages thanks to the work of the " @@ -205,317 +149,247 @@ "internationalization visit <a href=\"http://l10n.kde.org\";>http://l10n.kde."; "org</a></p>" msgstr "" -"<p>KDE mahaigaina hainbat hizkuntzatara itzuli da, mundu osoko itzulpen-" -"taldeen laguntzaz.</p><p>KDEren internazionalizazioari buruz gehiago " -"jakiteko zoaz <a href=\"http://l10n.kde.org\";>http://l10n.kde.org</a>-era</p>" +"<p>KDE hizkuntza askotara itzuli da mundu osoko itzulpen-taldeen laguntzari " +"esker.</p><p>KDEren nazioartekotzeari buruz gehiago jakiteko bisitatu <a " +"href=\"http://l10n.kde.org\";>http://l10n.kde.org</a></p> <p>KDE Euskaratzeko " +"proiektuaren inguruko informazioa eskuratuko duzu <a href=\"https://l10n.kde."; +"org/team-infos.php?teamcode=eu\">hemen</a>. Etorkizun hurbilean informazioa " +"hobetzea gure asmoen artean dago.</p> " #: lib/kaboutdata.cpp:1145 -#, fuzzy -#| msgid "Show author information" msgctxt "KAboutData CLI|" msgid "Show author information." -msgstr "Erakutsi egilearen informazioa" +msgstr "Erakutsi egileari buruzko informazioa." #: lib/kaboutdata.cpp:1146 -#, fuzzy -#| msgid "Show license information" msgctxt "KAboutData CLI|" msgid "Show license information." -msgstr "Erakutsi lizentziaren informazioa" +msgstr "Erakutsi lizentziari buruzko informazioa." #: lib/kaboutdata.cpp:1148 msgctxt "KAboutData CLI|" msgid "The base file name of the desktop entry for this application." -msgstr "" +msgstr "Aplikazio honentzako mahaigain-sarreraren oinarri fitxategi-izena." #: lib/kaboutdata.cpp:1149 msgctxt "KAboutData CLI|" msgid "file name" -msgstr "" +msgstr "Fitxategi-izena" #: lib/kaboutdata.cpp:1158 -#, fuzzy -#| msgid "" -#| "This application was written by somebody who wants to remain anonymous." msgctxt "KAboutData CLI|" msgid "This application was written by somebody who wants to remain anonymous." msgstr "" -"Aplikazioa bere burua anonimo gisa mantendu nahi duen batek idatzi zuen." +"Aplikazio hau bere burua anonimo gisa mantendu nahi duen batek idatzi zuen." #: lib/kaboutdata.cpp:1160 -#, fuzzy, qt-format -#| msgctxt "the 2nd argument is a list of name+address, one on each line" -#| msgid "" -#| "%1 was written by\n" -#| "%2" +#, qt-format msgctxt "KAboutData CLI|" msgid "%1 was written by:" -msgstr "" -"%1\n" -"%2(e)k idatzi du" +msgstr "%1 honek idatzi zuen:" #: lib/kaboutdata.cpp:1171 -#, fuzzy -#| msgid "Please use http://bugs.kde.org to report bugs.\n" msgctxt "KAboutData CLI|" msgid "Please use http://bugs.kde.org to report bugs." -msgstr "" -"Erabili http://bugs.kde.org erroreen berri emateko, ez bidali mezurik " -"zuzenean egileei.\n" +msgstr "Erabili http://bugs.kde.org akatsen berri emateko." #: lib/kaboutdata.cpp:1173 -#, fuzzy, qt-format -#| msgid "Please report bugs to %1.\n" +#, qt-format msgctxt "KAboutData CLI|" msgid "Please report bugs to %1." -msgstr "Bidali errorearen berri %1(e)ra.\n" +msgstr "Akatsen berri eman %1(e)ra." #: lib/plugin/kpluginloader.cpp:122 -#, fuzzy, qt-format -#| msgid "The library %1 does not offer a KDE 4 compatible factory." +#, qt-format msgctxt "KPluginLoader|" msgid "The library %1 does not offer a KPluginFactory." -msgstr "%1 liburutegiak ez du KDE 4.rekin bateragarria den faktoriarik." +msgstr "%1 liburutegiak ez du KPluginFactory bat eskaintzen." #. MetricBinaryDialect size in bytes #: lib/util/kformatprivate.cpp:88 -#, fuzzy, qt-format -#| msgctxt "size in bytes" -#| msgid "%1 B" +#, qt-format msgctxt "KFormat|MetricBinaryDialect" msgid "%1 B" msgstr "%1 B" #. MetricBinaryDialect size in 1000 bytes #: lib/util/kformatprivate.cpp:91 -#, fuzzy, qt-format -#| msgctxt "size in 1000 bytes" -#| msgid "%1 kB" +#, qt-format msgctxt "KFormat|MetricBinaryDialect" msgid "%1 kB" msgstr "%1 kB" #. MetricBinaryDialect size in 10^6 bytes #: lib/util/kformatprivate.cpp:94 -#, fuzzy, qt-format -#| msgctxt "size in 10^6 bytes" -#| msgid "%1 MB" +#, qt-format msgctxt "KFormat|MetricBinaryDialect" msgid "%1 MB" msgstr "%1 MB" #. MetricBinaryDialect size in 10^9 bytes #: lib/util/kformatprivate.cpp:97 -#, fuzzy, qt-format -#| msgctxt "size in 10^9 bytes" -#| msgid "%1 GB" +#, qt-format msgctxt "KFormat|MetricBinaryDialect" msgid "%1 GB" msgstr "%1 GB" #. MetricBinaryDialect size in 10^12 bytes #: lib/util/kformatprivate.cpp:100 -#, fuzzy, qt-format -#| msgctxt "size in 10^12 bytes" -#| msgid "%1 TB" +#, qt-format msgctxt "KFormat|MetricBinaryDialect" msgid "%1 TB" msgstr "%1 TB" #. MetricBinaryDialect size in 10^15 bytes #: lib/util/kformatprivate.cpp:103 -#, fuzzy, qt-format -#| msgctxt "size in 10^15 bytes" -#| msgid "%1 PB" +#, qt-format msgctxt "KFormat|MetricBinaryDialect" msgid "%1 PB" msgstr "%1 PB" #. MetricBinaryDialect size in 10^18 byte #: lib/util/kformatprivate.cpp:106 -#, fuzzy, qt-format -#| msgctxt "size in 10^18 bytes" -#| msgid "%1 EB" +#, qt-format msgctxt "KFormat|MetricBinaryDialect" msgid "%1 EB" msgstr "%1 EB" #. MetricBinaryDialect size in 10^21 bytes #: lib/util/kformatprivate.cpp:109 -#, fuzzy, qt-format -#| msgctxt "size in 10^21 bytes" -#| msgid "%1 ZB" +#, qt-format msgctxt "KFormat|MetricBinaryDialect" msgid "%1 ZB" msgstr "%1 ZB" #. MetricBinaryDialect size in 10^24 bytes #: lib/util/kformatprivate.cpp:112 -#, fuzzy, qt-format -#| msgctxt "size in 10^24 bytes" -#| msgid "%1 YB" +#, qt-format msgctxt "KFormat|MetricBinaryDialect" msgid "%1 YB" msgstr "%1 YB" #. JEDECBinaryDialect memory size in bytes #: lib/util/kformatprivate.cpp:118 -#, fuzzy, qt-format -#| msgctxt "size in bytes" -#| msgid "%1 B" +#, qt-format msgctxt "KFormat|JEDECBinaryDialect" msgid "%1 B" msgstr "%1 B" #. JEDECBinaryDialect memory size in 1024 bytes #: lib/util/kformatprivate.cpp:121 -#, fuzzy, qt-format -#| msgctxt "memory size in 1024 bytes" -#| msgid "%1 KB" +#, qt-format msgctxt "KFormat|JEDECBinaryDialect" msgid "%1 KB" msgstr "%1 KB" #. JEDECBinaryDialect memory size in 10^20 bytes #: lib/util/kformatprivate.cpp:124 -#, fuzzy, qt-format -#| msgctxt "size in 10^6 bytes" -#| msgid "%1 MB" +#, qt-format msgctxt "KFormat|JEDECBinaryDialect" msgid "%1 MB" msgstr "%1 MB" #. JEDECBinaryDialect memory size in 10^30 bytes #: lib/util/kformatprivate.cpp:127 -#, fuzzy, qt-format -#| msgctxt "size in 10^9 bytes" -#| msgid "%1 GB" +#, qt-format msgctxt "KFormat|JEDECBinaryDialect" msgid "%1 GB" msgstr "%1 GB" #. JEDECBinaryDialect memory size in 10^40 bytes #: lib/util/kformatprivate.cpp:130 -#, fuzzy, qt-format -#| msgctxt "size in 10^12 bytes" -#| msgid "%1 TB" +#, qt-format msgctxt "KFormat|JEDECBinaryDialect" msgid "%1 TB" msgstr "%1 TB" #. JEDECBinaryDialect memory size in 10^50 bytes #: lib/util/kformatprivate.cpp:133 -#, fuzzy, qt-format -#| msgctxt "size in 10^15 bytes" -#| msgid "%1 PB" +#, qt-format msgctxt "KFormat|JEDECBinaryDialect" msgid "%1 PB" msgstr "%1 PB" #. JEDECBinaryDialect memory size in 10^60 bytes #: lib/util/kformatprivate.cpp:136 -#, fuzzy, qt-format -#| msgctxt "size in 10^18 bytes" -#| msgid "%1 EB" +#, qt-format msgctxt "KFormat|JEDECBinaryDialect" msgid "%1 EB" msgstr "%1 EB" #. JEDECBinaryDialect memory size in 10^70 bytes #: lib/util/kformatprivate.cpp:139 -#, fuzzy, qt-format -#| msgctxt "size in 10^21 bytes" -#| msgid "%1 ZB" +#, qt-format msgctxt "KFormat|JEDECBinaryDialect" msgid "%1 ZB" msgstr "%1 ZB" #. JEDECBinaryDialect memory size in 10^80 bytes #: lib/util/kformatprivate.cpp:142 -#, fuzzy, qt-format -#| msgctxt "size in 10^24 bytes" -#| msgid "%1 YB" +#, qt-format msgctxt "KFormat|JEDECBinaryDialect" msgid "%1 YB" msgstr "%1 YB" #. IECBinaryDialect size in bytes #: lib/util/kformatprivate.cpp:148 -#, fuzzy, qt-format -#| msgctxt "size in bytes" -#| msgid "%1 B" +#, qt-format msgctxt "KFormat|IECBinaryDialect" msgid "%1 B" msgstr "%1 B" #. IECBinaryDialect size in 1024 bytes #: lib/util/kformatprivate.cpp:151 -#, fuzzy, qt-format -#| msgctxt "size in 1024 bytes" -#| msgid "%1 KiB" +#, qt-format msgctxt "KFormat|IECBinaryDialect" msgid "%1 KiB" msgstr "%1 KiB" #. IECBinaryDialect size in 10^20 bytes #: lib/util/kformatprivate.cpp:154 -#, fuzzy, qt-format -#| msgctxt "size in 2^20 bytes" -#| msgid "%1 MiB" +#, qt-format msgctxt "KFormat|IECBinaryDialect" msgid "%1 MiB" msgstr "%1 MiB" #. IECBinaryDialect size in 10^30 bytes #: lib/util/kformatprivate.cpp:157 -#, fuzzy, qt-format -#| msgctxt "size in 2^30 bytes" -#| msgid "%1 GiB" +#, qt-format msgctxt "KFormat|IECBinaryDialect" msgid "%1 GiB" msgstr "%1 GiB" #. IECBinaryDialect size in 10^40 bytes #: lib/util/kformatprivate.cpp:160 -#, fuzzy, qt-format -#| msgctxt "size in 2^40 bytes" -#| msgid "%1 TiB" +#, qt-format msgctxt "KFormat|IECBinaryDialect" msgid "%1 TiB" msgstr "%1 TiB" #. IECBinaryDialect size in 10^50 bytes #: lib/util/kformatprivate.cpp:163 -#, fuzzy, qt-format -#| msgctxt "size in 2^50 bytes" -#| msgid "%1 PiB" +#, qt-format msgctxt "KFormat|IECBinaryDialect" msgid "%1 PiB" msgstr "%1 PiB" #. IECBinaryDialect size in 10^60 bytes #: lib/util/kformatprivate.cpp:166 -#, fuzzy, qt-format -#| msgctxt "size in 2^60 bytes" -#| msgid "%1 EiB" +#, qt-format msgctxt "KFormat|IECBinaryDialect" msgid "%1 EiB" msgstr "%1 EiB" #. IECBinaryDialect size in 10^70 bytes #: lib/util/kformatprivate.cpp:169 -#, fuzzy, qt-format -#| msgctxt "size in 2^70 bytes" -#| msgid "%1 ZiB" +#, qt-format msgctxt "KFormat|IECBinaryDialect" msgid "%1 ZiB" msgstr "%1 ZiB" #. IECBinaryDialect size in 10^80 bytes #: lib/util/kformatprivate.cpp:172 -#, fuzzy, qt-format -#| msgctxt "size in 2^80 bytes" -#| msgid "%1 YiB" +#, qt-format msgctxt "KFormat|IECBinaryDialect" msgid "%1 YiB" msgstr "%1 YiB" @@ -525,42 +399,42 @@ #, qt-format msgctxt "KFormat|" msgid "%1m%2.%3s" -msgstr "" +msgstr "%1 m %2,%3 s" #. @item:intext Duration format minutes and seconds #: lib/util/kformatprivate.cpp:216 #, qt-format msgctxt "KFormat|" msgid "%1m%2s" -msgstr "" +msgstr "%1 m %2 s" #. @item:intext Duration format hours and minutes #: lib/util/kformatprivate.cpp:220 #, qt-format msgctxt "KFormat|" msgid "%1h%2m" -msgstr "" +msgstr "%1 h %2 m" #. @item:intext Duration format hours, minutes, seconds, milliseconds #: lib/util/kformatprivate.cpp:224 #, qt-format msgctxt "KFormat|" msgid "%1h%2m%3.%4s" -msgstr "" +msgstr "%1 h %2 m %3,%4s" #. @item:intext Duration format hours, minutes, seconds #: lib/util/kformatprivate.cpp:230 #, qt-format msgctxt "KFormat|" msgid "%1h%2m%3s" -msgstr "" +msgstr "%1 h %2 m %3 s" #. @item:intext Duration format minutes, seconds and milliseconds #: lib/util/kformatprivate.cpp:240 #, qt-format msgctxt "KFormat|" msgid "%1:%2.%3" -msgstr "" +msgstr "%1:%2,%3" #. @item:intext Duration format minutes and seconds #. ---------- @@ -569,103 +443,84 @@ #, qt-format msgctxt "KFormat|" msgid "%1:%2" -msgstr "" +msgstr "%1:%2" #. @item:intext Duration format hours, minutes, seconds, milliseconds #: lib/util/kformatprivate.cpp:253 #, qt-format msgctxt "KFormat|" msgid "%1:%2:%3.%4" -msgstr "" +msgstr "%1:%2:%3,%4" #. @item:intext Duration format hours, minutes, seconds #: lib/util/kformatprivate.cpp:259 #, qt-format msgctxt "KFormat|" msgid "%1:%2:%3" -msgstr "" +msgstr "%1:%2:%3" #. @item:intext %1 is a real number, e.g. 1.23 days #: lib/util/kformatprivate.cpp:274 -#, fuzzy, qt-format -#| msgctxt "@item:intext %1 is a real number, e.g. 1.23 days" -#| msgid "%1 days" +#, qt-format msgctxt "KFormat|" msgid "%1 days" msgstr "%1 egun" #. @item:intext %1 is a real number, e.g. 1.23 hours #: lib/util/kformatprivate.cpp:277 -#, fuzzy, qt-format -#| msgctxt "@item:intext %1 is a real number, e.g. 1.23 hours" -#| msgid "%1 hours" +#, qt-format msgctxt "KFormat|" msgid "%1 hours" msgstr "%1 ordu" #. @item:intext %1 is a real number, e.g. 1.23 minutes #: lib/util/kformatprivate.cpp:280 -#, fuzzy, qt-format -#| msgctxt "@item:intext %1 is a real number, e.g. 1.23 minutes" -#| msgid "%1 minutes" +#, qt-format msgctxt "KFormat|" msgid "%1 minutes" msgstr "%1 minutu" #. @item:intext %1 is a real number, e.g. 1.23 seconds #: lib/util/kformatprivate.cpp:283 -#, fuzzy, qt-format -#| msgctxt "@item:intext %1 is a real number, e.g. 1.23 seconds" -#| msgid "%1 seconds" +#, qt-format msgctxt "KFormat|" msgid "%1 seconds" -msgstr "%1 segundu" +msgstr "%1 segundo" #. @item:intext %1 is a whole number #: lib/util/kformatprivate.cpp:288 -#, fuzzy, qt-format -#| msgctxt "@item:intext" -#| msgid "%1 millisecond" -#| msgid_plural "%1 milliseconds" +#, qt-format msgctxt "KFormat|" msgid "%n millisecond(s)" -msgstr "milisegundu %1" +msgstr "%n milisegundo" #. @item:intext %n is a whole number #: lib/util/kformatprivate.cpp:306 -#, fuzzy, qt-format -#| msgctxt "@item:intext %1 is a real number, e.g. 1.23 days" -#| msgid "%1 days" +#, qt-format msgctxt "KFormat|" msgid "%n day(s)" -msgstr "%1 egun" +msgstr "%n egun" #. @item:intext %n is a whole number #: lib/util/kformatprivate.cpp:311 -#, fuzzy, qt-format -#| msgctxt "@item:intext %1 is a real number, e.g. 1.23 hours" -#| msgid "%1 hours" +#, qt-format msgctxt "KFormat|" msgid "%n hour(s)" -msgstr "%1 ordu" +msgstr "%n ordu" #. @item:intext %n is a whole number #: lib/util/kformatprivate.cpp:316 -#, fuzzy, qt-format -#| msgctxt "@item:intext %1 is a real number, e.g. 1.23 minutes" -#| msgid "%1 minutes" +#, qt-format msgctxt "KFormat|" msgid "%n minute(s)" -msgstr "%1 minutu" +msgstr "%n minutu" #. @item:intext %n is a whole number #: lib/util/kformatprivate.cpp:321 -#, fuzzy, qt-format -#| msgctxt "@item:intext %1 is a real number, e.g. 1.23 seconds" -#| msgid "%1 seconds" +#, qt-format msgctxt "KFormat|" msgid "%n second(s)" -msgstr "%1 segundu" +msgstr "%n segundo" #. @item:intext days and hours. This uses the previous item:intext messages. If this does not fit the grammar of your language please contact the i18n team to solve the problem #. ---------- @@ -674,150 +529,106 @@ #. @item:intext minutes and seconds. This uses the previous item:intext messages. If this does not fit the grammar of your language please contact the i18n team to solve the problem #: lib/util/kformatprivate.cpp:346 lib/util/kformatprivate.cpp:353 #: lib/util/kformatprivate.cpp:360 -#, fuzzy, qt-format -#| msgctxt "" -#| "@item:intext days and hours. This uses the previous item:intext messages. " -#| "If this does not fit the grammar of your language please contact the i18n " -#| "team to solve the problem" -#| msgid "%1 and %2" +#, qt-format msgctxt "KFormat|" msgid "%1 and %2" msgstr "%1 eta %2" #: lib/util/kformatprivate.cpp:372 -#, fuzzy -#| msgid "Invalid item." msgctxt "" "KFormat|used when a relative date string can't be generated because the date " "is invalid" msgid "Invalid date" -msgstr "Elementu baliogabea." +msgstr "Data baliogabea" #: lib/util/kformatprivate.cpp:382 -#, fuzzy -#| msgctxt "@option tomorrow" -#| msgid "Tomorrow" msgctxt "KFormat|" msgid "Tomorrow" msgstr "Bihar" #: lib/util/kformatprivate.cpp:384 -#, fuzzy -#| msgid "Today" msgctxt "KFormat|" msgid "Today" msgstr "Gaur" #: lib/util/kformatprivate.cpp:386 -#, fuzzy -#| msgid "Yesterday" msgctxt "KFormat|" msgid "Yesterday" msgstr "Atzo" #: lib/util/kformatprivate.cpp:392 -#, fuzzy -#| msgctxt "@option last month" -#| msgid "Last Month" msgctxt "KFormat|most recent such day before today" msgid "Last Monday" -msgstr "Aurreko hilabetea" +msgstr "Aurreko astelehena" #: lib/util/kformatprivate.cpp:394 -#, fuzzy -#| msgctxt "@option last year" -#| msgid "Last Year" msgctxt "KFormat|most recent such day before today" msgid "Last Tuesday" -msgstr "Aurreko urtea" +msgstr "Aurreko asteartea" #: lib/util/kformatprivate.cpp:396 -#, fuzzy -#| msgctxt "" -#| "referring to a filter on the modification and usage date of files/" -#| "resources" -#| msgid "Last Week" msgctxt "KFormat|most recent such day before today" msgid "Last Wednesday" -msgstr "Azken astean" +msgstr "Aurreko asteazkena" #: lib/util/kformatprivate.cpp:398 msgctxt "KFormat|most recent such day before today" msgid "Last Thursday" -msgstr "" +msgstr "Aurreko osteguna" #: lib/util/kformatprivate.cpp:400 msgctxt "KFormat|most recent such day before today" msgid "Last Friday" -msgstr "" +msgstr "Aurreko ostirala" #: lib/util/kformatprivate.cpp:402 -#, fuzzy -#| msgctxt "@option last year" -#| msgid "Last Year" msgctxt "KFormat|most recent such day before today" msgid "Last Saturday" -msgstr "Aurreko urtea" +msgstr "Aurreko larunbata" #: lib/util/kformatprivate.cpp:404 msgctxt "KFormat|most recent such day before today" msgid "Last Sunday" -msgstr "" +msgstr "Aurreko igandea" #: lib/util/kformatprivate.cpp:409 -#, fuzzy -#| msgctxt "@option next month" -#| msgid "Next Month" msgctxt "KFormat|the next such day after today" msgid "Next Monday" -msgstr "Hurrengo hilabetea" +msgstr "Datorren astelehena" #: lib/util/kformatprivate.cpp:411 -#, fuzzy -#| msgid "Next year" msgctxt "KFormat|the next such day after today" msgid "Next Tuesday" -msgstr "Hurrengo urtea" +msgstr "Datorren asteartea" #: lib/util/kformatprivate.cpp:413 -#, fuzzy -#| msgctxt "@option next week" -#| msgid "Next Week" msgctxt "KFormat|the next such day after today" msgid "Next Wednesday" -msgstr "Hurrengo astea" +msgstr "Datorren asteazkena" #: lib/util/kformatprivate.cpp:415 msgctxt "KFormat|the next such day after today" msgid "Next Thursday" -msgstr "" +msgstr "Datorren osteguna" #: lib/util/kformatprivate.cpp:417 -#, fuzzy -#| msgid "Next year" msgctxt "KFormat|the next such day after today" msgid "Next Friday" -msgstr "Hurrengo urtea" +msgstr "Datorren ostirala" #: lib/util/kformatprivate.cpp:419 -#, fuzzy -#| msgid "Next year" msgctxt "KFormat|the next such day after today" msgid "Next Saturday" -msgstr "Hurrengo urtea" +msgstr "Datorren larunbata" #: lib/util/kformatprivate.cpp:421 -#, fuzzy -#| msgid "Next year" msgctxt "KFormat|the next such day after today" msgid "Next Sunday" -msgstr "Hurrengo urtea" +msgstr "Datorren igandea" #. relative datetime with %1 result of formatReleativeDate() and %2 the formatted time If this does not fit the grammar of your language please contact the i18n team to solve the problem #: lib/util/kformatprivate.cpp:436 -#, fuzzy, qt-format -#| msgctxt "City, Country" -#| msgid "%1, %2" +#, qt-format msgctxt "KFormat|" msgid "%1, %2" msgstr "%1, %2" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.37.0/po/gl/kcoreaddons5_qt.po new/kcoreaddons-5.38.0/po/gl/kcoreaddons5_qt.po --- old/kcoreaddons-5.37.0/po/gl/kcoreaddons5_qt.po 2017-08-06 19:58:54.000000000 +0200 +++ new/kcoreaddons-5.38.0/po/gl/kcoreaddons5_qt.po 2017-09-03 10:02:31.000000000 +0200 @@ -10,13 +10,14 @@ # Xosé <[email protected]>, 2010. # Marce Villarino <[email protected]>, 2011, 2012, 2013, 2014. # Adrián Chaves Fernández <[email protected]>, 2015, 2016, 2017. +# Adrián Chaves (Gallaecio) <[email protected]>, 2017. msgid "" msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-03-23 01:50+0000\n" -"PO-Revision-Date: 2017-07-24 17:16+0100\n" -"Last-Translator: Adrián Chaves <[email protected]>\n" +"PO-Revision-Date: 2017-08-09 20:40+0100\n" +"Last-Translator: Adrián Chaves (Gallaecio) <[email protected]>\n" "Language-Team: Galician <[email protected]>\n" "Language: gl\n" "MIME-Version: 1.0\n" @@ -143,7 +144,7 @@ "internationalization visit <a href=\"http://l10n.kde.org\";>http://l10n.kde."; "org</a></p>" msgstr "" -"<p>KDE está traducido a moitas linguas grazas ao traballo dos equipos de " +"<p>KDE está traducido a moitos idiomas grazas ao traballo dos equipos de " "tradución de todo o mundo.</p><p>Para máis información sobre a " "internacionalización de KDE visite <a href=\"http://l10n.kde.org\";>http://"; "l10n.kde.org</a> ou http://www.trasno.net/</p>" @@ -530,7 +531,7 @@ "KFormat|used when a relative date string can't be generated because the date " "is invalid" msgid "Invalid date" -msgstr "A data non é correcta." +msgstr "A data é incorrecta." #: lib/util/kformatprivate.cpp:382 msgctxt "KFormat|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.37.0/src/lib/caching/kshareddatacache.cpp new/kcoreaddons-5.38.0/src/lib/caching/kshareddatacache.cpp --- old/kcoreaddons-5.37.0/src/lib/caching/kshareddatacache.cpp 2017-08-06 19:58:54.000000000 +0200 +++ new/kcoreaddons-5.38.0/src/lib/caching/kshareddatacache.cpp 2017-09-03 10:02:31.000000000 +0200 @@ -970,7 +970,7 @@ // The per-instance private data, such as map size, whether // attached or not, pointer to shared memory, etc. -class KSharedDataCache::Private +class Q_DECL_HIDDEN KSharedDataCache::Private { public: Private(const QString &name, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.37.0/src/lib/caching/kshareddatacache_win.cpp new/kcoreaddons-5.38.0/src/lib/caching/kshareddatacache_win.cpp --- old/kcoreaddons-5.37.0/src/lib/caching/kshareddatacache_win.cpp 2017-08-06 19:58:54.000000000 +0200 +++ new/kcoreaddons-5.38.0/src/lib/caching/kshareddatacache_win.cpp 2017-09-03 10:02:31.000000000 +0200 @@ -28,7 +28,7 @@ #include <QtCore/QByteArray> #include <QtCore/QCache> -class KSharedDataCache::Private +class Q_DECL_HIDDEN KSharedDataCache::Private { public: KSharedDataCache::EvictionPolicy evictionPolicy; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.37.0/src/lib/jobs/kjobtrackerinterface.cpp new/kcoreaddons-5.38.0/src/lib/jobs/kjobtrackerinterface.cpp --- old/kcoreaddons-5.37.0/src/lib/jobs/kjobtrackerinterface.cpp 2017-08-06 19:58:54.000000000 +0200 +++ new/kcoreaddons-5.38.0/src/lib/jobs/kjobtrackerinterface.cpp 2017-09-03 10:02:31.000000000 +0200 @@ -21,7 +21,7 @@ #include "kjob.h" -class KJobTrackerInterface::Private +class Q_DECL_HIDDEN KJobTrackerInterface::Private { public: Private(KJobTrackerInterface *interface) : q(interface) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.37.0/src/lib/jobs/kjobuidelegate.cpp new/kcoreaddons-5.38.0/src/lib/jobs/kjobuidelegate.cpp --- old/kcoreaddons-5.37.0/src/lib/jobs/kjobuidelegate.cpp 2017-08-06 19:58:54.000000000 +0200 +++ new/kcoreaddons-5.38.0/src/lib/jobs/kjobuidelegate.cpp 2017-09-03 10:02:31.000000000 +0200 @@ -22,7 +22,7 @@ #include "kjobuidelegate.h" #include "kjob.h" -class KJobUiDelegate::Private +class Q_DECL_HIDDEN KJobUiDelegate::Private { public: Private(KJobUiDelegate *delegate) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.37.0/src/lib/kaboutdata.cpp new/kcoreaddons-5.38.0/src/lib/kaboutdata.cpp --- old/kcoreaddons-5.37.0/src/lib/kaboutdata.cpp 2017-08-06 19:58:54.000000000 +0200 +++ new/kcoreaddons-5.38.0/src/lib/kaboutdata.cpp 2017-09-03 10:02:31.000000000 +0200 @@ -48,7 +48,7 @@ Q_LOGGING_CATEGORY(KABOUTDATA, "kf5.kcoreaddons.kaboutdata", QtWarningMsg) -class KAboutPerson::Private +class Q_DECL_HIDDEN KAboutPerson::Private { public: QString _name; @@ -131,7 +131,7 @@ } -class KAboutLicense::Private : public QSharedData +class Q_DECL_HIDDEN KAboutLicense::Private : public QSharedData { public: Private(LicenseKey licenseType, @@ -438,7 +438,7 @@ return KAboutLicense(license, restriction, nullptr); } -class KAboutData::Private +class Q_DECL_HIDDEN KAboutData::Private { public: Private() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.37.0/src/lib/plugin/desktopfileparser.cpp new/kcoreaddons-5.38.0/src/lib/plugin/desktopfileparser.cpp --- old/kcoreaddons-5.37.0/src/lib/plugin/desktopfileparser.cpp 2017-08-06 19:58:54.000000000 +0200 +++ new/kcoreaddons-5.38.0/src/lib/plugin/desktopfileparser.cpp 2017-09-03 10:02:31.000000000 +0200 @@ -32,6 +32,8 @@ #include <QJsonObject> #include <QMutex> #include <QStandardPaths> +#include <QRegularExpression> +#include <QRegularExpressionMatch> // in the desktoptojson binary enable debug messages by default, in the library only warning messages #ifdef BUILDING_DESKTOPTOJSON_TOOL @@ -226,9 +228,12 @@ *nextGroup = name; break; } - if (line.startsWith(QByteArrayLiteral("Type="))) { - // TODO: should we also have to accept spaces around equals here? - type = line.mid(qstrlen("Type=")); + + const static QRegularExpression typeEntryRegex( + QStringLiteral("^Type\\s*=\\s*(.*)$")); + const auto match = typeEntryRegex.match(QString::fromUtf8(line)); + if (match.hasMatch()) { + type = match.captured(1).toUtf8(); } } return type; @@ -279,15 +284,22 @@ return true; } -QVector<CustomPropertyDefinition>* parseServiceTypesFile(QString path) +static QVector<CustomPropertyDefinition>* parseServiceTypesFile(const QString &inputPath) { int lineNr = 0; + QString path = inputPath; if (QDir::isRelativePath(path)) { - const QString originalPath = path; path = QStandardPaths::locate(QStandardPaths::GenericDataLocation, - QStringLiteral("kservicetypes5/") + path); + QStringLiteral("kservicetypes5/") + inputPath); + QString rcPath; + if (path.isEmpty()) { + rcPath = QStringLiteral(":/kservicetypes5/") + inputPath; + if (QFileInfo::exists(rcPath)) { + path = rcPath; + } + } if (path.isEmpty()) { - qCWarning(DESKTOPPARSER).nospace() << "Could not locate service type file kservicetypes5/" << qPrintable(originalPath) << ", tried " << QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation); + qCWarning(DESKTOPPARSER).nospace() << "Could not locate service type file kservicetypes5/" << qPrintable(inputPath) << ", tried " << QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation) << " and " << rcPath; return nullptr; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.37.0/src/lib/randomness/krandomsequence.cpp new/kcoreaddons-5.38.0/src/lib/randomness/krandomsequence.cpp --- old/kcoreaddons-5.37.0/src/lib/randomness/krandomsequence.cpp 2017-08-06 19:58:54.000000000 +0200 +++ new/kcoreaddons-5.38.0/src/lib/randomness/krandomsequence.cpp 2017-09-03 10:02:31.000000000 +0200 @@ -21,7 +21,7 @@ #include "krandomsequence.h" #include "krandom.h" -class KRandomSequence::Private +class Q_DECL_HIDDEN KRandomSequence::Private { public: enum {SHUFFLE_TABLE_SIZE = 32}; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.37.0/src/lib/util/kdelibs4configmigrator.cpp new/kcoreaddons-5.38.0/src/lib/util/kdelibs4configmigrator.cpp --- old/kcoreaddons-5.37.0/src/lib/util/kdelibs4configmigrator.cpp 2017-08-06 19:58:54.000000000 +0200 +++ new/kcoreaddons-5.38.0/src/lib/util/kdelibs4configmigrator.cpp 2017-09-03 10:02:31.000000000 +0200 @@ -32,7 +32,7 @@ // logging category for this framework, default: log stuff >= warning Q_LOGGING_CATEGORY(MIGRATOR, "kf5.kcoreaddons.kdelibs4configmigrator", QtWarningMsg) -class Kdelibs4ConfigMigrator::Private +class Q_DECL_HIDDEN Kdelibs4ConfigMigrator::Private { public: Private(const QString &_appName) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.37.0/src/lib/util/kuser_unix.cpp new/kcoreaddons-5.38.0/src/lib/util/kuser_unix.cpp --- old/kcoreaddons-5.37.0/src/lib/util/kuser_unix.cpp 2017-08-06 19:58:54.000000000 +0200 +++ new/kcoreaddons-5.38.0/src/lib/util/kuser_unix.cpp 2017-09-03 10:02:31.000000000 +0200 @@ -44,7 +44,7 @@ static inline void endgrent() { } #endif -class KUser::Private : public QSharedData +class Q_DECL_HIDDEN KUser::Private : public QSharedData { public: uid_t uid; @@ -336,7 +336,7 @@ { } -class KUserGroup::Private : public QSharedData +class Q_DECL_HIDDEN KUserGroup::Private : public QSharedData { public: gid_t gid; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.37.0/src/lib/util/kuser_win.cpp new/kcoreaddons-5.38.0/src/lib/util/kuser_win.cpp --- old/kcoreaddons-5.37.0/src/lib/util/kuser_win.cpp 2017-08-06 19:58:54.000000000 +0200 +++ new/kcoreaddons-5.38.0/src/lib/util/kuser_win.cpp 2017-09-03 10:02:31.000000000 +0200 @@ -172,7 +172,7 @@ }); } -class KUser::Private : public QSharedData +class Q_DECL_HIDDEN KUser::Private : public QSharedData { typedef QExplicitlySharedDataPointer<Private> Ptr; Private() : isAdmin(false) {} @@ -486,7 +486,7 @@ { } -class KUserGroup::Private : public QSharedData +class Q_DECL_HIDDEN KUserGroup::Private : public QSharedData { public: QString name;
