Hello community,
here is the log from the commit of package plasma-framework for
openSUSE:Factory checked in at 2019-02-28 21:33:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/plasma-framework (Old)
and /work/SRC/openSUSE:Factory/.plasma-framework.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasma-framework"
Thu Feb 28 21:33:12 2019 rev:72 rq:678727 version:5.55.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/plasma-framework/plasma-framework.changes
2019-02-14 14:29:38.755754806 +0100
+++
/work/SRC/openSUSE:Factory/.plasma-framework.new.28833/plasma-framework.changes
2019-02-28 21:33:14.765737512 +0100
@@ -1,0 +2,7 @@
+Fri Feb 15 09:25:42 UTC 2019 - [email protected]
+
+- Add 0001-Revert-Remove-Qt-version-check.patch to revert the commit
+ that removes support for Qt < 5.10
+- Downgrade the Qt version requirement to build with 5.9
+
+-------------------------------------------------------------------
New:
----
0001-Revert-Remove-Qt-version-check.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ plasma-framework.spec ++++++
--- /var/tmp/diff_new_pack.ewpx4s/_old 2019-02-28 21:33:16.185737066 +0100
+++ /var/tmp/diff_new_pack.ewpx4s/_new 2019-02-28 21:33:16.213737057 +0100
@@ -32,6 +32,8 @@
URL: https://www.kde.org
Source:
http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz
Source1: baselibs.conf
+# PATCH-FIX-OPENSUSE
+Patch0: 0001-Revert-Remove-Qt-version-check.patch
BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version}
BuildRequires: fdupes
BuildRequires: kactivities5-devel >= 5.19.0
@@ -129,6 +131,10 @@
%prep
%setup -q
+%autopatch -p1
+%if 0%{?suse_version} == 1500
+sed -i -e "s/^set *(REQUIRED_QT_VERSION 5.10.0)$/set(REQUIRED_QT_VERSION
5.9.0)/" CMakeLists.txt
+%endif
%build
%cmake_kf5 -d build
++++++ 0001-Revert-Remove-Qt-version-check.patch ++++++
>From 39aa628e17145ca250458e20ae922c3bd0e4e9c6 Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <[email protected]>
Date: Mon, 7 Jan 2019 00:35:45 +0100
Subject: Remove Qt version check
Now that Qt 5.10 is the minimum required version
---
src/declarativeimports/core/iconitem.cpp | 7 -------
src/plasmaquick/dialog.cpp | 2 --
2 files changed, 9 deletions(-)
Reverted and rebased by Antonio Larrosa <[email protected]> so Qt 5.9 is
still supported
diff --git a/src/declarativeimports/core/iconitem.cpp
b/src/declarativeimports/core/iconitem.cpp
index 70baa88..fd46f6d 100644
--- a/src/declarativeimports/core/iconitem.cpp
+++ b/src/declarativeimports/core/iconitem.cpp
@@ -67,6 +67,11 @@ IconItem::IconItem(QQuickItem *parent)
connect(KIconLoader::global(), &KIconLoader::iconLoaderSettingsChanged,
this, &IconItem::updateImplicitSize);
+#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)
+ connect(this, &QQuickItem::enabledChanged,
+ this, &IconItem::onEnabledChanged);
+#endif
+
connect(this, &IconItem::implicitWidthChanged, this,
&IconItem::implicitWidthChanged2);
connect(this, &IconItem::implicitHeightChanged, this,
&IconItem::implicitHeightChanged2);
@@ -667,8 +672,10 @@ void IconItem::itemChange(ItemChange change, const
ItemChangeData &value)
{
if (change == ItemVisibleHasChanged && value.boolValue) {
m_blockNextAnimation = true;
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
} else if (change == ItemEnabledHasChanged) {
onEnabledChanged();
+#endif
} else if (change == ItemSceneChange && value.window) {
schedulePixmapUpdate();
}
diff --git a/src/plasmaquick/dialog.cpp b/src/plasmaquick/dialog.cpp
index 46f4cec..4b7d770 100644
--- a/src/plasmaquick/dialog.cpp
+++ b/src/plasmaquick/dialog.cpp
@@ -1365,8 +1365,10 @@ void Dialog::setVisible(bool visible)
setPosition(popupPosition(d->visualParent, size()));
}
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
// Bug 381242: Qt remembers minimize state and re-applies it when
showing
setWindowStates(windowStates() & ~Qt::WindowMinimized);
+#endif
QQuickWindow::setVisible(visible);
//signal will be emitted and proxied from the QQuickWindow code
} else {
--
cgit v1.1
