Hello community, here is the log from the commit of package solid for openSUSE:Factory checked in at 2016-07-03 12:26:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/solid (Old) and /work/SRC/openSUSE:Factory/.solid.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "solid" Changes: -------- --- /work/SRC/openSUSE:Factory/solid/solid.changes 2016-05-23 17:31:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.solid.new/solid.changes 2016-07-03 12:26:23.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Jun 6 21:45:36 UTC 2016 - hrvoje.sen...@gmail.com + +- Update to 5.23.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.23.0.php + +------------------------------------------------------------------- Old: ---- solid-5.22.0.tar.xz New: ---- solid-5.23.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ solid.spec ++++++ --- /var/tmp/diff_new_pack.C2WlUG/_old 2016-07-03 12:26:24.000000000 +0200 +++ /var/tmp/diff_new_pack.C2WlUG/_new 2016-07-03 12:26:24.000000000 +0200 @@ -18,9 +18,9 @@ %bcond_without lang %define lname libKF5Solid5 -%define _tar_path 5.22 +%define _tar_path 5.23 Name: solid -Version: 5.22.0 +Version: 5.23.0 Release: 0 BuildRequires: bison BuildRequires: cmake >= 2.8.12 ++++++ solid-5.22.0.tar.xz -> solid-5.23.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.22.0/CMakeLists.txt new/solid-5.23.0/CMakeLists.txt --- old/solid-5.22.0/CMakeLists.txt 2016-05-07 17:29:09.000000000 +0200 +++ new/solid-5.23.0/CMakeLists.txt 2016-06-06 13:53:21.000000000 +0200 @@ -4,7 +4,7 @@ project(Solid) 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) @@ -42,7 +42,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 SOLID VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/solid_version.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.22.0/metainfo.yaml new/solid-5.23.0/metainfo.yaml --- old/solid-5.22.0/metainfo.yaml 2016-05-07 17:29:09.000000000 +0200 +++ new/solid-5.23.0/metainfo.yaml 2016-06-06 13:53:21.000000000 +0200 @@ -11,3 +11,7 @@ - qmake: Solid cmake: "KF5::Solid" cmakename: KF5Solid + +public_lib: true +group: Frameworks +subgroup: Tier 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.22.0/po/gd/solid5_qt.po new/solid-5.23.0/po/gd/solid5_qt.po --- old/solid-5.22.0/po/gd/solid5_qt.po 2016-05-07 17:29:09.000000000 +0200 +++ new/solid-5.23.0/po/gd/solid5_qt.po 2016-06-06 13:53:21.000000000 +0200 @@ -1,10 +1,10 @@ -# GunChleoc <f...@foramnagaidhlig.net>, 2015. +# GunChleoc <f...@foramnagaidhlig.net>, 2015, 2016. msgid "" msgstr "" "Project-Id-Version: \n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2015-11-04 15:14+0000\n" -"Last-Translator: Michael Bauer <f...@akerbeltz.org>\n" +"PO-Revision-Date: 2016-04-30 12:11+0100\n" +"Last-Translator: GunChleoc <f...@foramnagaidhlig.net>\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" #: solid/devices/backends/fstab/fstabmanager.cpp:88 @@ -531,7 +531,7 @@ #: solid/devices/backends/udisks2/udisksdevice.cpp:301 msgctxt "Solid::Backends::UDisks2::Device|Second item of %1%2 Drive sentence" msgid "/DVD±R DL" -msgstr "" +msgstr "/DVD±R DL" #: solid/devices/backends/udisks2/udisksdevice.cpp:303 msgctxt "Solid::Backends::UDisks2::Device|Second item of %1%2 Drive sentence" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.22.0/src/solid/devices/frontend/devicemanager.cpp new/solid-5.23.0/src/solid/devices/frontend/devicemanager.cpp --- old/solid-5.22.0/src/solid/devices/frontend/devicemanager.cpp 2016-05-07 17:29:09.000000000 +0200 +++ new/solid-5.23.0/src/solid/devices/frontend/devicemanager.cpp 2016-06-06 13:53:21.000000000 +0200 @@ -136,7 +136,7 @@ continue; } - QSet<QString> udis; + QStringList udis; if (predicate.isValid()) { QSet<DeviceInterface::Type> supportedTypes = backend->supportedInterfaces(); if (supportedTypes.intersect(usedTypes).isEmpty()) { @@ -144,13 +144,18 @@ } Q_FOREACH (DeviceInterface::Type type, supportedTypes) { - udis += QSet<QString>::fromList(backend->devicesFromQuery(parentUdi, type)); + udis += backend->devicesFromQuery(parentUdi, type); } } else { - udis += QSet<QString>::fromList(backend->allDevices()); + udis += backend->allDevices(); } + QSet<QString> seen; Q_FOREACH (const QString &udi, udis) { + if (seen.contains(udi)) { + continue; + } + seen.insert(udi); Device dev(udi); bool matches = false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.22.0/src/solid/devices/predicate_parser.y new/solid-5.23.0/src/solid/devices/predicate_parser.y --- old/solid-5.22.0/src/solid/devices/predicate_parser.y 2016-05-07 17:29:09.000000000 +0200 +++ new/solid-5.23.0/src/solid/devices/predicate_parser.y 2016-06-06 13:53:21.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 Soliderror(const char *s); +void Soliderror(yyscan_t scanner, const char *s); int Solidlex( YYSTYPE *yylval, yyscan_t scanner ); int Solidlex_init( yyscan_t *scanner ); int Solidlex_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; @@ -55,6 +59,9 @@ %pure-parser +%lex-param { yyscan_t scanner } +%parse-param { yyscan_t scanner } + %% predicate: predicate_atom { PredicateParse_setResult( $<ptr>1 ); $$ = $<ptr>1; } @@ -83,7 +90,7 @@ %% -void Soliderror ( const char *s ) /* Called by Solidparse on error */ +void Soliderror ( yyscan_t scanner, const char *s ) /* Called by Solidparse on error */ { PredicateParse_errorDetected(s); }
