Hello community, here is the log from the commit of package kcmutils for openSUSE:Factory checked in at 2020-03-19 19:41:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcmutils (Old) and /work/SRC/openSUSE:Factory/.kcmutils.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kcmutils" Thu Mar 19 19:41:48 2020 rev:78 rq:785302 version:5.68.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kcmutils/kcmutils.changes 2020-02-20 14:53:35.078075795 +0100 +++ /work/SRC/openSUSE:Factory/.kcmutils.new.3160/kcmutils.changes 2020-03-19 19:43:40.843965609 +0100 @@ -1,0 +2,12 @@ +Sun Mar 8 09:17:37 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Update to 5.68.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.68.0.php +- Changes since 5.67.0: + * Make it compile against qt5.15. SkipEmptyParts is part of Qt::. + * Check activeModule before using it (kde#417396) +- Drop Check-activeModule-before-using-it.patch + +------------------------------------------------------------------- Old: ---- Check-activeModule-before-using-it.patch kcmutils-5.67.0.tar.xz kcmutils-5.67.0.tar.xz.sig New: ---- kcmutils-5.68.0.tar.xz kcmutils-5.68.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcmutils.spec ++++++ --- /var/tmp/diff_new_pack.lJXPFw/_old 2020-03-19 19:43:41.343965899 +0100 +++ /var/tmp/diff_new_pack.lJXPFw/_new 2020-03-19 19:43:41.347965902 +0100 @@ -17,14 +17,14 @@ %define lname libKF5KCMUtils5 -%define _tar_path 5.67 +%define _tar_path 5.68 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_without lang Name: kcmutils -Version: 5.67.0 +Version: 5.68.0 Release: 0 Summary: Classes to work with KCModules License: LGPL-2.1-or-later @@ -36,8 +36,6 @@ Source2: frameworks.keyring %endif Source99: baselibs.conf -# PATCH-FIX-UPSTREAM -Patch: Check-activeModule-before-using-it.patch BuildRequires: cmake >= 3.5 BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: fdupes @@ -89,7 +87,6 @@ %prep %setup -q -%autopatch -p1 %build %cmake_kf5 -d build ++++++ kcmutils-5.67.0.tar.xz -> kcmutils-5.68.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcmutils-5.67.0/.gitignore new/kcmutils-5.68.0/.gitignore --- old/kcmutils-5.67.0/.gitignore 2020-02-02 13:44:25.000000000 +0100 +++ new/kcmutils-5.68.0/.gitignore 2020-03-07 10:35:56.000000000 +0100 @@ -19,3 +19,4 @@ /build*/ CMakeLists.txt.user* *.unc-backup* +.cmake/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcmutils-5.67.0/CMakeLists.txt new/kcmutils-5.68.0/CMakeLists.txt --- old/kcmutils-5.67.0/CMakeLists.txt 2020-02-02 13:44:25.000000000 +0100 +++ new/kcmutils-5.68.0/CMakeLists.txt 2020-03-07 10:35:56.000000000 +0100 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.67.0") # handled by release scripts -set(KF5_DEP_VERSION "5.67.0") # handled by release scripts +set(KF5_VERSION "5.68.0") # handled by release scripts +set(KF5_DEP_VERSION "5.68.0") # handled by release scripts project(KCMUtils VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.67.0 NO_MODULE) +find_package(ECM 5.68.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -50,7 +50,7 @@ find_package(KF5Declarative ${KF5_DEP_VERSION} REQUIRED) add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00) -add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054200) +add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054300) add_definitions(-DTRANSLATION_DOMAIN=\"kcmutils5\") if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") ki18n_install(po) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcmutils-5.67.0/po/id/kcmutils5.po new/kcmutils-5.68.0/po/id/kcmutils5.po --- old/kcmutils-5.67.0/po/id/kcmutils5.po 2020-02-02 13:44:25.000000000 +0100 +++ new/kcmutils-5.68.0/po/id/kcmutils5.po 2020-03-07 10:35:56.000000000 +0100 @@ -2,7 +2,7 @@ # Copyright (C) 2010 This_file_is_part_of_KDE # This file is distributed under the same license as the kdelibs4 package. # Andhika Padmawan <[email protected]>, 2010-2014. -# Wantoyo <[email protected]>, 2017, 2018, 2019. +# Wantoyo <[email protected]>, 2017, 2018, 2019, 2020. # msgid "" msgstr "" @@ -17,7 +17,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 19.08.1\n" +"X-Generator: Lokalize 19.12.1\n" #, kde-format msgctxt "NAME OF TRANSLATORS" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcmutils-5.67.0/po/ko/kcmutils5.po new/kcmutils-5.68.0/po/ko/kcmutils5.po --- old/kcmutils-5.67.0/po/ko/kcmutils5.po 2020-02-02 13:44:25.000000000 +0100 +++ new/kcmutils-5.68.0/po/ko/kcmutils5.po 2020-03-07 10:35:56.000000000 +0100 @@ -8,7 +8,7 @@ "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-01-21 02:56+0100\n" -"PO-Revision-Date: 2020-01-28 23:47+0100\n" +"PO-Revision-Date: 2020-02-16 00:02+0100\n" "Last-Translator: Shinjo Park <[email protected]>\n" "Language-Team: Korean <[email protected]>\n" "Language: ko\n" @@ -161,7 +161,7 @@ #: kdeglobals.kcfg:35 #, kde-format msgid "What terminal application to use" -msgstr "사용할 터미널 응용 프로그램" +msgstr "사용할 터미널 프로그램" #. i18n: ectx: whatsthis, entry, group (General) #: kdeglobals.kcfg:37 @@ -170,8 +170,7 @@ "Whenever a terminal application is launched this terminal emulator program " "will be used.\n" msgstr "" -"터미널 응용 프로그램을 실행했을 경우 이 터미널 에뮬레이터 프로그램을 사용합니" -"다.\n" +"터미널 프로그램을 실행했을 경우 이 터미널 에뮬레이터 프로그램을 사용합니다.\n" #. i18n: ectx: label, entry, group (General) #: kdeglobals.kcfg:41 @@ -205,7 +204,7 @@ #: kdeglobals.kcfg:50 #, kde-format msgid "What font to use for menus in applications." -msgstr "응용 프로그램의 메뉴에 사용할 글꼴입니다." +msgstr "프로그램의 메뉴에 사용할 글꼴입니다." #. i18n: ectx: label, entry, group (General) #: kdeglobals.kcfg:53 @@ -237,8 +236,7 @@ msgid "" "What font to use for the panel at the bottom of the screen, where the " "currently running applications are." -msgstr "" -"현재 실행 중인 응용 프로그램이 있는 화면의 아래쪽 패널에 사용할 글꼴입니다." +msgstr "현재 실행 중인 프로그램이 있는 화면의 아래쪽 패널에 사용할 글꼴입니다." #. i18n: ectx: label, entry, group (General) #: kdeglobals.kcfg:64 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcmutils-5.67.0/po/ml/kcmutils5.po new/kcmutils-5.68.0/po/ml/kcmutils5.po --- old/kcmutils-5.67.0/po/ml/kcmutils5.po 2020-02-02 13:44:25.000000000 +0100 +++ new/kcmutils-5.68.0/po/ml/kcmutils5.po 2020-03-07 10:35:56.000000000 +0100 @@ -14,7 +14,7 @@ "POT-Creation-Date: 2020-01-21 02:56+0100\n" "PO-Revision-Date: 2019-12-12 21:04+0000\n" "Last-Translator: Vivek KJ Pazhedath <[email protected]>\n" -"Language-Team: <[email protected]>\n" +"Language-Team: SMC <smc.org.in>\n" "Language: ml\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcmutils-5.67.0/po/nb/kcmutils5.po new/kcmutils-5.68.0/po/nb/kcmutils5.po --- old/kcmutils-5.67.0/po/nb/kcmutils5.po 2020-02-02 13:44:25.000000000 +0100 +++ new/kcmutils-5.68.0/po/nb/kcmutils5.po 2020-03-07 10:35:56.000000000 +0100 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-12-19 02:46+0100\n" +"POT-Creation-Date: 2020-01-21 02:56+0100\n" "PO-Revision-Date: 2014-11-05 13:40+0100\n" "Last-Translator: Bjørn Steensrud <[email protected]>\n" "Language-Team: Norwegian Bokmål <[email protected]>\n" @@ -62,24 +62,24 @@ "<qt><p>Enten er maskin/programvaren som modulen setter opp ikke " "tilgjengelig, eller administrator har slått av modulen.</p></qt>" -#: kcmoduleloader.cpp:106 +#: kcmoduleloader.cpp:105 #, kde-format msgid "Error loading QML file." msgstr "" -#: kcmoduleloader.cpp:143 +#: kcmoduleloader.cpp:146 #, kde-format msgid "The module %1 is not a valid configuration module." msgstr "Modulen %1 er ikke en gyldig oppsettsmodul." -#: kcmoduleloader.cpp:144 +#: kcmoduleloader.cpp:147 #, kde-format msgid "" "<qt>The diagnosis is:<br />The desktop file %1 does not specify a library.</" "qt>" msgstr "<qt>Diagnosen er: <br />Skrivebordsfila %1 er ikke et bibliotek. </qt>" -#: kcmoduleloader.cpp:159 +#: kcmoduleloader.cpp:162 #, kde-format msgid "" "<qt><p>Possible reasons:<ul><li>An error occurred during your last system " @@ -109,7 +109,7 @@ msgid "Apply Settings" msgstr "Ta i bruk endringer" -#: kcmultidialog.cpp:228 kpluginselector.cpp:723 +#: kcmultidialog.cpp:245 kpluginselector.cpp:727 #, kde-format msgid "Configure" msgstr "Oppsett" @@ -494,7 +494,7 @@ msgid "Search..." msgstr "" -#: kpluginselector.cpp:718 +#: kpluginselector.cpp:722 #, kde-format msgid "About" msgstr "Om" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcmutils-5.67.0/po/nn/kcmutils5.po new/kcmutils-5.68.0/po/nn/kcmutils5.po --- old/kcmutils-5.67.0/po/nn/kcmutils5.po 2020-02-02 13:44:25.000000000 +0100 +++ new/kcmutils-5.68.0/po/nn/kcmutils5.po 2020-03-07 10:35:56.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-12-19 02:46+0100\n" +"POT-Creation-Date: 2020-01-21 02:56+0100\n" "PO-Revision-Date: 2019-10-26 12:28+0200\n" "Last-Translator: Karl Ove Hufthammer <[email protected]>\n" "Language-Team: Norwegian Nynorsk <[email protected]>\n" @@ -58,17 +58,17 @@ "<qt><p>Anten er maskinvara/programvara modulen set opp utilgjengeleg eller " "modulen er slått av av ein administrator.</p></qt>" -#: kcmoduleloader.cpp:106 +#: kcmoduleloader.cpp:105 #, kde-format msgid "Error loading QML file." msgstr "Feil ved lasting av QML-fil." -#: kcmoduleloader.cpp:143 +#: kcmoduleloader.cpp:146 #, kde-format msgid "The module %1 is not a valid configuration module." msgstr "Modulen %1 er ingen gyldig oppsettsmodul." -#: kcmoduleloader.cpp:144 +#: kcmoduleloader.cpp:147 #, kde-format msgid "" "<qt>The diagnosis is:<br />The desktop file %1 does not specify a library.</" @@ -77,7 +77,7 @@ "<qt>Diagnosen er: <br />Skrivebordsfila %1 oppgjev ikkje noko bibliotek. </" "qt>" -#: kcmoduleloader.cpp:159 +#: kcmoduleloader.cpp:162 #, kde-format msgid "" "<qt><p>Possible reasons:<ul><li>An error occurred during your last system " @@ -113,7 +113,7 @@ msgid "Apply Settings" msgstr "Bruk innstillingar" -#: kcmultidialog.cpp:228 kpluginselector.cpp:723 +#: kcmultidialog.cpp:245 kpluginselector.cpp:727 #, kde-format msgid "Configure" msgstr "Oppsett" @@ -492,7 +492,7 @@ msgid "Search..." msgstr "Søk …" -#: kpluginselector.cpp:718 +#: kpluginselector.cpp:722 #, kde-format msgid "About" msgstr "Om" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcmutils-5.67.0/po/se/kcmutils5.po new/kcmutils-5.68.0/po/se/kcmutils5.po --- old/kcmutils-5.67.0/po/se/kcmutils5.po 2020-02-02 13:44:25.000000000 +0100 +++ new/kcmutils-5.68.0/po/se/kcmutils5.po 2020-03-07 10:35:56.000000000 +0100 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2019-12-19 02:46+0100\n" +"POT-Creation-Date: 2020-01-21 02:56+0100\n" "PO-Revision-Date: 2012-05-30 23:19+0200\n" "Last-Translator: Børre Gaup <[email protected]>\n" "Language-Team: Northern Sami <[email protected]>\n" @@ -55,17 +55,17 @@ "<qt> <p>Mašiidnagálvu dahje prográmma maid modula heiveha ii leat olámuttus " "dahje hálddašeaddji lea čiehkkán modula.</p> </qt>" -#: kcmoduleloader.cpp:106 +#: kcmoduleloader.cpp:105 #, kde-format msgid "Error loading QML file." msgstr "" -#: kcmoduleloader.cpp:143 +#: kcmoduleloader.cpp:146 #, kde-format msgid "The module %1 is not a valid configuration module." msgstr "%1-modula ii leat gustojeaddji heivehusmodula." -#: kcmoduleloader.cpp:144 +#: kcmoduleloader.cpp:147 #, kde-format msgid "" "<qt>The diagnosis is:<br />The desktop file %1 does not specify a library.</" @@ -73,7 +73,7 @@ msgstr "" "<qt>Diagnosa lea:<br />Čállinbeavdefiillas %1 ii meroštuvvo bibliotehka.</qt>" -#: kcmoduleloader.cpp:159 +#: kcmoduleloader.cpp:162 #, kde-format msgid "" "<qt><p>Possible reasons:<ul><li>An error occurred during your last system " @@ -103,7 +103,7 @@ msgid "Apply Settings" msgstr "Geavat heivehusaid" -#: kcmultidialog.cpp:228 kpluginselector.cpp:723 +#: kcmultidialog.cpp:245 kpluginselector.cpp:727 #, kde-format msgid "Configure" msgstr "Heivet" @@ -484,7 +484,7 @@ msgid "Search..." msgstr "" -#: kpluginselector.cpp:718 +#: kpluginselector.cpp:722 #, kde-format msgid "About" msgstr "Dieđut" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcmutils-5.67.0/src/kcmodulecontainer.cpp new/kcmutils-5.68.0/src/kcmodulecontainer.cpp --- old/kcmutils-5.67.0/src/kcmodulecontainer.cpp 2020-02-02 13:44:25.000000000 +0100 +++ new/kcmutils-5.68.0/src/kcmodulecontainer.cpp 2020-03-07 10:35:56.000000000 +0100 @@ -64,7 +64,11 @@ /***********************************************************************/ KCModuleContainer::KCModuleContainer(QWidget *parent, const QString &mods) : KCModule(parent), +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) d(new KCModuleContainerPrivate(QString(mods).remove(QLatin1Char(' ')).split(QLatin1Char(','), QString::SkipEmptyParts))) +#else + d(new KCModuleContainerPrivate(QString(mods).remove(QLatin1Char(' ')).split(QLatin1Char(','), Qt::SkipEmptyParts))) +#endif { init(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcmutils-5.67.0/src/kcmultidialog.cpp new/kcmutils-5.68.0/src/kcmultidialog.cpp --- old/kcmutils-5.67.0/src/kcmultidialog.cpp 2020-02-02 13:44:25.000000000 +0100 +++ new/kcmutils-5.68.0/src/kcmultidialog.cpp 2020-03-07 10:35:56.000000000 +0100 @@ -181,7 +181,7 @@ #endif } - auto buttons = activeModule->buttons(); + auto buttons = activeModule ? activeModule->buttons() : KCModule::NoAdditionalButton; QPushButton *resetButton = q->buttonBox()->button(QDialogButtonBox::Reset); if (resetButton) {
