Hello community, here is the log from the commit of package kirigami2 for openSUSE:Leap:15.2 checked in at 2020-06-11 16:17:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/kirigami2 (Old) and /work/SRC/openSUSE:Leap:15.2/.kirigami2.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kirigami2" Thu Jun 11 16:17:56 2020 rev:65 rq:809466 version:5.70.0 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/kirigami2/kirigami2.changes 2020-05-12 11:39:17.368612676 +0200 +++ /work/SRC/openSUSE:Leap:15.2/.kirigami2.new.3606/kirigami2.changes 2020-06-11 16:17:57.630737301 +0200 @@ -1,0 +2,6 @@ +Wed May 27 10:57:25 UTC 2020 - Fabian Vogt <[email protected]> + +- Add patch to fix PlaceholderMessage with Qt 5.12: + * fix-import-in-PlaceholderMessage.patch + +------------------------------------------------------------------- New: ---- fix-import-in-PlaceholderMessage.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kirigami2.spec ++++++ --- /var/tmp/diff_new_pack.OojSkn/_old 2020-06-11 16:17:58.198738771 +0200 +++ /var/tmp/diff_new_pack.OojSkn/_new 2020-06-11 16:17:58.202738782 +0200 @@ -35,6 +35,8 @@ Source1: https://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz.sig Source2: frameworks.keyring %endif +# PATCH-FIX-UPSTREAM https://invent.kde.org/frameworks/kirigami/-/merge_requests/9 +Patch1: fix-import-in-PlaceholderMessage.patch BuildRequires: extra-cmake-modules >= %{_tar_path} BuildRequires: kf5-filesystem BuildRequires: cmake(Qt5Core) >= 5.12.0 ++++++ fix-import-in-PlaceholderMessage.patch ++++++ >From 38800b2b4d9affc1d068a929e57cbb70dc824e37 Mon Sep 17 00:00:00 2001 From: Matthieu Gallien <[email protected]> Date: Wed, 27 May 2020 12:27:01 +0200 Subject: [PATCH] PlaceholderMessage depends on Qt 5.13 even if CMakeLists.txt requires 5.12 the import of QtQuick.Layouts in PlaceholderMessage.qml requires 1.13 in contradiction with the required Qt version in CMakeLists.txt --- src/controls/PlaceholderMessage.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/controls/PlaceholderMessage.qml b/src/controls/PlaceholderMessage.qml index 574fbf10..681d9f0e 100644 --- a/src/controls/PlaceholderMessage.qml +++ b/src/controls/PlaceholderMessage.qml @@ -6,7 +6,7 @@ import QtQuick 2.0 import QtQuick.Controls 2.4 as QQC2 -import QtQuick.Layouts 1.13 +import QtQuick.Layouts 1.12 import org.kde.kirigami 2.12 as Kirigami import "private" -- 2.26.2
