Hello community, here is the log from the commit of package kcoreaddons for openSUSE:Factory checked in at 2016-07-03 12:20:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcoreaddons (Old) and /work/SRC/openSUSE:Factory/.kcoreaddons.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kcoreaddons" Changes: -------- --- /work/SRC/openSUSE:Factory/kcoreaddons/kcoreaddons.changes 2016-05-19 12:06:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kcoreaddons.new/kcoreaddons.changes 2016-07-03 12:20:39.000000000 +0200 @@ -1,0 +2,11 @@ +Mon Jun 6 21:24:05 UTC 2016 - [email protected] + +- Update to 5.23.0 + * Print the failing plugin when notifying a cast warning + * [kshareddatacache] Fix invalid use of & to avoid unaligned reads + * Kdelibs4ConfigMigrator: skip reparsing if nothing was migrated + * krandom: Add testcase to catch bug 362161 (failure to auto-seed) + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.23.0.php + +------------------------------------------------------------------- Old: ---- kcoreaddons-5.22.0.tar.xz New: ---- kcoreaddons-5.23.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcoreaddons.spec ++++++ --- /var/tmp/diff_new_pack.btiw3i/_old 2016-07-03 12:20:40.000000000 +0200 +++ /var/tmp/diff_new_pack.btiw3i/_new 2016-07-03 12:20:40.000000000 +0200 @@ -18,9 +18,9 @@ %bcond_without lang %define lname libKF5CoreAddons5 -%define _tar_path 5.22 +%define _tar_path 5.23 Name: kcoreaddons -Version: 5.22.0 +Version: 5.23.0 Release: 0 BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules >= %{_tar_path} ++++++ kcoreaddons-5.22.0.tar.xz -> kcoreaddons-5.23.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.22.0/CMakeLists.txt new/kcoreaddons-5.23.0/CMakeLists.txt --- old/kcoreaddons-5.22.0/CMakeLists.txt 2016-05-07 17:08:21.000000000 +0200 +++ new/kcoreaddons-5.23.0/CMakeLists.txt 2016-06-06 13:29:26.000000000 +0200 @@ -3,7 +3,7 @@ project(KCoreAddons) include(FeatureSummary) -find_package(ECM 5.22.0 NO_MODULE) +find_package(ECM 5.23.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -45,7 +45,7 @@ include(ECMPoQmTools) -set(KF5_VERSION "5.22.0") # handled by release scripts +set(KF5_VERSION "5.23.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KCOREADDONS VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kcoreaddons_version.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.22.0/autotests/kpluginmetadatatest.cpp new/kcoreaddons-5.23.0/autotests/kpluginmetadatatest.cpp --- old/kcoreaddons-5.22.0/autotests/kpluginmetadatatest.cpp 2016-05-07 17:08:21.000000000 +0200 +++ new/kcoreaddons-5.23.0/autotests/kpluginmetadatatest.cpp 2016-06-06 13:29:26.000000000 +0200 @@ -203,23 +203,23 @@ "\"Object\": { \"foo\": \"bar\" }\n" // should return empty list "}", &e).object(); QCOMPARE(e.error, QJsonParseError::NoError); - QTest::ignoreMessage(QtWarningMsg, "Expected JSON property \"String\" to be a string list. Treating it as a list with a single entry: \"foo\""); + QTest::ignoreMessage(QtWarningMsg, "Expected JSON property \"String\" to be a string list. Treating it as a list with a single entry: \"foo\" "); QCOMPARE(KPluginMetaData::readStringList(jo, "String"), QStringList("foo")); QCOMPARE(KPluginMetaData::readStringList(jo, "OneArrayEntry"), QStringList("foo")); - QTest::ignoreMessage(QtWarningMsg, "Expected JSON property \"Bool\" to be a string list. Treating it as a list with a single entry: \"true\""); + QTest::ignoreMessage(QtWarningMsg, "Expected JSON property \"Bool\" to be a string list. Treating it as a list with a single entry: \"true\" "); QCOMPARE(KPluginMetaData::readStringList(jo, "Bool"), QStringList("true")); - QTest::ignoreMessage(QtWarningMsg, "Expected JSON property \"QuotedBool\" to be a string list. Treating it as a list with a single entry: \"true\""); + QTest::ignoreMessage(QtWarningMsg, "Expected JSON property \"QuotedBool\" to be a string list. Treating it as a list with a single entry: \"true\" "); QCOMPARE(KPluginMetaData::readStringList(jo, "QuotedBool"), QStringList("true")); - QTest::ignoreMessage(QtWarningMsg, "Expected JSON property \"Number\" to be a string list. Treating it as a list with a single entry: \"12345\""); + QTest::ignoreMessage(QtWarningMsg, "Expected JSON property \"Number\" to be a string list. Treating it as a list with a single entry: \"12345\" "); QCOMPARE(KPluginMetaData::readStringList(jo, "Number"), QStringList("12345")); - QTest::ignoreMessage(QtWarningMsg, "Expected JSON property \"QuotedNumber\" to be a string list. Treating it as a list with a single entry: \"12345\""); + QTest::ignoreMessage(QtWarningMsg, "Expected JSON property \"QuotedNumber\" to be a string list. Treating it as a list with a single entry: \"12345\" "); QCOMPARE(KPluginMetaData::readStringList(jo, "QuotedNumber"), QStringList("12345")); QCOMPARE(KPluginMetaData::readStringList(jo, "EmptyArray"), QStringList()); QCOMPARE(KPluginMetaData::readStringList(jo, "NumberArray"), QStringList() << "1" << "2" << "3"); QCOMPARE(KPluginMetaData::readStringList(jo, "BoolArray"), QStringList() << "true" << "false" << "true"); QCOMPARE(KPluginMetaData::readStringList(jo, "StringArray"), QStringList() << "foo" << "bar"); QCOMPARE(KPluginMetaData::readStringList(jo, "Null"), QStringList()); - QTest::ignoreMessage(QtWarningMsg, "Expected JSON property \"QuotedNull\" to be a string list. Treating it as a list with a single entry: \"null\""); + QTest::ignoreMessage(QtWarningMsg, "Expected JSON property \"QuotedNull\" to be a string list. Treating it as a list with a single entry: \"null\" "); QCOMPARE(KPluginMetaData::readStringList(jo, "QuotedNull"), QStringList("null")); QCOMPARE(KPluginMetaData::readStringList(jo, "ArrayWithNull"), QStringList() << "foo" << "" << "bar"); QCOMPARE(KPluginMetaData::readStringList(jo, "Object"), QStringList()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.22.0/autotests/krandomtest.cpp new/kcoreaddons-5.23.0/autotests/krandomtest.cpp --- old/kcoreaddons-5.22.0/autotests/krandomtest.cpp 2016-05-07 17:08:21.000000000 +0200 +++ new/kcoreaddons-5.23.0/autotests/krandomtest.cpp 2016-06-06 13:29:26.000000000 +0200 @@ -1,5 +1,6 @@ /* This file is part of the KDE libraries Copyright (c) 2016 Michael Pyne <[email protected]> + Copyright (c) 2016 Arne Spiegelhauer <[email protected]> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -26,11 +27,16 @@ #include <QString> #include <QRegExp> #include <QVarLengthArray> +#include <QTextStream> +#include <QProcess> +#include <iostream> #include <algorithm> typedef QVarLengthArray<int> intSequenceType; +static const char *binpath; + static bool seqsAreEqual(const intSequenceType &l, const intSequenceType &r) { if(l.size() != r.size()) { @@ -48,6 +54,28 @@ return l_first == last; } +// Fills seq with random bytes produced by a new process. Seq should already +// be sized to the needed amount of random numbers. +static bool getChildRandSeq(intSequenceType &seq) +{ + QProcess subtestProcess; + + // Launch a separate process to generate random numbers to test first-time + // seeding. + subtestProcess.start(binpath, QStringList() << QString::number(seq.count())); + subtestProcess.waitForFinished(); + + QTextStream childStream(subtestProcess.readAllStandardOutput()); + + std::generate(seq.begin(), seq.end(), [&]() { + int temp; childStream >> temp; return temp; + }); + + char c; + childStream >> c; + return c == '\n' && childStream.status() == QTextStream::Ok; +} + class KRandomTest : public QObject { Q_OBJECT @@ -64,6 +92,15 @@ QVERIFY(testValue >= 0); QVERIFY(testValue < RAND_MAX); + + // Verify seeding results in different numbers across different procs + // See bug 362161 + intSequenceType out1(10), out2(10); + + QVERIFY(getChildRandSeq(out1)); + QVERIFY(getChildRandSeq(out2)); + + QVERIFY(!seqsAreEqual(out1, out2)); } void KRandomTest::test_randomString() @@ -113,6 +150,35 @@ QVERIFY(all_of(out2.begin(), out2.end(), [&](int x) { return x < maxInt; })); } -QTEST_MAIN(KRandomTest) +// Used by getChildRandSeq... outputs random numbers to stdout and then +// exits the process. +static void childGenRandom(int count) +{ + // No logic to 300, just wanted to avoid it accidentally being 2.4B... + if (count <= 0 || count > 300) { + exit(-1); + } + + while (--count > 0) { + std::cout << KRandom::random() << ' '; + } + + std::cout << KRandom::random() << '\n'; + exit(0); +} + +// Manually implemented to dispatch to child process if needed to support +// subtests +int main(int argc, char *argv[]) +{ + if (argc > 1) { + childGenRandom(std::atoi(argv[1])); + Q_UNREACHABLE(); + } + + binpath = argv[0]; + KRandomTest randomTest; + return QTest::qExec(&randomTest); +} #include "krandomtest.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.22.0/metainfo.yaml new/kcoreaddons-5.23.0/metainfo.yaml --- old/kcoreaddons-5.22.0/metainfo.yaml 2016-05-07 17:08:21.000000000 +0200 +++ new/kcoreaddons-5.23.0/metainfo.yaml 2016-06-06 13:29:26.000000000 +0200 @@ -11,3 +11,7 @@ - qmake: KCoreAddons cmake: "KF5::CoreAddons" cmakename: KF5CoreAddons + +public_lib: true +group: Frameworks +subgroup: Tier 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.22.0/po/da/kcoreaddons5_qt.po new/kcoreaddons-5.23.0/po/da/kcoreaddons5_qt.po --- old/kcoreaddons-5.22.0/po/da/kcoreaddons5_qt.po 2016-05-07 17:08:21.000000000 +0200 +++ new/kcoreaddons-5.23.0/po/da/kcoreaddons5_qt.po 2016-06-06 13:29:26.000000000 +0200 @@ -11,7 +11,7 @@ "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: 2016-02-29 21:02+0100\n" +"PO-Revision-Date: 2016-05-12 20:41+0100\n" "Last-Translator: Martin Schlander <[email protected]>\n" "Language-Team: Danish <[email protected]>\n" "Language: da\n" @@ -159,12 +159,10 @@ msgstr "Dette program blev skrevet af en som ønsker at forblive anonym." #: lib/kaboutdata.cpp:1057 -#, fuzzy, qt-format -#| msgctxt "KAboutData CLI|" -#| msgid "%s was written by:" +#, qt-format msgctxt "KAboutData CLI|" msgid "%1 was written by:" -msgstr "%s blev skrevet af:" +msgstr "%1 blev skrevet af:" #: lib/kaboutdata.cpp:1068 msgctxt "KAboutData CLI|" @@ -172,12 +170,10 @@ msgstr "Brug venligst http://bugs.kde.org til at rapportere om fejl." #: lib/kaboutdata.cpp:1070 -#, fuzzy, qt-format -#| msgctxt "KAboutData CLI|" -#| msgid "Please report bugs to %s." +#, qt-format msgctxt "KAboutData CLI|" msgid "Please report bugs to %1." -msgstr "Rapportér venligst fejl til %s." +msgstr "Rapportér venligst fejl til %1." #: lib/plugin/kpluginloader.cpp:122 #, qt-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.22.0/po/gd/kcoreaddons5_qt.po new/kcoreaddons-5.23.0/po/gd/kcoreaddons5_qt.po --- old/kcoreaddons-5.22.0/po/gd/kcoreaddons5_qt.po 2016-05-07 17:08:21.000000000 +0200 +++ new/kcoreaddons-5.23.0/po/gd/kcoreaddons5_qt.po 2016-06-06 13:29:26.000000000 +0200 @@ -1,10 +1,10 @@ -# GunChleoc <[email protected]>, 2014, 2015. +# GunChleoc <[email protected]>, 2014, 2015, 2016. msgid "" msgstr "" "Project-Id-Version: \n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2015-11-04 15:11+0000\n" -"Last-Translator: Michael Bauer <[email protected]>\n" +"PO-Revision-Date: 2016-04-29 19:30+0100\n" +"Last-Translator: GunChleoc <[email protected]>\n" "Language-Team: Fòram na Gàidhlig\n" "Language: gd\n" "MIME-Version: 1.0\n" @@ -12,7 +12,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : " "(n > 2 && n < 20) ? 2 : 3;\n" -"X-Generator: Poedit 1.8.4\n" +"X-Generator: Virtaal 0.7.1\n" "X-Qt-Contexts: true\n" #: lib/kaboutdata.cpp:250 @@ -138,12 +138,12 @@ #: lib/kaboutdata.cpp:1045 msgctxt "KAboutData CLI|" msgid "The base file name of the desktop entry for this application." -msgstr "" +msgstr "Ainm faidhle bunaiteach an innteirt desktop airson na h-aplacaid seo." #: lib/kaboutdata.cpp:1046 msgctxt "KAboutData CLI|" msgid "file name" -msgstr "" +msgstr "ainm an fhaidhle" #: lib/kaboutdata.cpp:1055 msgctxt "KAboutData CLI|" @@ -153,12 +153,10 @@ "foillseachadh." #: lib/kaboutdata.cpp:1057 -#, fuzzy, qt-format -#| msgctxt "KAboutData CLI|" -#| msgid "%s was written by:\n" +#, qt-format msgctxt "KAboutData CLI|" msgid "%1 was written by:" -msgstr "Chaidh %s a sgrìobhadh le:\n" +msgstr "Chaidh %1 a sgrìobhadh le:" #: lib/kaboutdata.cpp:1068 msgctxt "KAboutData CLI|" @@ -166,12 +164,10 @@ msgstr "Cleachd http://bugs.kde.org gus aithris a dhèanamh air bugaichean." #: lib/kaboutdata.cpp:1070 -#, fuzzy, qt-format -#| msgctxt "KAboutData CLI|" -#| msgid "Please report bugs to %s.\n" +#, qt-format msgctxt "KAboutData CLI|" msgid "Please report bugs to %1." -msgstr "Cuir aithrisean air bugaichean gu %s.\n" +msgstr "Cuir aithrisean air bugaichean gu %1." #: lib/plugin/kpluginloader.cpp:122 #, qt-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.22.0/po/nb/kcoreaddons5_qt.po new/kcoreaddons-5.23.0/po/nb/kcoreaddons5_qt.po --- old/kcoreaddons-5.22.0/po/nb/kcoreaddons5_qt.po 2016-05-07 17:08:21.000000000 +0200 +++ new/kcoreaddons-5.23.0/po/nb/kcoreaddons5_qt.po 2016-06-06 13:29:26.000000000 +0200 @@ -26,7 +26,7 @@ "X-Text-Markup: qtrich\n" "X-Qt-Contexts: true\n" -#: lib/kaboutdata.cpp:243 +#: lib/kaboutdata.cpp:250 msgctxt "KAboutLicense|" msgid "" "No licensing terms for this program have been specified.\n" @@ -36,93 +36,93 @@ "Det er ikke oppgitt lisensbetingelser for dette programmet.\n" "Lisensbetingelsene kan være i dokumentasjonen eller kildekoden.\n" -#: lib/kaboutdata.cpp:251 +#: lib/kaboutdata.cpp:258 #, qt-format msgctxt "KAboutLicense|" msgid "This program is distributed under the terms of the %1." msgstr "Dette programmet er gitt ut under betingelsene i %1." -#: lib/kaboutdata.cpp:277 +#: lib/kaboutdata.cpp:284 msgctxt "KAboutLicense|@item license (short name)" msgid "GPL v2" msgstr "GPL v2" -#: lib/kaboutdata.cpp:278 +#: lib/kaboutdata.cpp:285 msgctxt "KAboutLicense|@item license" msgid "GNU General Public License Version 2" msgstr "GNU General Public License Version 2" -#: lib/kaboutdata.cpp:281 +#: lib/kaboutdata.cpp:288 msgctxt "KAboutLicense|@item license (short name)" msgid "LGPL v2" msgstr "LGPL v2" -#: lib/kaboutdata.cpp:282 +#: lib/kaboutdata.cpp:289 msgctxt "KAboutLicense|@item license" msgid "GNU Lesser General Public License Version 2" msgstr "GNU Lesser General Public License Version 2" -#: lib/kaboutdata.cpp:285 +#: lib/kaboutdata.cpp:292 msgctxt "KAboutLicense|@item license (short name)" msgid "BSD License" msgstr "BSD-lisens" -#: lib/kaboutdata.cpp:286 +#: lib/kaboutdata.cpp:293 msgctxt "KAboutLicense|@item license" msgid "BSD License" msgstr "BSD-lisens" -#: lib/kaboutdata.cpp:289 +#: lib/kaboutdata.cpp:296 msgctxt "KAboutLicense|@item license (short name)" msgid "Artistic License" msgstr "Kunstnerisk lisens" -#: lib/kaboutdata.cpp:290 +#: lib/kaboutdata.cpp:297 msgctxt "KAboutLicense|@item license" msgid "Artistic License" msgstr "Kunstnerisk lisens" -#: lib/kaboutdata.cpp:293 +#: lib/kaboutdata.cpp:300 msgctxt "KAboutLicense|@item license (short name)" msgid "QPL v1.0" msgstr "QPL v1.0" -#: lib/kaboutdata.cpp:294 +#: lib/kaboutdata.cpp:301 msgctxt "KAboutLicense|@item license" msgid "Q Public License" msgstr "Q Public License" -#: lib/kaboutdata.cpp:297 +#: lib/kaboutdata.cpp:304 msgctxt "KAboutLicense|@item license (short name)" msgid "GPL v3" msgstr "GPL v3" -#: lib/kaboutdata.cpp:298 +#: lib/kaboutdata.cpp:305 msgctxt "KAboutLicense|@item license" msgid "GNU General Public License Version 3" msgstr "GNU General Public License Version 3" -#: lib/kaboutdata.cpp:301 +#: lib/kaboutdata.cpp:308 msgctxt "KAboutLicense|@item license (short name)" msgid "LGPL v3" msgstr "LGPL v3" -#: lib/kaboutdata.cpp:302 +#: lib/kaboutdata.cpp:309 msgctxt "KAboutLicense|@item license" msgid "GNU Lesser General Public License Version 3" msgstr "GNU Lesser General Public License Version 3" -#: lib/kaboutdata.cpp:306 +#: lib/kaboutdata.cpp:313 msgctxt "KAboutLicense|@item license" msgid "Custom" msgstr "Tilpasset" -#: lib/kaboutdata.cpp:309 +#: lib/kaboutdata.cpp:316 msgctxt "KAboutLicense|@item license" msgid "Not specified" msgstr "Ikke oppgitt" -#: lib/kaboutdata.cpp:825 +#: lib/kaboutdata.cpp:832 msgctxt "KAboutData|replace this with information about your translation team" msgid "" "<p>KDE is translated into many languages thanks to the work of the " @@ -136,43 +136,43 @@ "org</a> eller <a href=\"http://www.skolelinux.org/no\";>http://www.skolelinux."; "org/no</a></p>" -#: lib/kaboutdata.cpp:978 +#: lib/kaboutdata.cpp:1042 msgctxt "KAboutData CLI|" msgid "Show author information." msgstr "Vis forfatterinformasjon" -#: lib/kaboutdata.cpp:979 +#: lib/kaboutdata.cpp:1043 msgctxt "KAboutData CLI|" msgid "Show license information." msgstr "Viser lisensinformasjon" -#: lib/kaboutdata.cpp:981 +#: lib/kaboutdata.cpp:1045 msgctxt "KAboutData CLI|" msgid "The base file name of the desktop entry for this application." msgstr "" -#: lib/kaboutdata.cpp:982 +#: lib/kaboutdata.cpp:1046 msgctxt "KAboutData CLI|" msgid "file name" msgstr "" -#: lib/kaboutdata.cpp:991 +#: lib/kaboutdata.cpp:1055 msgctxt "KAboutData CLI|" msgid "This application was written by somebody who wants to remain anonymous." msgstr "Dette programmet ble skrevet av noen som ønsker å være anonyme." -#: lib/kaboutdata.cpp:993 +#: lib/kaboutdata.cpp:1057 #, qt-format msgctxt "KAboutData CLI|" msgid "%1 was written by:" msgstr "" -#: lib/kaboutdata.cpp:1004 +#: lib/kaboutdata.cpp:1068 msgctxt "KAboutData CLI|" msgid "Please use http://bugs.kde.org to report bugs." msgstr "Bruk http://bugs.kde.org for å rapportere feil." -#: lib/kaboutdata.cpp:1006 +#: lib/kaboutdata.cpp:1070 #, qt-format msgctxt "KAboutData CLI|" msgid "Please report bugs to %1." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.22.0/po/nn/kcoreaddons5_qt.po new/kcoreaddons-5.23.0/po/nn/kcoreaddons5_qt.po --- old/kcoreaddons-5.22.0/po/nn/kcoreaddons5_qt.po 2016-05-07 17:08:21.000000000 +0200 +++ new/kcoreaddons-5.23.0/po/nn/kcoreaddons5_qt.po 2016-06-06 13:29:26.000000000 +0200 @@ -23,7 +23,7 @@ "X-Text-Markup: qtrich\n" "X-Qt-Contexts: true\n" -#: lib/kaboutdata.cpp:243 +#: lib/kaboutdata.cpp:250 msgctxt "KAboutLicense|" msgid "" "No licensing terms for this program have been specified.\n" @@ -34,93 +34,93 @@ "Du finn kanskje lisensvilkåra i hjelpeteksten\n" "eller kjeldekoden.\n" -#: lib/kaboutdata.cpp:251 +#: lib/kaboutdata.cpp:258 #, qt-format msgctxt "KAboutLicense|" msgid "This program is distributed under the terms of the %1." msgstr "Dette programmet er distribuert etter vilkåra i %1." -#: lib/kaboutdata.cpp:277 +#: lib/kaboutdata.cpp:284 msgctxt "KAboutLicense|@item license (short name)" msgid "GPL v2" msgstr "GPL v2" -#: lib/kaboutdata.cpp:278 +#: lib/kaboutdata.cpp:285 msgctxt "KAboutLicense|@item license" msgid "GNU General Public License Version 2" msgstr "GNU General Public License versjon 2" -#: lib/kaboutdata.cpp:281 +#: lib/kaboutdata.cpp:288 msgctxt "KAboutLicense|@item license (short name)" msgid "LGPL v2" msgstr "LGPL v2" -#: lib/kaboutdata.cpp:282 +#: lib/kaboutdata.cpp:289 msgctxt "KAboutLicense|@item license" msgid "GNU Lesser General Public License Version 2" msgstr "GNU Lesser General Public License versjon 2" -#: lib/kaboutdata.cpp:285 +#: lib/kaboutdata.cpp:292 msgctxt "KAboutLicense|@item license (short name)" msgid "BSD License" msgstr "BSD-lisensen" -#: lib/kaboutdata.cpp:286 +#: lib/kaboutdata.cpp:293 msgctxt "KAboutLicense|@item license" msgid "BSD License" msgstr "BSD-lisensen" -#: lib/kaboutdata.cpp:289 +#: lib/kaboutdata.cpp:296 msgctxt "KAboutLicense|@item license (short name)" msgid "Artistic License" msgstr "Artistic-lisensen" -#: lib/kaboutdata.cpp:290 +#: lib/kaboutdata.cpp:297 msgctxt "KAboutLicense|@item license" msgid "Artistic License" msgstr "Artistic-lisensen" -#: lib/kaboutdata.cpp:293 +#: lib/kaboutdata.cpp:300 msgctxt "KAboutLicense|@item license (short name)" msgid "QPL v1.0" msgstr "QPL v1.0" -#: lib/kaboutdata.cpp:294 +#: lib/kaboutdata.cpp:301 msgctxt "KAboutLicense|@item license" msgid "Q Public License" msgstr "Q Public License" -#: lib/kaboutdata.cpp:297 +#: lib/kaboutdata.cpp:304 msgctxt "KAboutLicense|@item license (short name)" msgid "GPL v3" msgstr "GPL v3" -#: lib/kaboutdata.cpp:298 +#: lib/kaboutdata.cpp:305 msgctxt "KAboutLicense|@item license" msgid "GNU General Public License Version 3" msgstr "GNU General Public License versjon 3" -#: lib/kaboutdata.cpp:301 +#: lib/kaboutdata.cpp:308 msgctxt "KAboutLicense|@item license (short name)" msgid "LGPL v3" msgstr "LGPL v3" -#: lib/kaboutdata.cpp:302 +#: lib/kaboutdata.cpp:309 msgctxt "KAboutLicense|@item license" msgid "GNU Lesser General Public License Version 3" msgstr "GNU Lesser General Public License versjon 3" -#: lib/kaboutdata.cpp:306 +#: lib/kaboutdata.cpp:313 msgctxt "KAboutLicense|@item license" msgid "Custom" msgstr "Tilpassa" -#: lib/kaboutdata.cpp:309 +#: lib/kaboutdata.cpp:316 msgctxt "KAboutLicense|@item license" msgid "Not specified" msgstr "Ikkje oppgjevne" -#: lib/kaboutdata.cpp:825 +#: lib/kaboutdata.cpp:832 msgctxt "KAboutData|replace this with information about your translation team" msgid "" "<p>KDE is translated into many languages thanks to the work of the " @@ -142,43 +142,43 @@ "korrekturlesarar!</p><p>Du finn meir informasjon om internasjonaliseringa av " "KDE på <a href=\"http://l10n.kde.org/\";>http://l10n.kde.org/</a>.</p>" -#: lib/kaboutdata.cpp:978 +#: lib/kaboutdata.cpp:1042 msgctxt "KAboutData CLI|" msgid "Show author information." msgstr "Vis forfattarinformasjon." -#: lib/kaboutdata.cpp:979 +#: lib/kaboutdata.cpp:1043 msgctxt "KAboutData CLI|" msgid "Show license information." msgstr "Vis lisensinformasjon." -#: lib/kaboutdata.cpp:981 +#: lib/kaboutdata.cpp:1045 msgctxt "KAboutData CLI|" msgid "The base file name of the desktop entry for this application." msgstr "Filnamn-stamme til skrivebordsoppføringa til programmet." -#: lib/kaboutdata.cpp:982 +#: lib/kaboutdata.cpp:1046 msgctxt "KAboutData CLI|" msgid "file name" msgstr "filnamn" -#: lib/kaboutdata.cpp:991 +#: lib/kaboutdata.cpp:1055 msgctxt "KAboutData CLI|" msgid "This application was written by somebody who wants to remain anonymous." msgstr "Dette programmet er skrive av nokon som vil vera anonyme." -#: lib/kaboutdata.cpp:993 +#: lib/kaboutdata.cpp:1057 #, qt-format msgctxt "KAboutData CLI|" msgid "%1 was written by:" msgstr "%1 er skrive av:" -#: lib/kaboutdata.cpp:1004 +#: lib/kaboutdata.cpp:1068 msgctxt "KAboutData CLI|" msgid "Please use http://bugs.kde.org to report bugs." msgstr "Bruk http://bugs.kde.org/ for å melda frå om feil." -#: lib/kaboutdata.cpp:1006 +#: lib/kaboutdata.cpp:1070 #, qt-format msgctxt "KAboutData CLI|" msgid "Please report bugs to %1." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.22.0/src/lib/caching/kshareddatacache.cpp new/kcoreaddons-5.23.0/src/lib/caching/kshareddatacache.cpp --- old/kcoreaddons-5.22.0/src/lib/caching/kshareddatacache.cpp 2016-05-07 17:08:21.000000000 +0200 +++ new/kcoreaddons-5.23.0/src/lib/caching/kshareddatacache.cpp 2016-06-06 13:29:26.000000000 +0200 @@ -84,7 +84,7 @@ int align = reinterpret_cast<quintptr>(data) & 3; - if (align & (len >= 4)) { + if (align && len >= 4) { // Pre-load the temp registers unsigned int t = 0, d = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.22.0/src/lib/io/kdirwatch.cpp new/kcoreaddons-5.23.0/src/lib/io/kdirwatch.cpp --- old/kcoreaddons-5.22.0/src/lib/io/kdirwatch.cpp 2016-05-07 17:08:21.000000000 +0200 +++ new/kcoreaddons-5.23.0/src/lib/io/kdirwatch.cpp 2016-06-06 13:29:26.000000000 +0200 @@ -88,7 +88,7 @@ Q_LOGGING_CATEGORY(KDIRWATCH, "kf5.kcoreaddons.kdirwatch", QtWarningMsg) // set this to true for much more verbose debug output -static const bool s_verboseDebug = false; +static bool s_verboseDebug = false; static QThreadStorage<KDirWatchPrivate *> dwp_self; static KDirWatchPrivate *createPrivate() @@ -179,6 +179,10 @@ #endif _isStopped(false) { + // Debug unittest on CI + if (qAppName() == QLatin1String("kservicetest") || qAppName() == QLatin1String("filetypestest")) { + s_verboseDebug = true; + } timer.setObjectName(QStringLiteral("KDirWatchPrivate::timer")); connect(&timer, SIGNAL(timeout()), this, SLOT(slotRescan())); @@ -324,9 +328,9 @@ const QString tpath = e->path + QLatin1Char('/') + path; - //if (s_verboseDebug) { - // qCDebug(KDIRWATCH) << "got event" << "0x"+QString::number(event->mask, 16) << "for" << e->path; - //} + if (s_verboseDebug) { + qCDebug(KDIRWATCH).nospace() << "got event 0x" << qPrintable(QString::number(event->mask, 16)) << " for " << e->path; + } if (event->mask & IN_DELETE_SELF) { if (s_verboseDebug) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.22.0/src/lib/plugin/kpluginloader.h new/kcoreaddons-5.23.0/src/lib/plugin/kpluginloader.h --- old/kcoreaddons-5.22.0/src/lib/plugin/kpluginloader.h 2016-05-07 17:08:21.000000000 +0200 +++ new/kcoreaddons-5.23.0/src/lib/plugin/kpluginloader.h 2016-06-06 13:29:26.000000000 +0200 @@ -287,7 +287,7 @@ * } else { * return pluginGroup.readEntry(md.pluginName(), false); * } - * } + * }; * QList<QObject*> plugins = KPluginLoader::instantiatePlugins("myapp", filter); * @endcode * @@ -298,7 +298,14 @@ * @param filter a callback function that returns @c true if the found plugin should be loaded * and @c false if it should be skipped. If this argument is omitted all plugins will be loaded. * - * @param parent the parent to set for the instantiated plugins + * @param parent the parent to set for the instantiated plugins, if the + * plugins were not already loaded. + * + * @note If the plugins have been previously loaded (via QPluginLoader, + * directly or due to this class) without being deleted in the meantime + * then they are not re-created or re-parented and will be returned using + * the parent they were originally created with. @sa + * QPluginLoader::instance(). * * @return a list containing an instantiation of each plugin that met the filter criteria * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.22.0/src/lib/plugin/kpluginmetadata.cpp new/kcoreaddons-5.23.0/src/lib/plugin/kpluginmetadata.cpp --- old/kcoreaddons-5.22.0/src/lib/plugin/kpluginmetadata.cpp 2016-05-07 17:08:21.000000000 +0200 +++ new/kcoreaddons-5.23.0/src/lib/plugin/kpluginmetadata.cpp 2016-06-06 13:29:26.000000000 +0200 @@ -174,8 +174,9 @@ return value.toVariant().toStringList(); } else { QString asString = value.isString() ? value.toString() : value.toVariant().toString(); + const QString id = obj.value(QStringLiteral("KPlugin")).toObject().value(QStringLiteral("Id")).toString(); qWarning() << "Expected JSON property" << key << "to be a string list." - " Treating it as a list with a single entry:" << asString; + " Treating it as a list with a single entry:" << asString << id.toLatin1().constData(); return QStringList(asString); } } @@ -187,7 +188,7 @@ if (it != jo.constEnd()) { return it.value(); } - const QString language = languageWithCountry.mid(0, languageWithCountry.indexOf(QLatin1Char('_'))); + const QStringRef language = languageWithCountry.midRef(0, languageWithCountry.indexOf(QLatin1Char('_'))); it = jo.constFind(key + QLatin1Char('[') + language + QLatin1Char(']')); if (it != jo.constEnd()) { return it.value(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.22.0/src/lib/util/kdelibs4configmigrator.cpp new/kcoreaddons-5.23.0/src/lib/util/kdelibs4configmigrator.cpp --- old/kcoreaddons-5.22.0/src/lib/util/kdelibs4configmigrator.cpp 2016-05-07 17:08:21.000000000 +0200 +++ new/kcoreaddons-5.23.0/src/lib/util/kdelibs4configmigrator.cpp 2016-06-06 13:29:26.000000000 +0200 @@ -25,9 +25,13 @@ #include <QFile> #include <QFileInfo> #include <QDir> -#include <QDebug> +#include <QLoggingCategory> #include <QPluginLoader> +Q_DECLARE_LOGGING_CATEGORY(MIGRATOR) +// logging category for this framework, default: log stuff >= warning +Q_LOGGING_CATEGORY(MIGRATOR, "kf5.kcoreaddons.kdelibs4configmigrator", QtWarningMsg) + class Kdelibs4ConfigMigrator::Private { public: @@ -70,6 +74,8 @@ return false; } + bool didSomething = false; + Q_FOREACH (const QString &configFileName, d->configFiles) { const QString newConfigLocation = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) @@ -84,8 +90,10 @@ const QString oldConfigFile(migration.locateLocal("config", configFileName)); if (!oldConfigFile.isEmpty()) { - QFile(oldConfigFile).copy(newConfigLocation); - qDebug()<<"old config "<<oldConfigFile << " was migrated to "<<newConfigLocation; + if (QFile(oldConfigFile).copy(newConfigLocation)) { + didSomething = true; + qCDebug(MIGRATOR) << "config file" << oldConfigFile << "was migrated to" << newConfigLocation; + } } } @@ -104,17 +112,22 @@ const QString oldConfigFile(migration.locateLocal("data", d->appName + QLatin1Char('/') + uiFileName)); if (!oldConfigFile.isEmpty()) { - QFile(oldConfigFile).copy(newConfigLocation); - qDebug()<<"old config "<<oldConfigFile << " was migrated to "<<newConfigLocation; + if (QFile(oldConfigFile).copy(newConfigLocation)) { + didSomething = true; + qCDebug(MIGRATOR) << "ui file" << oldConfigFile << "was migrated to" << newConfigLocation; + } } } } // Trigger KSharedConfig::openConfig()->reparseConfiguration() via the framework integration plugin - QPluginLoader lib(QStringLiteral("kf5/FrameworkIntegrationPlugin")); - QObject *rootObj = lib.instance(); - if (rootObj) { - QMetaObject::invokeMethod(rootObj, "reparseConfiguration"); + if (didSomething) { + QPluginLoader lib(QStringLiteral("kf5/FrameworkIntegrationPlugin")); + QObject *rootObj = lib.instance(); + if (rootObj) { + QMetaObject::invokeMethod(rootObj, "reparseConfiguration"); + } } + return true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.22.0/src/lib/util/kformat.cpp new/kcoreaddons-5.23.0/src/lib/util/kformat.cpp --- old/kcoreaddons-5.22.0/src/lib/util/kformat.cpp 2016-05-07 17:08:21.000000000 +0200 +++ new/kcoreaddons-5.23.0/src/lib/util/kformat.cpp 2016-06-06 13:29:26.000000000 +0200 @@ -34,6 +34,12 @@ { } +KFormat& KFormat::operator=(const KFormat &other) +{ + d = other.d; + return *this; +} + KFormat::~KFormat() { } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.22.0/src/lib/util/kformat.h new/kcoreaddons-5.23.0/src/lib/util/kformat.h --- old/kcoreaddons-5.22.0/src/lib/util/kformat.h 2016-05-07 17:08:21.000000000 +0200 +++ new/kcoreaddons-5.23.0/src/lib/util/kformat.h 2016-06-06 13:29:26.000000000 +0200 @@ -159,6 +159,8 @@ */ KFormat(const KFormat &other); + KFormat& operator=(const KFormat &other); + /** * Destructor */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcoreaddons-5.22.0/src/mimetypes/kde5.xml new/kcoreaddons-5.23.0/src/mimetypes/kde5.xml --- old/kcoreaddons-5.22.0/src/mimetypes/kde5.xml 2016-05-07 17:08:21.000000000 +0200 +++ new/kcoreaddons-5.23.0/src/mimetypes/kde5.xml 2016-06-06 13:29:26.000000000 +0200 @@ -3707,7 +3707,7 @@ <comment xml:lang="uk">електронна книга Mobipocket</comment> <comment xml:lang="zh_CN">Mobipocket 电子书</comment> <comment xml:lang="zh_TW">Mobipocket e-book</comment> - <sub-class-of type="application/x-palm-database"/> + <sub-class-of type="application/vnd.palm"/> <generic-icon name="x-office-document"/> <glob pattern="*.mobi"/> <glob pattern="*.prc" />
