From 51d6d27601365078153a75019daed404514cf3bdb231b0c345b84679373561b1 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Wed, 13 Jun 2018 22:11:25 +0000 Subject: [PATCH 1/2] KDE Frameworks 5.47.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kirigami2?expand=0&rev=51 --- kirigami2-5.46.0.tar.xz | 3 --- kirigami2-5.47.0.tar.xz | 3 +++ kirigami2.changes | 34 ++++++++++++++++++++++++++++++++++ kirigami2.spec | 18 ++++++++++-------- 4 files changed, 47 insertions(+), 11 deletions(-) delete mode 100644 kirigami2-5.46.0.tar.xz create mode 100644 kirigami2-5.47.0.tar.xz diff --git a/kirigami2-5.46.0.tar.xz b/kirigami2-5.46.0.tar.xz deleted file mode 100644 index 687e015..0000000 --- a/kirigami2-5.46.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0d55f4d5bbe4f3b13c472321119f7fafe59281fd280f14e5a312b869d824dcb4 -size 316028 diff --git a/kirigami2-5.47.0.tar.xz b/kirigami2-5.47.0.tar.xz new file mode 100644 index 0000000..70cf70e --- /dev/null +++ b/kirigami2-5.47.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ed2dd9e3a56f4728aca40c74ab02d48f9dda8d140b20328c5b29825f5683aad5 +size 317692 diff --git a/kirigami2.changes b/kirigami2.changes index f1be2b7..a07d59f 100644 --- a/kirigami2.changes +++ b/kirigami2.changes @@ -1,3 +1,37 @@ +------------------------------------------------------------------- +Tue Jun 12 21:26:05 UTC 2018 - lbeltrame@kde.org + +- Update to 5.47.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.47.0.php +- Changes since 5.46.0: + * Show action.main more prominently on the ToolBarApplicationHeader + * Allow Kirigami build without KWin tablet mode dependency + * correct swipefilter on RTL + * correct resizing of contentItem + * fix --reverse behavior + * share contextobject to always access i18n + * make sure tooltip is hidden + * make sure to not assign invalid variants to the tracked proeprties + * fix a couple of warnings + * handle not a MouseArea, dropped() signal + * no hover effects on mobile + * proper icons overflow-menu-left and right + * remove useless debug + * not hoverenabled + * Drag handle to reorder items in a ListView + * Add Settings class to API documentation + * Use Mnemonics on the toolbar buttons + * Use override + * Added missing files in QMake's .pri + * [API dox] Fix Kirigami.InlineMessageType -> Kirigami.MessageType + * fix applicationheaders in applicationitem + * fix build on macos/ios + * Fix warnings + * Remove wrong warning + * Don't allow showing/hiding the drawer when there's no handle (kde#393776) + ------------------------------------------------------------------- Sun May 13 21:03:03 UTC 2018 - lbeltrame@kde.org diff --git a/kirigami2.spec b/kirigami2.spec index 2fefbff..c3972c5 100644 --- a/kirigami2.spec +++ b/kirigami2.spec @@ -17,11 +17,15 @@ %define lname libKF5Kirigami2-5 +%define _tar_path 5.47 %bcond_without lang -%define _tar_path 5.46 Name: kirigami2 -Version: 5.46.0 +Version: 5.47.0 Release: 0 +# 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: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} Summary: Set of QtQuick components License: LGPL-2.1-or-later Group: Development/Libraries/KDE @@ -36,13 +40,12 @@ BuildRequires: cmake(Qt5Quick) >= 5.7.0 BuildRequires: cmake(Qt5QuickControls2) >= 5.7.0 BuildRequires: cmake(Qt5Svg) >= 5.7.0 BuildRequires: cmake(Qt5Test) >= 5.7.0 -Requires: libqt5-qtgraphicaleffects -Requires: libqt5-qtquickcontrols2 -BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{with lang} BuildRequires: cmake(Qt5LinguistTools) >= 5.7.0 -Recommends: %{name}-lang = %{version} %endif +Requires: libqt5-qtgraphicaleffects +Requires: libqt5-qtquickcontrols2 +Recommends: %{name}-lang = %{version} %description QtQuick plugins to build user interfaces based on the KDE UX guidelines. @@ -89,11 +92,10 @@ Development files. %postun -n %{lname} -p /sbin/ldconfig %files -%doc LICENSE* %{_kf5_qmldir}/ %files -n %{lname} -%doc LICENSE* +%license LICENSE* %{_kf5_libdir}/libKF5Kirigami2.so.* %files devel From 4678c3aff7014eaca8109b94934eae2d70b1f018347797196304e22437bb3f5b Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Thu, 14 Jun 2018 04:50:14 +0000 Subject: [PATCH 2/2] Accepting request 616631 from home:wolfi323:branches:home:luca_b:kf547 - Add fix-build-with-gcc48.patch to make it compile with gcc 4.8 on Leap 42.3 OBS-URL: https://build.opensuse.org/request/show/616631 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kirigami2?expand=0&rev=52 --- fix-build-with-gcc48.patch | 26 ++++++++++++++++++++++++++ kirigami2.changes | 6 ++++++ kirigami2.spec | 5 +++++ 3 files changed, 37 insertions(+) create mode 100644 fix-build-with-gcc48.patch diff --git a/fix-build-with-gcc48.patch b/fix-build-with-gcc48.patch new file mode 100644 index 0000000..14b209e --- /dev/null +++ b/fix-build-with-gcc48.patch @@ -0,0 +1,26 @@ +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 + diff --git a/kirigami2.changes b/kirigami2.changes index a07d59f..9adf8c7 100644 --- a/kirigami2.changes +++ b/kirigami2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jun 13 17:03:25 UTC 2018 - wbauer@tmo.at + +- Add fix-build-with-gcc48.patch to make it compile with gcc 4.8 on + Leap 42.3 + ------------------------------------------------------------------- Tue Jun 12 21:26:05 UTC 2018 - lbeltrame@kde.org diff --git a/kirigami2.spec b/kirigami2.spec index c3972c5..a995ecd 100644 --- a/kirigami2.spec +++ b/kirigami2.spec @@ -31,6 +31,8 @@ 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 +Patch: fix-build-with-gcc48.patch BuildRequires: extra-cmake-modules >= %{_tar_path} BuildRequires: kf5-filesystem BuildRequires: cmake(Qt5Core) >= 5.7.0 @@ -72,6 +74,9 @@ Development files. %prep %setup -q +%if 0%{?suse_version} < 1500 +%patch -p1 +%endif %build %cmake_kf5 -d build