Hello community,
here is the log from the commit of package frameworkintegration for
openSUSE:Factory checked in at 2018-01-09 14:39:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/frameworkintegration (Old)
and /work/SRC/openSUSE:Factory/.frameworkintegration.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "frameworkintegration"
Tue Jan 9 14:39:13 2018 rev:52 rq:559415 version:5.41.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/frameworkintegration/frameworkintegration.changes
2017-11-16 14:36:28.752536729 +0100
+++
/work/SRC/openSUSE:Factory/.frameworkintegration.new/frameworkintegration.changes
2018-01-09 14:41:09.761648464 +0100
@@ -1,0 +2,11 @@
+Sun Dec 17 09:43:47 CET 2017 - [email protected]
+
+- Update to 5.41.0
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/kde-frameworks-5.41.0.php
+- Changes since 5.40.0:
+ * We depend against qt5.7
+ * Support downloading the 2nd or 3rd download link from a KNS product
(kde#385429)
+
+-------------------------------------------------------------------
Old:
----
frameworkintegration-5.40.0.tar.xz
New:
----
frameworkintegration-5.41.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ frameworkintegration.spec ++++++
--- /var/tmp/diff_new_pack.liFitc/_old 2018-01-09 14:41:10.509613385 +0100
+++ /var/tmp/diff_new_pack.liFitc/_new 2018-01-09 14:41:10.513613197 +0100
@@ -17,13 +17,13 @@
%define lname libKF5Style5
-%define _tar_path 5.40
+%define _tar_path 5.41
# 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: %global _kf5_bugfix_version %(echo %{_kf5_version} |
awk -F. '{print $1"."$2}')}
Name: frameworkintegration
-Version: 5.40.0
+Version: 5.41.0
Release: 0
BuildRequires: cmake >= 3.0
BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version}
++++++ frameworkintegration-5.40.0.tar.xz -> frameworkintegration-5.41.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/frameworkintegration-5.40.0/CMakeLists.txt
new/frameworkintegration-5.41.0/CMakeLists.txt
--- old/frameworkintegration-5.40.0/CMakeLists.txt 2017-11-04
22:35:47.000000000 +0100
+++ new/frameworkintegration-5.41.0/CMakeLists.txt 2017-12-02
10:53:04.000000000 +0100
@@ -1,11 +1,11 @@
cmake_minimum_required(VERSION 3.0)
-set(KF5_VERSION "5.40.0") # handled by release scripts
-set(KF5_DEP_VERSION "5.40.0") # handled by release scripts
+set(KF5_VERSION "5.41.0") # handled by release scripts
+set(KF5_DEP_VERSION "5.41.0") # handled by release scripts
project(FrameworkIntegration VERSION ${KF5_VERSION})
include(FeatureSummary)
-find_package(ECM 5.40.0 NO_MODULE)
+find_package(ECM 5.41.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)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/frameworkintegration-5.40.0/src/kpackage-install-handlers/kns/main.cpp
new/frameworkintegration-5.41.0/src/kpackage-install-handlers/kns/main.cpp
--- old/frameworkintegration-5.40.0/src/kpackage-install-handlers/kns/main.cpp
2017-11-04 22:35:47.000000000 +0100
+++ new/frameworkintegration-5.41.0/src/kpackage-install-handlers/kns/main.cpp
2017-12-02 10:53:04.000000000 +0100
@@ -20,6 +20,7 @@
#include <QCoreApplication>
#include <QUrl>
+#include <QUrlQuery>
#include <QTimer>
#include <QDebug>
#include <QStandardPaths>
@@ -58,6 +59,18 @@
}
const auto providerid = pathParts.at(0);
const auto entryid = pathParts.at(1);
+ int linkid = 1;
+ if (url.hasQuery()) {
+ QUrlQuery query(url);
+ if (query.hasQueryItem(QLatin1String("linkid"))) {
+ bool ok;
+ linkid = query.queryItemValue(QLatin1String("linkid")).toInt(&ok);
+ if (!ok) {
+ qWarning() << "linkid is not an integer" << url << pathParts;
+ return 1;
+ }
+ }
+ }
KNSCore::Engine engine;
@@ -95,7 +108,7 @@
qWarning() << "kns error:" << error;
QCoreApplication::exit(1);
});
- QObject::connect(&engine, &KNSCore::Engine::signalEntryDetailsLoaded,
&engine, [providerid, &engine, &installedCount](const KNSCore::EntryInternal
&entry) {
+ QObject::connect(&engine, &KNSCore::Engine::signalEntryDetailsLoaded,
&engine, [providerid, linkid, &engine, &installedCount](const
KNSCore::EntryInternal &entry) {
// qDebug() << "checking..." << entry.status() << entry.providerId();
if (providerid != QUrl(entry.providerId()).host()) {
qWarning() << "Wrong provider" << providerid << "instead of" <<
QUrl(entry.providerId()).host();
@@ -103,7 +116,7 @@
} else if (entry.status() == KNS3::Entry::Downloadable) {
qDebug() << "installing...";
installedCount++;
- engine.install(entry);
+ engine.install(entry, linkid);
} else if (installedCount == 0) {
qDebug() << "already installed.";
QCoreApplication::exit(0);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/frameworkintegration-5.40.0/src/kstyle/kstyle.cpp
new/frameworkintegration-5.41.0/src/kstyle/kstyle.cpp
--- old/frameworkintegration-5.40.0/src/kstyle/kstyle.cpp 2017-11-04
22:35:47.000000000 +0100
+++ new/frameworkintegration-5.41.0/src/kstyle/kstyle.cpp 2017-12-02
10:53:04.000000000 +0100
@@ -443,9 +443,8 @@
return g.readEntry("GraphicEffectsLevel", true);
}
- #if QT_VERSION >= QT_VERSION_CHECK(5,5,0)
- case QStyle::SH_Menu_SubMenuSloppyCloseTimeout: return 300;
- #endif
+ case QStyle::SH_Menu_SubMenuSloppyCloseTimeout:
+ return 300;
case SH_ToolButtonStyle: {
KConfigGroup g(KSharedConfig::openConfig(), "Toolbar style");
