rpm/kirigami2
SHA256
1
0
Fork 0
forked from pool/kirigami2
Code Pull Requests Activity

Accepting request 809465 from KDE:Frameworks5

Browse Source 
- Add patch to fix PlaceholderMessage with Qt 5.12:
  * fix-import-in-PlaceholderMessage.patch

OBS-URL: https://build.opensuse.org/request/show/809465
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kirigami2?expand=0&rev=41
This commit is contained in:
Dominique Leuenberger 2020-06-03 18:27:58 +00:00 committed by Git OBS Bridge
commit 50f4de08fa
3 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
fix-import-in-PlaceholderMessage.patch Normal file
View File

@ -0,0 +1,28 @@
From 38800b2b4d9affc1d068a929e57cbb70dc824e37 Mon Sep 17 00:00:00 2001
From: Matthieu Gallien <matthieu_gallien@yahoo.fr>
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

6
kirigami2.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed May 27 10:57:25 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
- Add patch to fix PlaceholderMessage with Qt 5.12:
* fix-import-in-PlaceholderMessage.patch
-------------------------------------------------------------------
Sun May 3 09:40:03 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>

2
kirigami2.spec
View File

@ -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