From 9021200cc2acf33b1a938b9e33841e5b847fa5cd7b6dc709d334fdae897c31f3 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Fri, 14 Sep 2018 13:48:57 +0000 Subject: [PATCH 1/5] KDE Frameworks 5.50.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kirigami2?expand=0&rev=58 --- kirigami2-5.49.0.tar.xz | 3 --- kirigami2-5.50.0.tar.xz | 3 +++ kirigami2.changes | 10 ++++++++++ kirigami2.spec | 4 ++-- 4 files changed, 15 insertions(+), 5 deletions(-) delete mode 100644 kirigami2-5.49.0.tar.xz create mode 100644 kirigami2-5.50.0.tar.xz diff --git a/kirigami2-5.49.0.tar.xz b/kirigami2-5.49.0.tar.xz deleted file mode 100644 index 18af51b..0000000 --- a/kirigami2-5.49.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5fd1c7fb34faa9d739967d24a261be85a9d8a908a54927ddf7fbcb3d0f4c56f1 -size 326532 diff --git a/kirigami2-5.50.0.tar.xz b/kirigami2-5.50.0.tar.xz new file mode 100644 index 0000000..95e238a --- /dev/null +++ b/kirigami2-5.50.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b4673b6c6739f58839cc1d7f47de9b288361e5718ec40f8f3eabd00874ee8449 +size 119288 diff --git a/kirigami2.changes b/kirigami2.changes index 0e38a67..6e65800 100644 --- a/kirigami2.changes +++ b/kirigami2.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Sep 13 21:58:45 UTC 2018 - lbeltrame@kde.org + +- Update to 5.50.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.50.0.php +- Changes since 5.49.0: + * Too many changes to list here + ------------------------------------------------------------------- Sun Aug 19 09:19:12 UTC 2018 - christophe@krop.fr diff --git a/kirigami2.spec b/kirigami2.spec index cefc56d..8b0bee6 100644 --- a/kirigami2.spec +++ b/kirigami2.spec @@ -17,14 +17,14 @@ %define lname libKF5Kirigami2-5 -%define _tar_path 5.49 +%define _tar_path 5.50 # 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.49.0 +Version: 5.50.0 Release: 0 Summary: Set of QtQuick components License: LGPL-2.1-or-later From 922b43d1c79133aa90bb7cae5c4a363421e1cc130b876d6fd2fccbc822122fa0 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Fri, 14 Sep 2018 13:50:46 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kirigami2?expand=0&rev=59 --- fix-build-with-gcc48.patch | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 fix-build-with-gcc48.patch diff --git a/fix-build-with-gcc48.patch b/fix-build-with-gcc48.patch deleted file mode 100644 index 14b209e..0000000 --- a/fix-build-with-gcc48.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 4f92428600aa0bcee9a300884941803383f1da41 Mon Sep 17 00:00:00 2001 -From: Wolfgang Bauer -Date: Wed, 13 Jun 2018 12:11:25 +0200 -Subject: [PATCH] Fix build with gcc 4.8 - -See https://bugreports.qt.io/browse/QTBUG-48988 ---- - src/delegaterecycler.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/delegaterecycler.cpp b/src/delegaterecycler.cpp -index f648fc7..b51b5dd 100644 ---- a/src/delegaterecycler.cpp -+++ b/src/delegaterecycler.cpp -@@ -213,7 +213,7 @@ void DelegateRecycler::setSourceComponent(QQmlComponent *component) - if (!m_item) { - obj->deleteLater(); - } else { -- connect(m_item, &QObject::destroyed, ctx, &QObject::deleteLater); -+ connect(m_item.data(), &QObject::destroyed, ctx, &QObject::deleteLater); - } - } else { - QQmlContext *ctx = QQmlEngine::contextForObject(m_item)->parentContext(); --- -2.13.7 - From 327385e5a8dd8aa9a322984c9e58ee256b742890477405391da205523ca9c75a Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Fri, 14 Sep 2018 13:52:08 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kirigami2?expand=0&rev=60 --- kirigami2.changes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kirigami2.changes b/kirigami2.changes index 6e65800..1b03c3f 100644 --- a/kirigami2.changes +++ b/kirigami2.changes @@ -7,6 +7,8 @@ Thu Sep 13 21:58:45 UTC 2018 - lbeltrame@kde.org * https://www.kde.org/announcements/kde-frameworks-5.50.0.php - Changes since 5.49.0: * Too many changes to list here +- Dropped patches, now upstream: + * fix-build-with-gcc48.patch ------------------------------------------------------------------- Sun Aug 19 09:19:12 UTC 2018 - christophe@krop.fr From d67d46895b014f0c614fa64aed3fdd4f4be75d1e7edec5891c5081984f7ae988 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Fri, 14 Sep 2018 13:52:25 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kirigami2?expand=0&rev=61 --- kirigami2.spec | 5 ----- 1 file changed, 5 deletions(-) diff --git a/kirigami2.spec b/kirigami2.spec index 8b0bee6..b915022 100644 --- a/kirigami2.spec +++ b/kirigami2.spec @@ -31,8 +31,6 @@ License: LGPL-2.1-or-later Group: Development/Libraries/KDE URL: http://www.kde.org/ Source: https://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz -# PATCH-FIX-OPENSUSE -Patch0: fix-build-with-gcc48.patch BuildRequires: extra-cmake-modules >= %{_tar_path} BuildRequires: kf5-filesystem BuildRequires: cmake(Qt5Core) >= 5.7.0 @@ -74,9 +72,6 @@ Development files. %prep %setup -q -%if 0%{?suse_version} < 1500 -%patch0 -p1 -%endif %build %cmake_kf5 -d build From 1b1d11847979cc486ca254e7d2b55588fa85514f815eee218121a52d47ce7fab Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Sat, 15 Sep 2018 10:46:36 +0000 Subject: [PATCH 5/5] - Require the library in the -devel subpackage OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kirigami2?expand=0&rev=62 --- kirigami2.changes | 5 +++++ kirigami2.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/kirigami2.changes b/kirigami2.changes index 1b03c3f..e15c935 100644 --- a/kirigami2.changes +++ b/kirigami2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Sep 15 10:46:05 UTC 2018 - fabian@ritter-vogt.de + +- Require the library in the -devel subpackage + ------------------------------------------------------------------- Thu Sep 13 21:58:45 UTC 2018 - lbeltrame@kde.org diff --git a/kirigami2.spec b/kirigami2.spec index b915022..8945eea 100644 --- a/kirigami2.spec +++ b/kirigami2.spec @@ -62,6 +62,7 @@ Based on Qt Quick Controls 2. This package contains the base shared libraries. %package devel Summary: Development package for kirigami Group: Development/Libraries/KDE +Requires: %{lname} = %{version} Requires: %{name} = %{version} %description devel