Hello community,
here is the log from the commit of package kservice for openSUSE:Factory checked in at 2016-05-19 12:09:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-04-12 19:25:48.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kservice.new/kservice.changes 2016-05-19 12:09:32.000000000 +0200
@@ -1,0 +2,8 @@
+Sat May 7 18:33:43 UTC 2016 - hrvoje.senjan@gmail.com
+
+- Update to 5.22.0 (boo#980066)
+ * Remove too-strict maximum string length in KSycoca database
+ * For more details please see:
+ https://www.kde.org/announcements/kde-frameworks-5.22.0.php
+
+-------------------------------------------------------------------
Old:
----
kservice-5.21.0.tar.xz
New:
----
kservice-5.22.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kservice.spec ++++++
--- /var/tmp/diff_new_pack.EgjNcs/_old 2016-05-19 12:09:33.000000000 +0200
+++ /var/tmp/diff_new_pack.EgjNcs/_new 2016-05-19 12:09:33.000000000 +0200
@@ -17,9 +17,9 @@
%bcond_without lang
-%define _tar_path 5.21
+%define _tar_path 5.22
Name: kservice
-Version: 5.21.0
+Version: 5.22.0
Release: 0
%define kf5_version %{version}
BuildRequires: cmake >= 2.8.12
++++++ kservice-5.21.0.tar.xz -> kservice-5.22.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.21.0/CMakeLists.txt new/kservice-5.22.0/CMakeLists.txt
--- old/kservice-5.21.0/CMakeLists.txt 2016-04-03 23:02:37.000000000 +0200
+++ new/kservice-5.22.0/CMakeLists.txt 2016-05-07 17:23:20.000000000 +0200
@@ -5,7 +5,7 @@
# ECM setup
include(FeatureSummary)
-find_package(ECM 5.21.0 NO_MODULE)
+find_package(ECM 5.22.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.21.0") # handled by release scripts
-set(KF5_DEP_VERSION "5.21.0") # handled by release scripts
+set(KF5_VERSION "5.22.0") # handled by release scripts
+set(KF5_DEP_VERSION "5.22.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.21.0/autotests/CMakeLists.txt new/kservice-5.22.0/autotests/CMakeLists.txt
--- old/kservice-5.21.0/autotests/CMakeLists.txt 2016-04-03 23:02:37.000000000 +0200
+++ new/kservice-5.22.0/autotests/CMakeLists.txt 2016-05-07 17:23:20.000000000 +0200
@@ -9,7 +9,8 @@
macro(KSERVICE_UNIT_TESTS)
foreach(_testname ${ARGN})
ecm_add_test(${_testname}.cpp TEST_NAME ${_testname}
- LINK_LIBRARIES KF5::Service Qt5::Test Qt5::Concurrent)
+ LINK_LIBRARIES KF5::Service Qt5::Test Qt5::Concurrent)
+ target_compile_definitions(${_testname} PRIVATE -DKBUILDSYCOCAEXE=\"$\")
endforeach()
endmacro(KSERVICE_UNIT_TESTS)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.21.0/autotests/ksycoca_xdgdirstest.cpp new/kservice-5.22.0/autotests/ksycoca_xdgdirstest.cpp
--- old/kservice-5.21.0/autotests/ksycoca_xdgdirstest.cpp 2016-04-03 23:02:37.000000000 +0200
+++ new/kservice-5.22.0/autotests/ksycoca_xdgdirstest.cpp 2016-05-07 17:23:20.000000000 +0200
@@ -64,7 +64,7 @@
void KSycocaXdgDirsTest::runKBuildSycoca(const QProcessEnvironment &environment)
{
QProcess proc;
- const QString kbuildsycoca = QStandardPaths::findExecutable(QStringLiteral(KBUILDSYCOCA_EXENAME));
+ const QString kbuildsycoca = QStringLiteral(KBUILDSYCOCAEXE);
QVERIFY(!kbuildsycoca.isEmpty());
QStringList args;
args << QStringLiteral("--testmode");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.21.0/autotests/ksycocatest.cpp new/kservice-5.22.0/autotests/ksycocatest.cpp
--- old/kservice-5.21.0/autotests/ksycocatest.cpp 2016-04-03 23:02:37.000000000 +0200
+++ new/kservice-5.22.0/autotests/ksycocatest.cpp 2016-05-07 17:23:20.000000000 +0200
@@ -223,7 +223,7 @@
void KSycocaTest::runKBuildSycoca(const QProcessEnvironment &environment, bool global)
{
QProcess proc;
- const QString kbuildsycoca = QStandardPaths::findExecutable(QStringLiteral(KBUILDSYCOCA_EXENAME));
+ const QString kbuildsycoca = QStringLiteral(KBUILDSYCOCAEXE);
QVERIFY(!kbuildsycoca.isEmpty());
QStringList args;
args << QStringLiteral("--testmode");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.21.0/po/is/kservice5.po new/kservice-5.22.0/po/is/kservice5.po
--- old/kservice-5.21.0/po/is/kservice5.po 2016-04-03 23:02:37.000000000 +0200
+++ new/kservice-5.22.0/po/is/kservice5.po 2016-05-07 17:23:20.000000000 +0200
@@ -6,20 +6,20 @@
# Richard Allen , 1998-2004.
# Pjetur G. Hjaltason , 2003.
# Arnar Leósson , 2003, 2005.
-# Sveinn í Felli , 2007, 2008, 2009, 2010, 2011, 2012, 2013.
+# Sveinn í Felli , 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2016.
msgid ""
msgstr ""
"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: 2013-05-13 22:40+0000\n"
-"Last-Translator: Sveinn í Felli \n"
-"Language-Team: Icelandic \n"
+"PO-Revision-Date: 2016-04-08 22:57+0000\n"
+"Last-Translator: Sveinn í Felli \n"
+"Language-Team: Icelandic \n"
"Language: is\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.2\n"
+"X-Generator: Lokalize 1.5\n"
"Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n"
"\n"
"\n"
@@ -38,7 +38,7 @@
msgid "Your emails"
msgstr ""
"ra@ra.is, logi@logi.org, pjetur@pjetur.net, leosson@frisurf.no, svanur@tern."
-"is, sveinki@nett.is"
+"is, sv1@fellsnet.is"
#: kbuildsycoca/kbuildsycoca_main.cpp:56
#, fuzzy
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.21.0/po/it/docs/desktoptojson/man-desktoptojson.8.docbook new/kservice-5.22.0/po/it/docs/desktoptojson/man-desktoptojson.8.docbook
--- old/kservice-5.21.0/po/it/docs/desktoptojson/man-desktoptojson.8.docbook 1970-01-01 01:00:00.000000000 +0100
+++ new/kservice-5.22.0/po/it/docs/desktoptojson/man-desktoptojson.8.docbook 2016-05-07 17:23:20.000000000 +0200
@@ -0,0 +1,233 @@
+<?xml version="1.0" ?>
+<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
+ <!ENTITY % Italian "INCLUDE"
+><!-- change language only here -->
+]>
+
+<refentry lang="&language;">
+
+<refentryinfo>
+&kde; Frameworks: KService</title>
+Scarlett Clark Ha scritto la documentazione originale.</contrib>
+<affiliation>
+scarlett@scarlettgatelyclark.com</address>
+</affiliation>
+</author>
+Alex Merry Modifiche alla documentazione.</contrib>
+<affiliation>
+alexmerry@kde.org</address>
+</affiliation>
+</author>
+
+2014-04-02</date>
+Frameworks 5.0</releaseinfo>
+KDE Frameworks</productname>
+
+</refentryinfo>
+
+
+<refmeta>
+desktoptojson</refentrytitle>
+8</manvolnum>
+</refmeta>
+
+<refnamediv>
+desktoptojson</refname>
+Converte un file .desktop in un file .json.</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+Sintassi</title>
+
+desktoptojson --input FILE-DESKTOP --output FILE-JSON </cmdsynopsis>
+desktoptojson --version --help </cmdsynopsis>
+
+</refsynopsisdiv>
+
+
+
+
+<refsect1>
+Descrizione</title>
+
+Il framework KService usa informazioni contenute nei file .desktop per localizzare i servizi, incluse le estensioni per applicazioni e librerie basate su Qt5. Il sistema delle estensioni di Qt5, tuttavia, usa dati JSON integrati nelle stesse estensioni. desktoptojson permette che le informazioni contenute in un file .desktop siano usate anche come i dati integrati in un'estensione Qt5 convertendo le voci del file .desktop in dati JSON.</para>
+
+I dati JSON generati costituiscono un oggetto JSON che mappa le voci dal gruppo [Desktop Entry] del file .desktop. Tutti gli altri gruppi sono ignorati. La maggior parte delle voci sono semplicemente convertite in stringhe JSON, ma alcune di esse (come Hidden e X-KDE-PluginInfo-EnabledByDefault) sono notoriamente valori booleani e quindi viene usato tale tipo; analogamente altre voci (come X-KDE-ServiceTypes e X-KDE-PluginInfo-Depends) sono sempre convertite in vettori di stringhe.</para>
+</refsect1>
+
+
+
+<refsect1>
+Opzioni</title>
+<variablelist>
+
+<varlistentry>
+ </term>
+<listitem>
+Il file .desktop da convertire.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+</term>
+<listitem>
+Il file in cui scrivere i dati JSON generati.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+</term>
+<listitem>
+Mostra un breve testo di aiuto.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+</term>
+<listitem>
+Mostra le informazioni sulla versione.</para>
+</listitem>
+</varlistentry>
+
+</variablelist>
+</refsect1>
+
+
+
+<refsect1>
+Uso</title>
+Buona parte degli utenti di questo strumento useranno la macro di CMake kservice_desktop_to_json come parte del processo di generazione di un'estensione. <programlisting language="cmake">
+<![CDATA[
+add_library(myplugin MODULE ${myplugin_SRCS})
+kservice_desktop_to_json(myplugin myplugin.desktop)
+]]>
+ Questo produrrà il file JSON myplugin.json a cui si può fare riferimento dalle macro K_PLUGIN_FACTORY_WITH_JSON o Q_PLUGIN_METADATA. </para>
+</refsect1>
+
+
+
+<refsect1>
+Errori</title>
+Usa http://bugs.kde.org"
+>il sito di gestione dei bug di KDE per segnalarli.</para>
+</refsect1>
+
+</refentry>
+
+
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.21.0/po/nn/kservice5.po new/kservice-5.22.0/po/nn/kservice5.po
--- old/kservice-5.21.0/po/nn/kservice5.po 2016-04-03 23:02:37.000000000 +0200
+++ new/kservice-5.22.0/po/nn/kservice5.po 2016-05-07 17:23:20.000000000 +0200
@@ -2,14 +2,14 @@
#
# Gaute Hvoslef Kvalnes , 2003, 2004, 2005, 2006.
# Håvard Korsvoll , 2003, 2005.
-# Karl Ove Hufthammer , 2004, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015.
+# Karl Ove Hufthammer , 2004, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016.
# Eirik U. Birkeland , 2008, 2009, 2010.
msgid ""
msgstr ""
"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-18 20:28+0100\n"
+"PO-Revision-Date: 2016-04-24 21:18+0100\n"
"Last-Translator: Karl Ove Hufthammer \n"
"Language-Team: Norwegian Nynorsk \n"
"Language: nn\n"
@@ -66,6 +66,8 @@
"Do not signal applications to update (deprecated, no longer having any "
"effect)"
msgstr ""
+"Send ikkje oppdateringssignal til programma (utdatert, og har ikkje lenger "
+"nokon effekt)"
#: kbuildsycoca/kbuildsycoca_main.cpp:78
msgctxt "@info:shell command-line option"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.21.0/src/CMakeLists.txt new/kservice-5.22.0/src/CMakeLists.txt
--- old/kservice-5.21.0/src/CMakeLists.txt 2016-04-03 23:02:37.000000000 +0200
+++ new/kservice-5.22.0/src/CMakeLists.txt 2016-05-07 17:23:20.000000000 +0200
@@ -29,7 +29,6 @@
sycoca/ksycocadict.cpp
sycoca/ksycocaentry.cpp
sycoca/ksycocafactory.cpp
- sycoca/ksycocautils.cpp
sycoca/kmemfile.cpp
sycoca/sycocadebug.cpp
sycoca/kbuildmimetypefactory.cpp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.21.0/src/services/kservicegroup.h new/kservice-5.22.0/src/services/kservicegroup.h
--- old/kservice-5.21.0/src/services/kservicegroup.h 2016-04-03 23:02:37.000000000 +0200
+++ new/kservice-5.22.0/src/services/kservicegroup.h 2016-05-07 17:23:20.000000000 +0200
@@ -20,7 +20,6 @@
#define KSERVICEGROUP_H
#include
-#include
#include
class KBuildServiceGroupFactory;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.21.0/src/services/kservicetypefactory.cpp new/kservice-5.22.0/src/services/kservicetypefactory.cpp
--- old/kservice-5.21.0/src/services/kservicetypefactory.cpp 2016-04-03 23:02:37.000000000 +0200
+++ new/kservice-5.22.0/src/services/kservicetypefactory.cpp 2016-05-07 17:23:20.000000000 +0200
@@ -43,8 +43,7 @@
QString string;
qint32 i;
for (; n; --n) {
- KSycocaUtilsPrivate::read(*str, string);
- (*str) >> i;
+ *str >> string >> i;
m_propertyTypeDict.insert(string, i);
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.21.0/src/sycoca/kctimefactory.cpp new/kservice-5.22.0/src/sycoca/kctimefactory.cpp
--- old/kservice-5.21.0/src/sycoca/kctimefactory.cpp 2016-04-03 23:02:37.000000000 +0200
+++ new/kservice-5.22.0/src/sycoca/kctimefactory.cpp 2016-05-07 17:23:20.000000000 +0200
@@ -74,8 +74,7 @@
QString key;
quint32 ctime;
while (true) {
- KSycocaUtilsPrivate::read(str, key);
- str >> ctime;
+ str >> key >> ctime;
if (key.isEmpty()) {
break;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.21.0/src/sycoca/ksycoca.cpp new/kservice-5.22.0/src/sycoca/ksycoca.cpp
--- old/kservice-5.21.0/src/sycoca/ksycoca.cpp 2016-04-03 23:02:37.000000000 +0200
+++ new/kservice-5.22.0/src/sycoca/ksycoca.cpp 2016-05-07 17:23:20.000000000 +0200
@@ -70,6 +70,11 @@
#define MAP_FAILED ((void *) -1)
#endif
+QDataStream &operator>>(QDataStream &in, KSycocaHeader &h) {
+ in >> h.prefixes >> h.timeStamp >> h.language >> h.updateSignature;
+ return in;
+}
+
// The following limitations are in place:
// Maximum length of a single string: 8192 bytes
// Maximum length of a string list: 1024 strings
@@ -576,12 +581,8 @@
}
}
// We now point to the header
- KSycocaUtilsPrivate::read(*str, header.prefixes);
- *str >> header.timeStamp;
- KSycocaUtilsPrivate::read(*str, header.language);
- *str >> header.updateSignature;
QStringList directoryList;
- KSycocaUtilsPrivate::read(*str, directoryList);
+ *str >> header >> directoryList;
allResourceDirs.clear();
for (int i = 0; i < directoryList.count(); ++i) {
qint64 mtime;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.21.0/src/sycoca/ksycoca_p.h new/kservice-5.22.0/src/sycoca/ksycoca_p.h
--- old/kservice-5.21.0/src/sycoca/ksycoca_p.h 2016-04-03 23:02:37.000000000 +0200
+++ new/kservice-5.22.0/src/sycoca/ksycoca_p.h 2016-05-07 17:23:20.000000000 +0200
@@ -44,6 +44,8 @@
quint32 updateSignature;
};
+QDataStream &operator>>(QDataStream &in, KSycocaHeader &h);
+
/**
* \internal
* Exported for unittests
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.21.0/src/sycoca/ksycocaentry.cpp new/kservice-5.22.0/src/sycoca/ksycocaentry.cpp
--- old/kservice-5.21.0/src/sycoca/ksycocaentry.cpp 2016-04-03 23:02:37.000000000 +0200
+++ new/kservice-5.22.0/src/sycoca/ksycocaentry.cpp 2016-05-07 17:23:20.000000000 +0200
@@ -25,7 +25,7 @@
KSycocaEntryPrivate::KSycocaEntryPrivate(QDataStream &_str, int iOffset)
: offset(iOffset), deleted(false)
{
- KSycocaUtilsPrivate::read(_str, path);
+ _str >> path;
}
KSycocaEntry::KSycocaEntry()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.21.0/src/sycoca/ksycocautils.cpp new/kservice-5.22.0/src/sycoca/ksycocautils.cpp
--- old/kservice-5.21.0/src/sycoca/ksycocautils.cpp 2016-04-03 23:02:37.000000000 +0200
+++ new/kservice-5.22.0/src/sycoca/ksycocautils.cpp 1970-01-01 01:00:00.000000000 +0100
@@ -1,69 +0,0 @@
-/* This file is part of the KDE libraries
- * Copyright (C) 1999 Waldo Bastian
- * Copyright (C) 2005-2013 David Faure
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License version 2 as published by the Free Software Foundation;
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "ksycocautils_p.h"
-#include "ksycoca.h"
-#include <QDataStream>
-#include <QStringList>
-
-void KSycocaUtilsPrivate::read(QDataStream &s, QString &str)
-{
- quint32 bytes;
- s >> bytes; // read size of string
- if (bytes > 8192) { // null string or too big
- if (bytes != 0xffffffff) {
- KSycoca::flagError();
- }
- str.clear();
- } else if (bytes > 0) { // not empty
- int bt = bytes / 2;
- str.resize(bt);
- QChar *ch = str.data();
- char t[8192];
- char *b = t;
- s.readRawData(b, bytes);
- while (bt--) {
- *ch++ = ushort((ushort(b[0]) << 8) | uchar(b[1]));
- b += 2;
- }
- } else {
- str.clear();
- }
-}
-
-void KSycocaUtilsPrivate::read(QDataStream &s, QStringList &list)
-{
- list.clear();
- quint32 count;
- s >> count; // read size of list
- if (count >= 1024) {
- KSycoca::flagError();
- return;
- }
- for (quint32 i = 0; i < count; i++) {
- QString str;
- read(s, str);
- list.append(str);
- if (s.atEnd()) {
- KSycoca::flagError();
- return;
- }
- }
-}
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.21.0/src/sycoca/ksycocautils_p.h new/kservice-5.22.0/src/sycoca/ksycocautils_p.h
--- old/kservice-5.21.0/src/sycoca/ksycocautils_p.h 2016-04-03 23:02:37.000000000 +0200
+++ new/kservice-5.22.0/src/sycoca/ksycocautils_p.h 2016-05-07 17:23:20.000000000 +0200
@@ -30,11 +30,6 @@
namespace KSycocaUtilsPrivate
{
-/**
- * Safe demarshalling functions.
- */
-void read(QDataStream &s, QString &str);
-void read(QDataStream &s, QStringList &list);
// helper function for visitResourceDirectory
template<typename Visitor>