Hello community, here is the log from the commit of package kservice for openSUSE:Factory checked in at 2016-02-24 18:58:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kservice (Old) and /work/SRC/openSUSE:Factory/.kservice.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kservice" Changes: -------- --- /work/SRC/openSUSE:Factory/kservice/kservice.changes 2016-01-20 09:47:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kservice.new/kservice.changes 2016-02-24 18:58:13.000000000 +0100 @@ -1,0 +2,10 @@ +Sat Feb 6 18:06:21 UTC 2016 - [email protected] + +- Update to 5.19.0 (boo#967668) + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.19.0.php +- Added list-local-mimeapps-last.patch list local mimeapps.list + last to QListIterator, so it's respected before global ones + (boo#966739) + +------------------------------------------------------------------- Old: ---- kservice-5.18.0.tar.xz New: ---- kservice-5.19.0.tar.xz list-local-mimeapps-last.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kservice.spec ++++++ --- /var/tmp/diff_new_pack.DDPOom/_old 2016-02-24 18:58:14.000000000 +0100 +++ /var/tmp/diff_new_pack.DDPOom/_new 2016-02-24 18:58:14.000000000 +0100 @@ -17,9 +17,9 @@ %bcond_without lang -%define _tar_path 5.18 +%define _tar_path 5.19 Name: kservice -Version: 5.18.0 +Version: 5.19.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 @@ -51,6 +51,8 @@ Patch0: kservice-desktop-translations.patch # PATCH-FIX-OPENSUSE dont-show-yast-modules-in-the-applications-menu.patch -- hide the YaST modules from the application menu Patch1: dont-show-yast-modules-in-the-applications-menu.patch +# PATCH-FIX-OPENSUSE list-local-mimeapps-last.patch -- list local mimeapps.list last to QListIterator, so it's respected before global ones -- boo#966739 +Patch2: list-local-mimeapps-last.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -76,6 +78,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %cmake_kf5 -d build -- -DAPPLICATIONS_MENU_NAME="kf5-applications.menu" ++++++ kservice-5.18.0.tar.xz -> kservice-5.19.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.18.0/CMakeLists.txt new/kservice-5.19.0/CMakeLists.txt --- old/kservice-5.18.0/CMakeLists.txt 2016-01-02 17:49:15.000000000 +0100 +++ new/kservice-5.19.0/CMakeLists.txt 2016-02-06 14:56:25.000000000 +0100 @@ -5,22 +5,22 @@ # ECM setup include(FeatureSummary) -find_package(ECM 5.18.0 NO_MODULE) +find_package(ECM 5.19.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) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake ) include(KDEInstallDirs) -include(KDEFrameworkCompilerSettings) +include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) include(ECMSetupVersion) include(ECMGenerateHeaders) include(GenerateExportHeader) -set(KF5_VERSION "5.18.0") # handled by release scripts -set(KF5_DEP_VERSION "5.18.0") # handled by release scripts +set(KF5_VERSION "5.19.0") # handled by release scripts +set(KF5_DEP_VERSION "5.19.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KSERVICE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.18.0/po/ast/kservice5.po new/kservice-5.19.0/po/ast/kservice5.po --- old/kservice-5.18.0/po/ast/kservice5.po 2016-01-02 17:49:15.000000000 +0100 +++ new/kservice-5.19.0/po/ast/kservice5.po 2016-02-06 14:56:25.000000000 +0100 @@ -1,15 +1,15 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# enolp <[email protected]>, 2015. +# enolp <[email protected]>, 2015, 2016. msgid "" msgstr "" "Project-Id-Version: kdelibs4-1\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2015-09-19 08:55+0000\n" -"PO-Revision-Date: 2015-11-16 00:29+0100\n" -"Last-Translator: enolp <[email protected]>\n" -"Language-Team: Asturian <[email protected]>\n" +"PO-Revision-Date: 2016-02-02 20:04+0100\n" +"Last-Translator: enolp <[email protected]>\n" +"Language-Team: Asturian <>\n" "Language: ast_ES\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -62,6 +62,8 @@ "Do not signal applications to update (deprecated, no longer having any " "effect)" msgstr "" +"Nun unvia señales a les aplicaciones p'anovar (anticuáu, yá nun tien efeutu " +"dalu)" #: kbuildsycoca/kbuildsycoca_main.cpp:78 msgctxt "@info:shell command-line option" @@ -72,6 +74,8 @@ msgctxt "@info:shell command-line option" msgid "Check file timestamps (deprecated, no longer having any effect)" msgstr "" +"Comprueba les marques de tiempu de ficheros (anticuáu, yá nun tien efeutu " +"dalu)" #: kbuildsycoca/kbuildsycoca_main.cpp:84 msgctxt "@info:shell command-line option" @@ -129,13 +133,13 @@ "\n" "%1" msgstr "" -"Nun pudo llanzase'l veceru de corréu:\n" +"Nun pudo llanciase'l veceru de corréu:\n" "\n" "%1" #: kdeinit/ktoolinvocation_x11.cpp:252 msgid "Could not launch Mail Client" -msgstr "Nun pudo llanzase'l veceru de corréu" +msgstr "Nun pudo llanciase'l veceru de corréu" #: kdeinit/ktoolinvocation_x11.cpp:301 kdeinit/ktoolinvocation_x11.cpp:326 #: kdeinit/ktoolinvocation_x11.cpp:345 @@ -145,14 +149,14 @@ "\n" "%1" msgstr "" -"Nun pudo llanzase'l restolador:\n" +"Nun pudo llanciase'l restolador:\n" "\n" "%1" #: kdeinit/ktoolinvocation_x11.cpp:302 kdeinit/ktoolinvocation_x11.cpp:327 #: kdeinit/ktoolinvocation_x11.cpp:346 msgid "Could not launch Browser" -msgstr "Nun pudo llanzase'l restolador" +msgstr "Nun pudo llanciase'l restolador" #: kdeinit/ktoolinvocation_x11.cpp:385 #, kde-format @@ -161,13 +165,13 @@ "\n" "%1" msgstr "" -"Nun pudo llanzase'l veceru de terminal:\n" +"Nun pudo llanciase'l veceru de terminal:\n" "\n" "%1" #: kdeinit/ktoolinvocation_x11.cpp:386 msgid "Could not launch Terminal Client" -msgstr "Nun pudo llanzase'l veceru de terminal:" +msgstr "Nun pudo llanciase'l veceru de terminal:" #: plugin/kdbusservicestarter.cpp:77 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.18.0/po/fi/kservice5.po new/kservice-5.19.0/po/fi/kservice5.po --- old/kservice-5.18.0/po/fi/kservice5.po 2016-01-02 17:49:15.000000000 +0100 +++ new/kservice-5.19.0/po/fi/kservice5.po 2016-02-06 14:56:25.000000000 +0100 @@ -14,7 +14,7 @@ # Tommi Nieminen <[email protected]>, 2009, 2010, 2011. # Tommi Nieminen <[email protected]>, 2009. # Jorma Karvonen <[email protected]>, 2010. -# Lasse Liehu <[email protected]>, 2006, 2010, 2011, 2012, 2013, 2014, 2015. +# Lasse Liehu <[email protected]>, 2006, 2010, 2011, 2012, 2013, 2014, 2015, 2016. # # KDE Finnish translation sprint participants: # Author: Artnay @@ -27,7 +27,7 @@ "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2015-09-19 08:55+0000\n" -"PO-Revision-Date: 2015-09-14 20:59+0200\n" +"PO-Revision-Date: 2016-01-05 22:44+0200\n" "Last-Translator: Lasse Liehu <[email protected]>\n" "Language-Team: Finnish <[email protected]>\n" "Language: fi\n" @@ -121,7 +121,7 @@ #: kbuildsycoca/kbuildsycoca_main.cpp:93 msgctxt "@info:shell command-line option" msgid "Track menu id for debug purposes" -msgstr "Jäljitä valikkotunniste virheenjäljitystä varten" +msgstr "Jäljitä valikkotunniste virheenpaikannusta varten" #: kbuildsycoca/kbuildsycoca_main.cpp:97 msgctxt "@info:shell command-line option" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.18.0/po/nb/kservice5.po new/kservice-5.19.0/po/nb/kservice5.po --- old/kservice-5.18.0/po/nb/kservice5.po 2016-01-02 17:49:15.000000000 +0100 +++ new/kservice-5.19.0/po/nb/kservice5.po 2016-02-06 14:56:25.000000000 +0100 @@ -4,7 +4,7 @@ # Bjørn Steensrud <[email protected]>, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014. # Eskild Hustvedt <[email protected]>, 2004, 2005. # Gaute Hvoslef Kvalnes <[email protected]>, 2004, 2005. -# Axel Bojer <[email protected]>, 2005, 2006. +# Axel Bojer <[email protected]>, 2005, 2006. # Nils Kristian Tomren <[email protected]>, 2005, 2007. # Øyvind A. Holm <[email protected]>, 2009. msgid "" @@ -31,7 +31,8 @@ msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" -msgstr "[email protected],[email protected],[email protected]" +msgstr "" +"[email protected],[email protected],[email protected]" #: kbuildsycoca/kbuildsycoca_main.cpp:56 msgctxt "application name" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.18.0/src/services/application.desktop new/kservice-5.19.0/src/services/application.desktop --- old/kservice-5.18.0/src/services/application.desktop 2016-01-02 17:49:15.000000000 +0100 +++ new/kservice-5.19.0/src/services/application.desktop 2016-02-06 14:56:25.000000000 +0100 @@ -18,7 +18,7 @@ Name[csb]=Programa Name[cy]=Cymhwysiad Name[da]=Program -Name[de]=Programm +Name[de]=Anwendung Name[el]=Εφαρμογή Name[en_GB]=Application Name[eo]=Aplikaĵo ++++++ list-local-mimeapps-last.patch ++++++ diff --git a/src/sycoca/kmimeassociations.cpp b/src/sycoca/kmimeassociations.cpp index 922a447..e89fa3e 100644 --- a/src/sycoca/kmimeassociations.cpp +++ b/src/sycoca/kmimeassociations.cpp @@ -58,8 +58,8 @@ void KMimeAssociations::parseAllMimeAppsList() } mimeappsFileNames.append(QStringLiteral("mimeapps.list")); // list the dirs in the order of the spec (XDG_CONFIG_HOME, XDG_CONFIG_DIRS, XDG_DATA_HOME, XDG_DATA_DIRS) - const QStringList mimeappsDirs = QStandardPaths::standardLocations(QStandardPaths::GenericConfigLocation) - + QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation); + const QStringList mimeappsDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation) + + QStandardPaths::standardLocations(QStandardPaths::GenericConfigLocation); QStringList mimeappsFiles; // collect existing files foreach (const QString &dir, mimeappsDirs) {
