Hello community, here is the log from the commit of package kservice for openSUSE:Factory checked in at 2016-07-03 12:24:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-05-19 12:09:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kservice.new/kservice.changes 2016-07-03 12:25:00.000000000 +0200 @@ -1,0 +2,12 @@ +Mon Jun 6 21:27:22 UTC 2016 - [email protected] + +- Update to 5.23.0 + * Fix associated applications for mimetypes with + uppercase characters (boo#980046) + * Lowercase the lookup key for mimetypes, + to make it case insensitive + * Fix ksycoca notifications when the DB doesn't exist yet + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.23.0.php + +------------------------------------------------------------------- Old: ---- kservice-5.22.0.tar.xz New: ---- kservice-5.23.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kservice.spec ++++++ --- /var/tmp/diff_new_pack.5utHKR/_old 2016-07-03 12:25:01.000000000 +0200 +++ /var/tmp/diff_new_pack.5utHKR/_new 2016-07-03 12:25:01.000000000 +0200 @@ -17,9 +17,9 @@ %bcond_without lang -%define _tar_path 5.22 +%define _tar_path 5.23 Name: kservice -Version: 5.22.0 +Version: 5.23.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 ++++++ kservice-5.22.0.tar.xz -> kservice-5.23.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.22.0/CMakeLists.txt new/kservice-5.23.0/CMakeLists.txt --- old/kservice-5.22.0/CMakeLists.txt 2016-05-07 17:23:20.000000000 +0200 +++ new/kservice-5.23.0/CMakeLists.txt 2016-06-06 13:46:19.000000000 +0200 @@ -5,7 +5,7 @@ # ECM setup 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) @@ -19,8 +19,8 @@ include(GenerateExportHeader) -set(KF5_VERSION "5.22.0") # handled by release scripts -set(KF5_DEP_VERSION "5.22.0") # handled by release scripts +set(KF5_VERSION "5.23.0") # handled by release scripts +set(KF5_DEP_VERSION "5.23.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.22.0/autotests/kservicetest.cpp new/kservice-5.23.0/autotests/kservicetest.cpp --- old/kservice-5.22.0/autotests/kservicetest.cpp 2016-05-07 17:23:20.000000000 +0200 +++ new/kservice-5.23.0/autotests/kservicetest.cpp 2016-06-06 13:46:19.000000000 +0200 @@ -43,6 +43,7 @@ #include <QTimer> #include <QDebug> +#include <QLoggingCategory> QTEST_MAIN(KServiceTest) @@ -66,6 +67,7 @@ { QStandardPaths::enableTestMode(true); + QLoggingCategory::setFilterRules(QStringLiteral("kf5.kcoreaddons.kdirwatch.debug=true")); // A non-C locale is necessary for some tests. // This locale must have the following properties: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.22.0/metainfo.yaml new/kservice-5.23.0/metainfo.yaml --- old/kservice-5.22.0/metainfo.yaml 2016-05-07 17:23:20.000000000 +0200 +++ new/kservice-5.23.0/metainfo.yaml 2016-06-06 13:46:19.000000000 +0200 @@ -11,3 +11,7 @@ - qmake: KService cmake: "KF5::Service" cmakename: KF5Service + +public_lib: true +group: Frameworks +subgroup: Tier 3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.22.0/po/ca/kservice5.po new/kservice-5.23.0/po/ca/kservice5.po --- old/kservice-5.22.0/po/ca/kservice5.po 2016-05-07 17:23:20.000000000 +0200 +++ new/kservice-5.23.0/po/ca/kservice5.po 2016-06-06 13:46:19.000000000 +0200 @@ -1,12 +1,12 @@ # Translation of kservice5.po to Catalan -# Copyright (C) 2014-2015 This_file_is_part_of_KDE +# Copyright (C) 2014-2016 This_file_is_part_of_KDE # This file is distributed under the license LGPL version 2.1 or # 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, 2015. # Albert Astals Cid <[email protected]>, 2004, 2005, 2007. -# Josep Ma. Ferrer <[email protected]>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015. +# Josep Ma. Ferrer <[email protected]>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016. # Robert Millan <[email protected]>, 2009. # Orestes Mas <[email protected]>, 2010. msgid "" @@ -14,7 +14,7 @@ "Project-Id-Version: kservice5\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-16 19:59+0200\n" +"PO-Revision-Date: 2016-05-19 22:49+0200\n" "Last-Translator: Josep Ma. Ferrer <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" "Language: ca\n" @@ -73,7 +73,7 @@ #: kbuildsycoca/kbuildsycoca_main.cpp:78 msgctxt "@info:shell command-line option" msgid "Disable incremental update, re-read everything" -msgstr "Deshabilita l'actualització incremental, torna a llegir-ho tot" +msgstr "Desactiva l'actualització incremental, torna a llegir-ho tot" #: kbuildsycoca/kbuildsycoca_main.cpp:81 msgctxt "@info:shell command-line option" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.22.0/po/ca@valencia/kservice5.po new/kservice-5.23.0/po/ca@valencia/kservice5.po --- old/kservice-5.22.0/po/ca@valencia/kservice5.po 2016-05-07 17:23:20.000000000 +0200 +++ new/kservice-5.23.0/po/ca@valencia/kservice5.po 2016-06-06 13:46:19.000000000 +0200 @@ -1,12 +1,12 @@ # Translation of kservice5.po to Catalan (Valencian) -# Copyright (C) 2014-2015 This_file_is_part_of_KDE +# Copyright (C) 2014-2016 This_file_is_part_of_KDE # This file is distributed under the license LGPL version 2.1 or # 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, 2015. # Albert Astals Cid <[email protected]>, 2004, 2005, 2007. -# Josep Ma. Ferrer <[email protected]>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015. +# Josep Ma. Ferrer <[email protected]>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016. # Robert Millan <[email protected]>, 2009. # Orestes Mas <[email protected]>, 2010. msgid "" @@ -14,7 +14,7 @@ "Project-Id-Version: kservice5\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-16 19:59+0200\n" +"PO-Revision-Date: 2016-05-19 22:49+0200\n" "Last-Translator: Josep Ma. Ferrer <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" "Language: ca@valencia\n" @@ -73,7 +73,7 @@ #: kbuildsycoca/kbuildsycoca_main.cpp:78 msgctxt "@info:shell command-line option" msgid "Disable incremental update, re-read everything" -msgstr "Deshabilita l'actualització incremental, torna a llegir-ho tot" +msgstr "Desactiva l'actualització incremental, torna a llegir-ho tot" #: kbuildsycoca/kbuildsycoca_main.cpp:81 msgctxt "@info:shell command-line option" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.22.0/src/services/kmimetypefactory.cpp new/kservice-5.23.0/src/services/kmimetypefactory.cpp --- old/kservice-5.22.0/src/services/kmimetypefactory.cpp 2016-05-07 17:23:20.000000000 +0200 +++ new/kservice-5.23.0/src/services/kmimetypefactory.cpp 2016-06-06 13:46:19.000000000 +0200 @@ -39,13 +39,13 @@ return -1; // Error! } assert(!sycoca()->isBuilding()); - const int offset = sycocaDict()->find_string(mimeTypeName); + const int offset = sycocaDict()->find_string(mimeTypeName.toLower()); return offset; } int KMimeTypeFactory::serviceOffersOffset(const QString &mimeTypeName) { - const int offset = entryOffset(mimeTypeName); + const int offset = entryOffset(mimeTypeName.toLower()); if (!offset) { return -1; // Not found } @@ -55,7 +55,7 @@ return -1; } // Check whether the dictionary was right. - if (newMimeType->name() != mimeTypeName) { + if (newMimeType->name() != mimeTypeName.toLower()) { // No it wasn't... return -1; } @@ -103,7 +103,7 @@ { Q_ASSERT(sycoca()->isBuilding()); // We're building a database - the mimetype entry must be in memory - KSycocaEntry::Ptr servType = m_entryDict->value(name); + KSycocaEntry::Ptr servType = m_entryDict->value(name.toLower()); return MimeTypeEntry::Ptr(static_cast<MimeTypeEntry*>(servType.data())); } @@ -146,7 +146,7 @@ //// KMimeTypeFactory::MimeTypeEntry::MimeTypeEntry(const QString &file, const QString &name) - : KSycocaEntry(*new MimeTypeEntryPrivate(file, name)) + : KSycocaEntry(*new MimeTypeEntryPrivate(file, name.toLower())) { } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.22.0/src/services/yacc.y new/kservice-5.23.0/src/services/yacc.y --- old/kservice-5.22.0/src/services/yacc.y 2016-05-07 17:23:20.000000000 +0200 +++ new/kservice-5.23.0/src/services/yacc.y 2016-06-06 13:46:19.000000000 +0200 @@ -6,10 +6,7 @@ #define YYLTYPE_IS_TRIVIAL 0 #define YYENABLE_NLS 0 -#define YYLEX_PARAM _scanner -#define YYPARSE_PARAM _scanner -typedef void* yyscan_t; -void yyerror(const char *s); +void yyerror(yyscan_t scanner, const char *s); int kiotraderlex(YYSTYPE * yylval, yyscan_t scanner); int kiotraderlex_init (yyscan_t* scanner); int kiotraderlex_destroy(yyscan_t scanner); @@ -18,6 +15,13 @@ %} +%code requires{ +#ifndef YY_TYPEDEF_YY_SCANNER_T +#define YY_TYPEDEF_YY_SCANNER_T +typedef void *yyscan_t; +#endif +} + %union { char valb; @@ -76,6 +80,9 @@ %pure-parser +%lex-param { yyscan_t scanner } +%parse-param { yyscan_t scanner } + /* Grammar follows */ %% @@ -147,7 +154,7 @@ %% -void yyerror ( const char *s ) /* Called by yyparse on error */ +void yyerror ( yyscan_t scanner, const char *s ) /* Called by yyparse on error */ { KTraderParse_error( s ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.22.0/src/sycoca/ksycoca.cpp new/kservice-5.23.0/src/sycoca/ksycoca.cpp --- old/kservice-5.22.0/src/sycoca/ksycoca.cpp 2016-05-07 17:23:20.000000000 +0200 +++ new/kservice-5.23.0/src/sycoca/ksycoca.cpp 2016-06-06 13:46:19.000000000 +0200 @@ -204,12 +204,13 @@ QFileInfo info(path); bool canRead = info.isReadable(); if (!canRead) { - path = KSycoca::absoluteFilePath(KSycoca::GlobalDatabase); - if (!path.isEmpty()) { - info.setFile(path); + const QString globalPath = KSycoca::absoluteFilePath(KSycoca::GlobalDatabase); + if (!globalPath.isEmpty()) { + info.setFile(globalPath); canRead = info.isReadable(); if (canRead) { m_globalDatabase = true; + path = globalPath; } } } @@ -219,6 +220,8 @@ } return path; } + // Let's be notified when it gets created - by another process or by ourselves + m_fileWatcher.addFile(path); return QString(); } @@ -227,7 +230,10 @@ KSycoca::KSycoca() : d(new KSycocaPrivate(this)) { + // We always delete and recreate the DB, so KDirWatch normally emits created connect(&d->m_fileWatcher, &KDirWatch::created, this, [this](){ d->slotDatabaseChanged(); }); + // In some cases, KDirWatch only thinks the file was modified though + connect(&d->m_fileWatcher, &KDirWatch::dirty, this, [this](){ d->slotDatabaseChanged(); }); } bool KSycocaPrivate::openDatabase(bool openDummyIfNotFound)
