forked from pool/kirigami2
Accepting request 814369 from KDE:Frameworks5
KDE Frameworks 5.71.0 OBS-URL: https://build.opensuse.org/request/show/814369 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kirigami2?expand=0&rev=42
This commit is contained in:
commit
f99104af5c
@ -1,28 +0,0 @@
|
||||
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
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3cb81f127d5767848aad38fa1722dea7d9c77f70d31ac9088787266b5cf4732a
|
||||
size 257720
|
@ -1,11 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQEzBAABCgAdFiEEU+a0e0XOo+DVt0V3WNDuZIpIs7sFAl6t9H8ACgkQWNDuZIpI
|
||||
s7tNqgf+OMz1DZt9UMvSAgB0hETZfTrNojiJ4oLgekTMNHjx7+yulmwp/V+mkk/b
|
||||
1IAKcUosnVZ0f9p3GSdPCgtrdmY8Nk+eSllH2Mj2PLaqhi6pRTt1I9cIz425kXHW
|
||||
oV4MiWoJRgqSRhqkQyCtH4572zFtdvbalq5k7VMy3FP/0AzN3vRnEnnYQ5l8nBKE
|
||||
wjKv/3J7USJaiIdPkMZV7TMgrBpZzwV7qQyQiR8mjuReryQ/6lhfFFG4Q8FMqw3G
|
||||
OYKkHYBjvVVwZAJrDsHWQcA08BW1Rwbhi8wXcO8n2U/8CyIoJ0TjWh8NNEf4UeCP
|
||||
+UWX/x5RHZcWGbOwDBoTHHf5GWmPUQ==
|
||||
=G/vT
|
||||
-----END PGP SIGNATURE-----
|
3
kirigami2-5.71.0.tar.xz
Normal file
3
kirigami2-5.71.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f323efb96a809dc9e572a0e68e04c4f485fc27f9ae65ffa3988830e348151356
|
||||
size 271168
|
11
kirigami2-5.71.0.tar.xz.sig
Normal file
11
kirigami2-5.71.0.tar.xz.sig
Normal file
@ -0,0 +1,11 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQEzBAABCgAdFiEEU+a0e0XOo+DVt0V3WNDuZIpIs7sFAl7dOm4ACgkQWNDuZIpI
|
||||
s7uKgAgAhzyrfbN++0cY/bW1Oj9oAIgDI8cpTwSYmT4VRLgvHyALrFpUBAw9OTc+
|
||||
rj8sMau9qeH12O3txyrVy589Ry0LLT34rRUNU4h6znfEP9J10ztIHsa+AAM1LWAX
|
||||
fM6xQHQE+Q544EBJ6RDRb5Fxs2lthD7HpaFL0QlDVyZYGoeK2fsBfKki46Df6R7T
|
||||
Juzn1UV5OwdROc9Ry3m8eVRqpAX9UP8/Ke4DzGHT05cEO3YUuIU1hg8nJRBW1q14
|
||||
OHwS9XG8Pl82mIDiArWp26xs7g5iA/u2TaXsXWme91b2RKehODnS7rWxBcG1wTjw
|
||||
KhxWbJIiWRPk/DGnktmOYhPZQZnFGA==
|
||||
=MGEw
|
||||
-----END PGP SIGNATURE-----
|
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Jun 7 08:06:46 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
|
||||
|
||||
- Update to 5.71.0
|
||||
* New feature release
|
||||
* For more details please see:
|
||||
* https://kde.org/announcements/kde-frameworks-5.71.0
|
||||
- Too many changes since 5.70.0, only listing bugfixes:
|
||||
* Always use Window colorset for AbstractApplicationHeader (kde#421573)
|
||||
- Drop upstream patch:
|
||||
* fix-import-in-PlaceholderMessage.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed May 27 10:57:25 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
|
@ -17,14 +17,14 @@
|
||||
|
||||
|
||||
%define lname libKF5Kirigami2-5
|
||||
%define _tar_path 5.70
|
||||
%define _tar_path 5.71
|
||||
# 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}')}
|
||||
%bcond_without lang
|
||||
Name: kirigami2
|
||||
Version: 5.70.0
|
||||
Version: 5.71.0
|
||||
Release: 0
|
||||
Summary: Set of QtQuick components
|
||||
License: LGPL-2.1-or-later
|
||||
@ -35,10 +35,9 @@ 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(Qt5Concurrent) >= 5.12.0
|
||||
BuildRequires: cmake(Qt5Core) >= 5.12.0
|
||||
BuildRequires: cmake(Qt5DBus) >= 5.12.0
|
||||
BuildRequires: cmake(Qt5Gui) >= 5.12.0
|
||||
|
Loading…
Reference in New Issue
Block a user