Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kservice for openSUSE:Factory checked in at 2021-07-15 23:59:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kservice (Old) and /work/SRC/openSUSE:Factory/.kservice.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kservice" Thu Jul 15 23:59:59 2021 rev:97 rq:905525 version:5.84.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kservice/kservice.changes 2021-06-16 20:35:48.567219347 +0200 +++ /work/SRC/openSUSE:Factory/.kservice.new.2625/kservice.changes 2021-07-16 00:01:48.072891181 +0200 @@ -1,0 +2,13 @@ +Sun Jul 4 07:45:47 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 5.84.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.84.0 +- Changes since 5.83.0: + * Pump minimum Bison version to 3.0 + * Workaround flatpak having fixed modify date for all files + * Instantiate a single TimestampChecker in KSycocaPrivate::needsRebuild + * Remove unused includes + +------------------------------------------------------------------- Old: ---- kservice-5.83.0.tar.xz kservice-5.83.0.tar.xz.sig New: ---- kservice-5.84.0.tar.xz kservice-5.84.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kservice.spec ++++++ --- /var/tmp/diff_new_pack.MS2hrA/_old 2021-07-16 00:01:48.628886552 +0200 +++ /var/tmp/diff_new_pack.MS2hrA/_new 2021-07-16 00:01:48.632886518 +0200 @@ -16,14 +16,14 @@ # -%define _tar_path 5.83 +%define _tar_path 5.84 # 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: kservice -Version: 5.83.0 +Version: 5.84.0 Release: 0 Summary: Plugin framework for desktop services License: LGPL-2.1-or-later ++++++ kservice-5.83.0.tar.xz -> kservice-5.84.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.83.0/CMakeLists.txt new/kservice-5.84.0/CMakeLists.txt --- old/kservice-5.83.0/CMakeLists.txt 2021-06-05 11:23:46.000000000 +0200 +++ new/kservice-5.84.0/CMakeLists.txt 2021-07-03 14:17:44.000000000 +0200 @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.83.0") # handled by release scripts -set(KF_DEP_VERSION "5.83.0") # handled by release scripts +set(KF_VERSION "5.84.0") # handled by release scripts +set(KF_DEP_VERSION "5.84.0") # handled by release scripts project(KService VERSION ${KF_VERSION}) # Disallow in-source build @@ -11,7 +11,7 @@ # ECM setup include(FeatureSummary) -find_package(ECM 5.83.0 NO_MODULE) +find_package(ECM 5.84.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) @@ -65,7 +65,7 @@ PURPOSE "Required for the Trader parser" ) -find_package(BISON 2.4.1 REQUIRED) +find_package(BISON 3.0 REQUIRED) set_package_properties(BISON PROPERTIES URL "http://www.gnu.org/software/bison"; DESCRIPTION "general-purpose parser generator" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.83.0/po/de/kservice5.po new/kservice-5.84.0/po/de/kservice5.po --- old/kservice-5.83.0/po/de/kservice5.po 2021-06-05 11:23:46.000000000 +0200 +++ new/kservice-5.84.0/po/de/kservice5.po 2021-07-03 14:17:44.000000000 +0200 @@ -21,7 +21,6 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 19.12.3\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.83.0/po/el/kservice5.po new/kservice-5.84.0/po/el/kservice5.po --- old/kservice-5.83.0/po/el/kservice5.po 2021-06-05 11:23:46.000000000 +0200 +++ new/kservice-5.84.0/po/el/kservice5.po 2021-07-03 14:17:44.000000000 +0200 @@ -14,21 +14,21 @@ # Petros Vidalis <[email protected]>, 2010, 2011. # Dimitrios Glentadakis <[email protected]>, 2010, 2011, 2012, 2013, 2014. # nikos, 2011. -# Stelios <[email protected]>, 2012, 2013. +# Stelios <[email protected]>, 2012, 2013, 2021. # Dimitris Kardarakos <[email protected]>, 2015. msgid "" msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-05-20 00:14+0000\n" -"PO-Revision-Date: 2015-11-06 11:46+0200\n" -"Last-Translator: Dimitris Kardarakos <[email protected]>\n" +"PO-Revision-Date: 2021-06-30 09:48+0300\n" +"Last-Translator: Stelios <[email protected]>\n" "Language-Team: Greek <[email protected]>\n" "Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 20.04.2\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #, kde-format @@ -194,7 +194,7 @@ #: kdeinit/ktoolinvocation_x11.cpp:340 #, kde-format msgid "Unable to determine the default terminal" -msgstr "" +msgstr "???????????????? ?????????????????????????? ?????? ?????????????????????????????? ????????????????????" #: kdeinit/ktoolinvocation_x11.cpp:352 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.83.0/po/en_GB/kservice5.po new/kservice-5.84.0/po/en_GB/kservice5.po --- old/kservice-5.83.0/po/en_GB/kservice5.po 2021-06-05 11:23:46.000000000 +0200 +++ new/kservice-5.84.0/po/en_GB/kservice5.po 2021-07-03 14:17:44.000000000 +0200 @@ -2,13 +2,13 @@ # Malcolm Hunter <[email protected]>, 2002,2003,2004, 2005, 2006, 2007, 2008, 2009. # Jonathan Riddell <[email protected]>, 2003. # Andrew Coles <[email protected]>, 2004, 2005, 2009, 2010. -# Steve Allewell <[email protected]>, 2014, 2015. +# Steve Allewell <[email protected]>, 2014, 2015, 2021. msgid "" msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-05-20 00:14+0000\n" -"PO-Revision-Date: 2015-09-20 16:56+0100\n" +"PO-Revision-Date: 2021-06-12 14:30+0100\n" "Last-Translator: Steve Allewell <[email protected]>\n" "Language-Team: British English <[email protected]>\n" "Language: en_GB\n" @@ -16,7 +16,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 1.5\n" +"X-Generator: Lokalize 21.04.1\n" #, kde-format msgctxt "NAME OF TRANSLATORS" @@ -173,7 +173,7 @@ #: kdeinit/ktoolinvocation_x11.cpp:340 #, kde-format msgid "Unable to determine the default terminal" -msgstr "" +msgstr "Unable to determine the default terminal" #: kdeinit/ktoolinvocation_x11.cpp:352 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.83.0/po/hi/kservice5.po new/kservice-5.84.0/po/hi/kservice5.po --- old/kservice-5.83.0/po/hi/kservice5.po 2021-06-05 11:23:46.000000000 +0200 +++ new/kservice-5.84.0/po/hi/kservice5.po 2021-07-03 14:17:44.000000000 +0200 @@ -5,112 +5,103 @@ # Ravishankar Shrivastava <[email protected]>, 2007. # Ravishankar Shrivastava <[email protected]>, 2008. # G Karunakar <[email protected]>, 2009, 2010, 2012. +# Sameer Singh <[email protected]>, 2021. +# Raghavendra Kamath <[email protected]>, 2021. msgid "" msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-05-20 00:14+0000\n" -"PO-Revision-Date: 2012-06-25 15:27+0530\n" -"Last-Translator: G Karunakar <[email protected]>\n" -"Language-Team: Hindi <[email protected]>\n" +"PO-Revision-Date: 2021-07-01 17:28+0530\n" +"Last-Translator: Raghavendra Kamath <[email protected]>\n" +"Language-Team: kde-hindi\n" "Language: hi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" -"X-Generator: Lokalize 1.2\n" +"X-Generator: Lokalize 21.04.2\n" #, kde-format msgctxt "NAME OF TRANSLATORS" msgid "Your names" -msgstr "????????????????????? ??????????????????????????????" +msgstr "????????????????????? ??????????????????????????????, ???????????? ????????????, ??????????????????????????? ????????????" #, kde-format msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" -msgstr "[email protected]" +msgstr "[email protected], [email protected], [email protected]" #: kbuildsycoca/kbuildsycoca_main.cpp:47 -#, fuzzy, kde-format -#| msgid "KBuildSycoca" +#, kde-format msgctxt "application name" msgid "KBuildSycoca" msgstr "??????-???????????????-?????????????????????" #: kbuildsycoca/kbuildsycoca_main.cpp:49 -#, fuzzy, kde-format -#| msgid "Rebuilds the system configuration cache." +#, kde-format msgctxt "application description" msgid "Rebuilds the system configuration cache." -msgstr "??????????????? ???????????????????????????????????? ????????? ????????? ????????????????????? ????????????" +msgstr "?????????????????? ????????????????????? ???????????? ????????? ????????????????????? ???????????? ?????????" #: kbuildsycoca/kbuildsycoca_main.cpp:51 -#, fuzzy, kde-format -#| msgid "(c) 1999-2002 KDE Developers" +#, kde-format msgctxt "@info:credit" msgid "Copyright 1999-2014 KDE Developers" -msgstr "(c) 1998-2002 ??????????????? ????????????????????????" +msgstr "?????????????????????????????? ???????????????????????? ????????????-???????????? ??????????????? ??????????????????????????????" #: kbuildsycoca/kbuildsycoca_main.cpp:52 -#, fuzzy, kde-format -#| msgid "David Faure" +#, kde-format msgctxt "@info:credit" msgid "David Faure" msgstr "??????????????? ???????????????" #: kbuildsycoca/kbuildsycoca_main.cpp:52 kbuildsycoca/kbuildsycoca_main.cpp:53 -#, fuzzy, kde-format -#| msgid "Author" +#, kde-format msgctxt "@info:credit" msgid "Author" msgstr "????????????" #: kbuildsycoca/kbuildsycoca_main.cpp:53 -#, fuzzy, kde-format -#| msgid "Waldo Bastian" +#, kde-format msgctxt "@info:credit" msgid "Waldo Bastian" msgstr "?????????????????? ???????????????????????????" #: kbuildsycoca/kbuildsycoca_main.cpp:60 -#, fuzzy, kde-format -#| msgid "Disable checking files (dangerous)" +#, kde-format msgctxt "@info:shell command-line option" msgid "" "Do not signal applications to update (deprecated, no longer having any " "effect)" -msgstr "??????????????? ???????????? ??????????????? ???????????? (??????????????????)" +msgstr "????????????????????????????????? ?????? ?????????????????? ?????? ??????????????? ??? ????????? (??????????????????, ?????? ????????? ?????????????????? ????????????)" #: kbuildsycoca/kbuildsycoca_main.cpp:62 -#, fuzzy, kde-format -#| msgid "Disable incremental update, re-read everything" +#, kde-format msgctxt "@info:shell command-line option" msgid "Disable incremental update, re-read everything" -msgstr "????????????????????????????????? ??????????????? ??????????????? ????????????, ????????? ????????? ?????? ???????????????" +msgstr "????????????????????? ?????????????????? ??????????????? ????????????, ????????? ????????? ?????? ???????????????" #: kbuildsycoca/kbuildsycoca_main.cpp:64 #, kde-format msgctxt "@info:shell command-line option" msgid "Check file timestamps (deprecated, no longer having any effect)" -msgstr "" +msgstr "???????????? ?????? ?????????????????????????????? ?????????????????? (??????????????????, ?????? ????????? ?????????????????? ????????????)" #: kbuildsycoca/kbuildsycoca_main.cpp:66 -#, fuzzy, kde-format -#| msgid "Disable checking files (dangerous)" +#, kde-format msgctxt "@info:shell command-line option" msgid "Disable checking files (deprecated, no longer having any effect)" -msgstr "??????????????? ???????????? ??????????????? ???????????? (??????????????????)" +msgstr "???????????? ???????????? ??????????????? ???????????? (??????????????????, ?????? ????????? ?????????????????? ????????????)" #: kbuildsycoca/kbuildsycoca_main.cpp:67 -#, fuzzy, kde-format -#| msgid "Perform menu generation test run only" +#, kde-format msgctxt "@info:shell command-line option" msgid "Perform menu generation test run only" -msgstr "??????????????? ?????????????????? ?????????????????? ??????????????? ?????? ???????????? ????????????" +msgstr "???????????? ???????????? ????????????????????? ???????????? ????????? ???????????? ????????????" #: kbuildsycoca/kbuildsycoca_main.cpp:69 -#, fuzzy, kde-format -#| msgid "Track menu id for debug purposes" +#, kde-format msgctxt "@info:shell command-line option" msgid "Track menu id for debug purposes" msgstr "???????????? ??????????????????????????? ?????? ????????? ?????????????????? ???????????? ??????????????? ????????????" @@ -119,12 +110,12 @@ #, kde-format msgctxt "@info:shell command-line option" msgid "Switch QStandardPaths to test mode, for unit tests only" -msgstr "" +msgstr "?????????????????????????????????????????????????????? ?????? ????????????????????? ????????? ????????? ???????????????, ???????????? ???????????? ????????????????????? ?????? ?????????" #: kdeinit/ktoolinvocation.cpp:60 #, kde-format msgid "Function must be called from the main thread." -msgstr "?????????????????? ?????? ??????????????? ??????????????? ?????? ????????? ???????????? ???????????? ???????????????." +msgstr "????????????????????? ?????? ??????????????? ??????????????? ?????? ????????? ???????????? ???????????? ??????????????????" #: kdeinit/ktoolinvocation.cpp:101 #, kde-format @@ -132,6 +123,8 @@ "Error launching %1. Either KLauncher is not running anymore, or it failed to " "start the application." msgstr "" +"%1 ??????????????? ????????? ????????????????????? ?????? ?????? ??????-?????????????????? ????????? ?????? ???????????? ?????????, ?????? ????????? ?????? ??????????????????????????? ??????????????? ????????? ???????????? " +"?????? ????????? ?????????" #: kdeinit/ktoolinvocation.cpp:104 #, kde-format @@ -139,7 +132,7 @@ "KLauncher could not be reached via D-Bus. Error when calling %1:\n" "%2\n" msgstr "" -"?????? ??????????????? ??????_?????? ?????? ???????????? ??????????????? ???????????? ????????????. %1 ?????? ????????? ???????????? ?????? ??????????????? ??????????????????:\n" +"?????? ??????????????? ??????_?????? ?????? ???????????? ??????????????? ???????????? ??????????????? %1 ?????? ????????? ???????????? ?????? ??????????????? ??????????????????:\n" "%2\n" #: kdeinit/ktoolinvocation_x11.cpp:232 @@ -149,14 +142,14 @@ "\n" "%1" msgstr "" -"????????? ????????????????????? ?????? ????????? ????????? ?????? ?????????:\n" +"????????? ????????????????????? ?????? ???????????? ????????? ?????? ?????????:\n" "\n" "%1" #: kdeinit/ktoolinvocation_x11.cpp:233 #, kde-format msgid "Could not launch Mail Client" -msgstr "????????? ????????????????????? ?????? ????????? ????????? ?????? ?????????" +msgstr "????????? ????????????????????? ?????? ???????????? ????????? ?????? ?????????" #. i18n("Could not launch %1:\n\n%2", exe, error), #. i18n("Could not launch %1:\n\n%2", htmlApp->exec(), error), @@ -169,7 +162,7 @@ "\n" "%1" msgstr "" -"???????????????????????? ?????? ????????? ????????? ?????? ?????????:\n" +"???????????????????????? ?????? ???????????? ????????? ?????? ?????????:\n" "\n" "%1" @@ -177,12 +170,12 @@ #: kdeinit/ktoolinvocation_x11.cpp:327 #, kde-format msgid "Could not launch Browser" -msgstr "???????????????????????? ?????? ???????????? ???????????? ?????? ?????????" +msgstr "???????????????????????? ?????? ???????????? ???????????? ?????? ?????????" #: kdeinit/ktoolinvocation_x11.cpp:340 #, kde-format msgid "Unable to determine the default terminal" -msgstr "" +msgstr "????????????????????????????????? ????????????????????? ??????????????????????????? ???????????? ????????? ??????????????????" #: kdeinit/ktoolinvocation_x11.cpp:352 #, kde-format @@ -191,19 +184,19 @@ "\n" "%1" msgstr "" -"????????????????????? ????????????????????? ?????? ????????? ????????? ?????? ?????????:\n" +"????????????????????? ????????????????????? ?????? ???????????? ????????? ?????? ?????????:\n" "\n" "%1" #: kdeinit/ktoolinvocation_x11.cpp:353 #, kde-format msgid "Could not launch Terminal Client" -msgstr "????????????????????? ????????????????????? ?????? ???????????? ???????????? ?????? ?????????" +msgstr "????????????????????? ????????????????????? ?????? ???????????? ???????????? ?????? ?????????" #: plugin/kdbusservicestarter.cpp:68 #, kde-format msgid "No service implementing %1" -msgstr "" +msgstr "????????? ???????????? %1 ???????????? ???????????? ?????? ?????????" #: services/kservice.cpp:1041 #, kde-format @@ -213,4 +206,4 @@ #: services/kservice.cpp:1045 #, kde-format msgid "The service '%1' provides no library or the Library key is missing" -msgstr "???????????? '%1' ????????? ??????????????????????????? ???????????? ???????????? ?????? ??????????????????????????? ??????????????? ??????????????? ???????????? ??????" +msgstr "???????????? '%1' ????????? ??????????????????????????? ???????????? ???????????? ?????? ??????????????????????????? ??????????????? ????????? ??????" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.83.0/po/lt/kservice5.po new/kservice-5.84.0/po/lt/kservice5.po --- old/kservice-5.83.0/po/lt/kservice5.po 2021-06-05 11:23:46.000000000 +0200 +++ new/kservice-5.84.0/po/lt/kservice5.po 2021-07-03 14:17:44.000000000 +0200 @@ -12,7 +12,7 @@ "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-05-20 00:14+0000\n" -"PO-Revision-Date: 2019-10-14 17:31+0300\n" +"PO-Revision-Date: 2021-06-15 22:16+0300\n" "Last-Translator: Moo\n" "Language-Team: Lithuanian <[email protected]>\n" "Language: lt\n" @@ -21,7 +21,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : n%10>=2 && (n%100<10 || n" "%100>=20) ? 1 : n%10==0 || (n%100>10 && n%100<20) ? 2 : 3);\n" -"X-Generator: Poedit 2.0.6\n" +"X-Generator: Poedit 3.0\n" #, kde-format msgctxt "NAME OF TRANSLATORS" @@ -181,7 +181,7 @@ #: kdeinit/ktoolinvocation_x11.cpp:340 #, kde-format msgid "Unable to determine the default terminal" -msgstr "" +msgstr "Nepavyko nustatyti numatytojo terminalo" #: kdeinit/ktoolinvocation_x11.cpp:352 #, kde-format @@ -212,4 +212,4 @@ #: services/kservice.cpp:1045 #, kde-format msgid "The service '%1' provides no library or the Library key is missing" -msgstr "Tarnyba ???%1??? neteikia bibliotek?? arba tr??ksta bibliotekos rakto." +msgstr "Tarnyba ???%1??? neteikia bibliotek?? arba tr??ksta bibliotekos rakto" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.83.0/po/se/kservice5.po new/kservice-5.84.0/po/se/kservice5.po --- old/kservice-5.83.0/po/se/kservice5.po 2021-06-05 11:23:46.000000000 +0200 +++ new/kservice-5.84.0/po/se/kservice5.po 2021-07-03 14:17:44.000000000 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2021-03-07 02:21+0100\n" +"POT-Creation-Date: 2021-05-20 00:14+0000\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" @@ -170,7 +170,12 @@ msgid "Could not launch Browser" msgstr "Ii s??htt??n ??lggahit fierpm??datlogana" -#: kdeinit/ktoolinvocation_x11.cpp:347 +#: kdeinit/ktoolinvocation_x11.cpp:340 +#, kde-format +msgid "Unable to determine the default terminal" +msgstr "" + +#: kdeinit/ktoolinvocation_x11.cpp:352 #, kde-format msgid "" "Could not launch the terminal client:\n" @@ -181,7 +186,7 @@ "\n" "%1" -#: kdeinit/ktoolinvocation_x11.cpp:348 +#: kdeinit/ktoolinvocation_x11.cpp:353 #, kde-format msgid "Could not launch Terminal Client" msgstr "Ii s??htt??n ??lggahit terminalprogr??mma" @@ -191,12 +196,12 @@ msgid "No service implementing %1" msgstr "Ii g??vdno b??lvalus %1 v??r??s" -#: services/kservice.cpp:1040 +#: services/kservice.cpp:1041 #, kde-format msgid "The provided service is not valid" msgstr "Addon b??lvalus ii gusto" -#: services/kservice.cpp:1044 +#: services/kservice.cpp:1045 #, kde-format msgid "The service '%1' provides no library or the Library key is missing" msgstr "??%1??-b??lvalusas ii leat bibliotehka dahje ??Library??-??oavdda ii g??vdno " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.83.0/po/zh_CN/kservice5.po new/kservice-5.84.0/po/zh_CN/kservice5.po --- old/kservice-5.83.0/po/zh_CN/kservice5.po 2021-06-05 11:23:46.000000000 +0200 +++ new/kservice-5.84.0/po/zh_CN/kservice5.po 2021-07-03 14:17:44.000000000 +0200 @@ -16,7 +16,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-05-20 00:14+0000\n" -"PO-Revision-Date: 2021-06-03 16:05\n" +"PO-Revision-Date: 2021-06-20 07:36\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.83.0/src/CMakeLists.txt new/kservice-5.84.0/src/CMakeLists.txt --- old/kservice-5.83.0/src/CMakeLists.txt 2021-06-05 11:23:46.000000000 +0200 +++ new/kservice-5.84.0/src/CMakeLists.txt 2021-07-03 14:17:44.000000000 +0200 @@ -4,7 +4,16 @@ check_symbol_exists(posix_madvise "sys/mman.h" HAVE_MADVISE) configure_file(config-ksycoca.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-ksycoca.h ) -set(kservice_SRCS +add_library(KF5Service) +add_library(KF5::Service ALIAS KF5Service) + +set_target_properties(KF5Service PROPERTIES + VERSION ${KSERVICE_VERSION} + SOVERSION ${KSERVICE_SOVERSION} + EXPORT_NAME Service +) + +target_sources(KF5Service PRIVATE kdeinit/ktoolinvocation.cpp services/kautostart.cpp services/kapplicationtrader.cpp @@ -38,11 +47,17 @@ sycoca/kmimeassociations.cpp sycoca/vfolder_menu.cpp plugin/kplugintrader.cpp + + kservice.qrc ) + if (TARGET Qt5::DBus) - list(APPEND kservice_SRCS plugin/kdbusservicestarter.cpp) + target_sources(KF5Service PRIVATE + plugin/kdbusservicestarter.cpp + ) endif() -ecm_qt_declare_logging_category(kservice_SRCS + +ecm_qt_declare_logging_category(KF5Service HEADER servicesdebug.h IDENTIFIER SERVICES CATEGORY_NAME kf.service.services @@ -50,7 +65,7 @@ EXPORT KSERVICE DESCRIPTION "service (kservice lib)" ) -ecm_qt_declare_logging_category(kservice_SRCS +ecm_qt_declare_logging_category(KF5Service HEADER sycocadebug.h IDENTIFIER SYCOCA CATEGORY_NAME kf.service.sycoca @@ -60,18 +75,16 @@ ) if (WIN32) - LIST(APPEND kservice_SRCS - kdeinit/ktoolinvocation_win.cpp - ) + target_sources(KF5Service PRIVATE + kdeinit/ktoolinvocation_win.cpp + ) endif() if (UNIX) - LIST(APPEND kservice_SRCS - kdeinit/ktoolinvocation_x11.cpp - ) + target_sources(KF5Service PRIVATE + kdeinit/ktoolinvocation_x11.cpp + ) endif() -qt_add_resources(kservice_SRCS kservice.qrc) - bison_target(TraderParser services/yacc.y ${CMAKE_CURRENT_BINARY_DIR}/yacc.c @@ -84,22 +97,25 @@ ) set_property(SOURCE ${CMAKE_CURRENT_BINARY_DIR}/lex.c ${CMAKE_CURRENT_BINARY_DIR}/yacc.c PROPERTY SKIP_AUTOMOC ON) add_flex_bison_dependency(TraderLexer TraderParser) -list(APPEND kservice_SRCS ${BISON_TraderParser_OUTPUTS} ${FLEX_TraderLexer_OUTPUTS}) +target_sources(KF5Service PRIVATE + ${BISON_TraderParser_OUTPUTS} + ${FLEX_TraderLexer_OUTPUTS} +) set_property(SOURCE ${CMAKE_CURRENT_BINARY_DIR}/yacc.h PROPERTY SKIP_AUTOMOC TRUE) # don't run automoc on this file # kservice cannot depend on kinit (because kinit->kio->kservice), so we need a copy of org.kde.KLauncher.xml here. # And I don't want to have it here as a source file (who wants to edit dbus xml by hand), so it can be # generated from klauncher's implementation header. if (TARGET Qt5::DBus) - qt_add_dbus_interface(kservice_SRCS kdeinit/org.kde.KLauncher.xml klauncher_iface) + set(kservice_dbus_SRCS) + qt_add_dbus_interface(kservice_dbus_SRCS kdeinit/org.kde.KLauncher.xml klauncher_iface) + target_sources(KF5Service PRIVATE ${kservice_dbus_SRCS}) endif() -add_library(KF5Service ${kservice_SRCS}) if(WIN32) #unistd.h does not exist on windows target_compile_definitions(KF5Service PRIVATE YY_NO_UNISTD_H=1) endif() -add_library(KF5::Service ALIAS KF5Service) ecm_generate_export_header(KF5Service BASE_NAME KService GROUP_BASE_NAME KF @@ -115,9 +131,12 @@ ${CMAKE_CURRENT_SOURCE_DIR}/plugin ${CMAKE_CURRENT_SOURCE_DIR}/kdeinit ) -target_include_directories(KF5Service PUBLIC "$<BUILD_INTERFACE:${kservice_includes}>") - -target_include_directories(KF5Service INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KService>") +target_include_directories(KF5Service + PUBLIC + "$<BUILD_INTERFACE:${kservice_includes}>" + INTERFACE + "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KService>" +) target_link_libraries(KF5Service PUBLIC @@ -131,11 +150,6 @@ target_link_libraries(KF5Service PRIVATE KF5::DBusAddons) # KDEInitInterface endif() -set_target_properties(KF5Service PROPERTIES VERSION ${KSERVICE_VERSION} - SOVERSION ${KSERVICE_SOVERSION} - EXPORT_NAME Service -) - ecm_generate_headers(KService_HEADERS HEADER_NAMES KPluginTrader diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.83.0/src/kbuildsycoca/CMakeLists.txt new/kservice-5.84.0/src/kbuildsycoca/CMakeLists.txt --- old/kservice-5.83.0/src/kbuildsycoca/CMakeLists.txt 2021-06-05 11:23:46.000000000 +0200 +++ new/kservice-5.84.0/src/kbuildsycoca/CMakeLists.txt 2021-07-03 14:17:44.000000000 +0200 @@ -1,15 +1,15 @@ include(ECMMarkNonGuiExecutable) -set(kbuildsycoca_SRCS - kbuildsycoca_main.cpp - ) - # We need to add a '5' so that kde3/kde4 apps running kbuildsycoca don't run this one. -add_executable(kbuildsycoca5 ${kbuildsycoca_SRCS}) +add_executable(kbuildsycoca5) # Mark it as non-gui so we won't create an app bundle on Mac OS X ecm_mark_nongui_executable(kbuildsycoca5) +target_sources(kbuildsycoca5 PRIVATE + kbuildsycoca_main.cpp +) + target_link_libraries(kbuildsycoca5 KF5::Service KF5::CoreAddons # KAboutData diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.83.0/src/services/kautostart.cpp new/kservice-5.84.0/src/services/kautostart.cpp --- old/kservice-5.83.0/src/services/kautostart.cpp 2021-06-05 11:23:46.000000000 +0200 +++ new/kservice-5.84.0/src/services/kautostart.cpp 2021-07-03 14:17:44.000000000 +0200 @@ -13,7 +13,6 @@ #include <QCoreApplication> #include <QDir> #include <QFile> -#include <QStringList> class KAutostartPrivate { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.83.0/src/services/kmimetypefactory.cpp new/kservice-5.84.0/src/services/kmimetypefactory.cpp --- old/kservice-5.83.0/src/services/kmimetypefactory.cpp 2021-06-05 11:23:46.000000000 +0200 +++ new/kservice-5.84.0/src/services/kmimetypefactory.cpp 2021-07-03 14:17:44.000000000 +0200 @@ -9,7 +9,6 @@ #include "kmimetypefactory_p.h" #include "servicesdebug.h" #include <QDataStream> -#include <QVariant> #include <ksycoca.h> #include <ksycocadict_p.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.83.0/src/services/kservicegroupfactory.cpp new/kservice-5.84.0/src/services/kservicegroupfactory.cpp --- old/kservice-5.83.0/src/services/kservicegroupfactory.cpp 2021-06-05 11:23:46.000000000 +0200 +++ new/kservice-5.84.0/src/services/kservicegroupfactory.cpp 2021-07-03 14:17:44.000000000 +0200 @@ -13,8 +13,6 @@ #include "servicesdebug.h" -#include <QIODevice> - KServiceGroupFactory::KServiceGroupFactory(KSycoca *db) : KSycocaFactory(KST_KServiceGroupFactory, db) , m_baseGroupDict(nullptr) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.83.0/src/sycoca/ksycoca.cpp new/kservice-5.84.0/src/sycoca/ksycoca.cpp --- old/kservice-5.83.0/src/sycoca/ksycoca.cpp 2021-06-05 11:23:46.000000000 +0200 +++ new/kservice-5.84.0/src/sycoca/ksycoca.cpp 2021-07-03 14:17:44.000000000 +0200 @@ -236,6 +236,17 @@ bool result = true; if (!m_databasePath.isEmpty()) { + static bool firstTime = true; + if (firstTime) { + firstTime = false; + if (QFileInfo::exists(QStringLiteral("/.flatpak-info"))) { + // We're running inside flatpak, which sets all times to 1970 + // So the first very time, don't use an existing database, recreate it + qCDebug(SYCOCA) << "flatpak detected, ignoring" << m_databasePath; + return false; + } + } + qCDebug(SYCOCA) << "Opening ksycoca from" << m_databasePath; m_dbLastModified = QFileInfo(m_databasePath).lastModified(); result = checkVersion(); @@ -600,7 +611,7 @@ // Check times of last modification of all directories on which ksycoca depends, // If none of them is newer than the mtime we stored for that directory at the // last rebuild, this means that there's no need to rebuild ksycoca. - bool checkDirectoriesTimestamps(const QMap<QString, qint64> &dirs) + bool checkDirectoriesTimestamps(const QMap<QString, qint64> &dirs) const { Q_ASSERT(!dirs.isEmpty()); // qCDebug(SYCOCA) << "checking file timestamps"; @@ -629,7 +640,7 @@ return true; } - bool checkFilesTimestamps(const QMap<QString, qint64> &files) + bool checkFilesTimestamps(const QMap<QString, qint64> &files) const { for (auto it = files.begin(); it != files.end(); ++it) { const QString fileName = it.key(); @@ -669,9 +680,10 @@ } // these days timeStamp is really a "bool headerFound", the value itself doesn't matter... // KF6: replace it with bool. + const auto timestampChecker = TimestampChecker(); bool ret = timeStamp != 0 - && (!TimestampChecker().checkDirectoriesTimestamps(allResourceDirs) // - || !TimestampChecker().checkFilesTimestamps(extraFiles)); + && (!timestampChecker.checkDirectoriesTimestamps(allResourceDirs) // + || !timestampChecker.checkFilesTimestamps(extraFiles)); if (ret) { return true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.83.0/src/sycoca/ksycocadict.cpp new/kservice-5.84.0/src/sycoca/ksycocadict.cpp --- old/kservice-5.83.0/src/sycoca/ksycocadict.cpp 2021-06-05 11:23:46.000000000 +0200 +++ new/kservice-5.84.0/src/sycoca/ksycocadict.cpp 2021-07-03 14:17:44.000000000 +0200 @@ -12,7 +12,6 @@ #include <kservice.h> #include <QBitArray> -#include <QIODevice> #include <QVector> namespace diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.83.0/src/sycoca/ksycocafactory.cpp new/kservice-5.84.0/src/sycoca/ksycocafactory.cpp --- old/kservice-5.83.0/src/sycoca/ksycocafactory.cpp 2021-06-05 11:23:46.000000000 +0200 +++ new/kservice-5.84.0/src/sycoca/ksycocafactory.cpp 2021-07-03 14:17:44.000000000 +0200 @@ -16,7 +16,6 @@ #include <QDebug> #include <QHash> -#include <QIODevice> #include <QThread> class KSycocaFactoryPrivate diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.83.0/tests/CMakeLists.txt new/kservice-5.84.0/tests/CMakeLists.txt --- old/kservice-5.83.0/tests/CMakeLists.txt 2021-06-05 11:23:46.000000000 +0200 +++ new/kservice-5.84.0/tests/CMakeLists.txt 2021-07-03 14:17:44.000000000 +0200 @@ -33,15 +33,17 @@ ) endif() -set(kmimeassociations_dumper_debug_SRCS) -ecm_qt_declare_logging_category(kmimeassociations_dumper_debug_SRCS +add_executable(kmimeassociations_dumper) +ecm_mark_as_test(kmimeassociations_dumper) + +ecm_qt_declare_logging_category(kmimeassociations_dumper HEADER sycocadebug.h IDENTIFIER SYCOCA CATEGORY_NAME kf.service.sycoca ) -set(kmimeassociations_dumper_SRCS kmimeassociations_dumper.cpp ../src/sycoca/kmimeassociations.cpp ${kmimeassociations_dumper_debug_SRCS}) - -add_executable(kmimeassociations_dumper ${kmimeassociations_dumper_SRCS}) +target_sources(kmimeassociations_dumper PRIVATE + kmimeassociations_dumper.cpp + ../src/sycoca/kmimeassociations.cpp +) target_link_libraries(kmimeassociations_dumper KF5::Service) -ecm_mark_as_test(kmimeassociations_dumper) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.83.0/tests/pluginlocator/main.cpp new/kservice-5.84.0/tests/pluginlocator/main.cpp --- old/kservice-5.83.0/tests/pluginlocator/main.cpp 2021-06-05 11:23:46.000000000 +0200 +++ new/kservice-5.84.0/tests/pluginlocator/main.cpp 2021-07-03 14:17:44.000000000 +0200 @@ -4,7 +4,6 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#include <QCommandLineOption> #include <QCommandLineParser> #include "plugintest.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.83.0/tests/pluginlocator/plugintest.cpp new/kservice-5.84.0/tests/pluginlocator/plugintest.cpp --- old/kservice-5.83.0/tests/pluginlocator/plugintest.cpp 2021-06-05 11:23:46.000000000 +0200 +++ new/kservice-5.84.0/tests/pluginlocator/plugintest.cpp 2021-07-03 14:17:44.000000000 +0200 @@ -12,8 +12,6 @@ #include <kservice.h> #include <kservicetypetrader.h> -#include <QCommandLineParser> - #include <QElapsedTimer> #include <QStandardPaths> #include <QStringList>
