Hello community,
here is the log from the commit of package frameworkintegration for
openSUSE:Factory checked in at 2019-05-21 10:23:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/frameworkintegration (Old)
and /work/SRC/openSUSE:Factory/.frameworkintegration.new.5148 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "frameworkintegration"
Tue May 21 10:23:43 2019 rev:70 rq:703325 version:5.58.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/frameworkintegration/frameworkintegration.changes
2019-04-19 21:21:59.375691246 +0200
+++
/work/SRC/openSUSE:Factory/.frameworkintegration.new.5148/frameworkintegration.changes
2019-05-21 10:24:52.655564001 +0200
@@ -1,0 +2,19 @@
+Wed May 15 18:26:08 UTC 2019 - lbeltr...@kde.org
+
+- Update to 5.58.1
+ * New bugfix release
+ * For more details please see:
+ * https://www.kde.org/announcements/kde-frameworks-5.58.1.php
+- Changes since 5.58.0:
+ * search in the new location for knsrc files
+
+-------------------------------------------------------------------
+Wed May 15 18:16:15 UTC 2019 - lbeltr...@kde.org
+
+- Update to 5.58.0
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/kde-frameworks-5.58.0.php
+- No code changes since 5.57.0
+
+-------------------------------------------------------------------
Old:
----
frameworkintegration-5.57.0.tar.xz
New:
----
frameworkintegration-5.58.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ frameworkintegration.spec ++++++
--- /var/tmp/diff_new_pack.BuwB7s/_old 2019-05-21 10:24:53.359563730 +0200
+++ /var/tmp/diff_new_pack.BuwB7s/_new 2019-05-21 10:24:53.363563729 +0200
@@ -17,13 +17,13 @@
%define lname libKF5Style5
-%define _tar_path 5.57
+%define _tar_path 5.58
# 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: %define _kf5_bugfix_version %(echo %{_kf5_version} |
awk -F. '{print $1"."$2}')}
Name: frameworkintegration
-Version: 5.57.0
+Version: 5.58.1
Release: 0
Summary: Plugins responsible for better integration of Qt applications
in KDE Workspace
License: LGPL-2.1-or-later
++++++ frameworkintegration-5.57.0.tar.xz -> frameworkintegration-5.58.1.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/frameworkintegration-5.57.0/CMakeLists.txt
new/frameworkintegration-5.58.1/CMakeLists.txt
--- old/frameworkintegration-5.57.0/CMakeLists.txt 2019-04-07
09:16:28.000000000 +0200
+++ new/frameworkintegration-5.58.1/CMakeLists.txt 2019-05-14
23:21:33.000000000 +0200
@@ -1,11 +1,11 @@
cmake_minimum_required(VERSION 3.5)
-set(KF5_VERSION "5.57.0") # handled by release scripts
-set(KF5_DEP_VERSION "5.57.0") # handled by release scripts
+set(KF5_VERSION "5.58.0") # handled by release scripts
+set(KF5_DEP_VERSION "5.58.0") # handled by release scripts
project(FrameworkIntegration VERSION ${KF5_VERSION})
include(FeatureSummary)
-find_package(ECM 5.57.0 NO_MODULE)
+find_package(ECM 5.58.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.57.0/src/kpackage-install-handlers/kns/main.cpp
new/frameworkintegration-5.58.1/src/kpackage-install-handlers/kns/main.cpp
--- old/frameworkintegration-5.57.0/src/kpackage-install-handlers/kns/main.cpp
2019-04-07 09:16:28.000000000 +0200
+++ new/frameworkintegration-5.58.1/src/kpackage-install-handlers/kns/main.cpp
2019-05-14 23:21:33.000000000 +0200
@@ -24,6 +24,7 @@
#include <QTimer>
#include <QDebug>
#include <QStandardPaths>
+#include <QFile>
#include <KLocalizedString>
@@ -46,7 +47,15 @@
Q_ASSERT(url.isValid());
Q_ASSERT(url.scheme() == QLatin1String("kns"));
- const auto knsname =
QStandardPaths::locate(QStandardPaths::GenericConfigLocation, url.host());
+ QString knsname;
+ for (const auto &location : KNSCore::Engine::configSearchLocations()) {
+ QString candidate = location + QLatin1Char('/') + url.host();
+ if (QFile::exists(candidate)) {
+ knsname = candidate;
+ break;
+ }
+ }
+
if (knsname.isEmpty()) {
qWarning() << "couldn't find knsrc file for" << url.host();
return 1;
