From e2ce1c131038482bd843963134c5409f55971abfe41619027aff9615ed979832 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Wed, 27 May 2020 10:59:39 +0000 Subject: [PATCH] - Add patch to fix PlaceholderMessage with Qt 5.12: * fix-import-in-PlaceholderMessage.patch OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kirigami2?expand=0&rev=116 --- fix-import-in-PlaceholderMessage.patch | 28 ++++++++++++++++++++++++++ kirigami2.changes | 6 ++++++ kirigami2.spec | 2 ++ 3 files changed, 36 insertions(+) create mode 100644 fix-import-in-PlaceholderMessage.patch diff --git a/fix-import-in-PlaceholderMessage.patch b/fix-import-in-PlaceholderMessage.patch new file mode 100644 index 0000000..c54b873 --- /dev/null +++ b/fix-import-in-PlaceholderMessage.patch @@ -0,0 +1,28 @@ +From 38800b2b4d9affc1d068a929e57cbb70dc824e37 Mon Sep 17 00:00:00 2001 +From: Matthieu Gallien +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 + diff --git a/kirigami2.changes b/kirigami2.changes index 0f74efe..600d3f6 100644 --- a/kirigami2.changes +++ b/kirigami2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed May 27 10:57:25 UTC 2020 - Fabian Vogt + +- Add patch to fix PlaceholderMessage with Qt 5.12: + * fix-import-in-PlaceholderMessage.patch + ------------------------------------------------------------------- Sun May 3 09:40:03 UTC 2020 - Christophe Giboudeaux diff --git a/kirigami2.spec b/kirigami2.spec index 2dffe36..338f196 100644 --- a/kirigami2.spec +++ b/kirigami2.spec @@ -35,6 +35,8 @@ Source: https://download.kde.org/stable/frameworks/%{_tar_path}/%{name}- 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