From 101e8a7c0308a94690f6ac5519b8977dc4f2f7e426ddd337618467651bfc81f3 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sat, 8 Feb 2020 00:14:26 +0000 Subject: [PATCH 1/2] KDE Frameworks 5.67 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kirigami2?expand=0&rev=107 --- kirigami2-5.66.0.tar.xz | 3 --- kirigami2-5.66.0.tar.xz.sig | 11 ----------- kirigami2-5.67.0.tar.xz | 3 +++ kirigami2-5.67.0.tar.xz.sig | 11 +++++++++++ kirigami2.changes | 16 ++++++++++++++++ kirigami2.spec | 6 +++--- 6 files changed, 33 insertions(+), 17 deletions(-) delete mode 100644 kirigami2-5.66.0.tar.xz delete mode 100644 kirigami2-5.66.0.tar.xz.sig create mode 100644 kirigami2-5.67.0.tar.xz create mode 100644 kirigami2-5.67.0.tar.xz.sig diff --git a/kirigami2-5.66.0.tar.xz b/kirigami2-5.66.0.tar.xz deleted file mode 100644 index 20fe801..0000000 --- a/kirigami2-5.66.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4e4abfeaa5e997de52076786dd0d314f178bc883b1b48a8b2cf37dd5979ac41b -size 159452 diff --git a/kirigami2-5.66.0.tar.xz.sig b/kirigami2-5.66.0.tar.xz.sig deleted file mode 100644 index 1ae007d..0000000 --- a/kirigami2-5.66.0.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEEU+a0e0XOo+DVt0V3WNDuZIpIs7sFAl4QxSsACgkQWNDuZIpI -s7tHWggAs7KzAYQJyp6Y6s5b8njMKVVwCx0k+oKeNZ20zESyhCeHoD+LjWJMPm66 -yIwwgTYfD9MlwFe/yvRq4URq9Yrwy/WbC7ZuEMgXUw59wD0VO8wmv5YTneRadWgM -A8B11wY8ZGZhQJsmQ3PW/WgP6zno+exa/XvvpjN5aCohfVtxSply0bqCiYp0KEOZ -miGGlV5rAxRV2EBZjay7zwTfbIUYaL6T/SDoxsVtXhLd3rDKtTaxa9pEoNhImi7x -r7HzNRgerKpTBZlrEj2zI/9F5u8+7Ors1a0Dli/1GmdBwqmpEypcAMvUKX9ziYgk -34pF4sBEQz0V8VCjWQx9LEW4fGbM4g== -=euhD ------END PGP SIGNATURE----- diff --git a/kirigami2-5.67.0.tar.xz b/kirigami2-5.67.0.tar.xz new file mode 100644 index 0000000..c6c07b6 --- /dev/null +++ b/kirigami2-5.67.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:981d70554a36c062fee1c165ae2ced26f750ede4a5cee15574a04933bd2727e4 +size 160432 diff --git a/kirigami2-5.67.0.tar.xz.sig b/kirigami2-5.67.0.tar.xz.sig new file mode 100644 index 0000000..fb9ddf7 --- /dev/null +++ b/kirigami2-5.67.0.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEEU+a0e0XOo+DVt0V3WNDuZIpIs7sFAl420YUACgkQWNDuZIpI +s7tuvwf+OUPxUMf3GBh3Zl/eGo5R9QFLm2O54Ud5UmPxoJgWC5gjBshiNoC6ygq5 +vMQdg5bakO2JBnrAOlpbLuA+RSzNcfcAOKftau5gRKgAuaNahH9XB1S2DA+mSl0D +IgTw1b61dC14rVzmDlXdt+gvkN+mJC9uwzrrLW2lIUad33oHKa2MwdgQuWdv0Pe8 +SAZVPrMGO6T6ET2VxXmdRGi3yi6tc3OtApo4AW0YFiVR4qJl84dktTEagXONU08I +NJrk2Hy2ZKjODuOS2sanw0SvhGTFSKlYWw58DgRf03MpEgRmArhBRiJqWsQ/sW5/ +8b7YJM97f0TmKlt4XJS4nWgvVAQYgg== +=G+mv +-----END PGP SIGNATURE----- diff --git a/kirigami2.changes b/kirigami2.changes index aab9880..9e86167 100644 --- a/kirigami2.changes +++ b/kirigami2.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Sun Feb 2 18:07:01 UTC 2020 - Christophe Giboudeaux + +- Replace %make_jobs with %cmake_build. + +------------------------------------------------------------------- +Sun Feb 2 14:32:49 UTC 2020 - Christophe Giboudeaux + +- Update to 5.67.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.67.0.php +- Too many changes since 5.66.0, only listing bugfixes: + * Clip the flickable parent item (kde#416877) + * proper size hint for the gridlayout (kde#416860) + ------------------------------------------------------------------- Sun Jan 5 09:02:13 UTC 2020 - Christophe Giboudeaux diff --git a/kirigami2.spec b/kirigami2.spec index 70c1d70..f6d1a33 100644 --- a/kirigami2.spec +++ b/kirigami2.spec @@ -17,14 +17,14 @@ %define lname libKF5Kirigami2-5 -%define _tar_path 5.66 +%define _tar_path 5.67 # 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.66.0 +Version: 5.67.0 Release: 0 Summary: Set of QtQuick components License: LGPL-2.1-or-later @@ -80,7 +80,7 @@ Development files. %build %cmake_kf5 -d build -%make_jobs +%cmake_build %install %kf5_makeinstall -C build From 88cbe156bc6a109e4b70dd16008eb61684be5bf3c7072a6f00f0dd4ed854ae9c Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Mon, 10 Feb 2020 21:34:05 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kirigami2?expand=0&rev=108 --- ...t-correctly-alignedwhen-there-is-a-s.patch | 24 +++++++++++++++++++ kirigami2.changes | 5 ++++ kirigami2.spec | 1 + 3 files changed, 30 insertions(+) create mode 100644 0001-make-headerParent-correctly-alignedwhen-there-is-a-s.patch diff --git a/0001-make-headerParent-correctly-alignedwhen-there-is-a-s.patch b/0001-make-headerParent-correctly-alignedwhen-there-is-a-s.patch new file mode 100644 index 0000000..4249a0f --- /dev/null +++ b/0001-make-headerParent-correctly-alignedwhen-there-is-a-s.patch @@ -0,0 +1,24 @@ +From f695cde36a6829b8b92b2fd82deff16d9385fcb9 Mon Sep 17 00:00:00 2001 +From: Marco Martin +Date: Mon, 10 Feb 2020 11:48:50 +0100 +Subject: [PATCH] make headerParent correctly alignedwhen there is a scrollbar + +--- + src/controls/GlobalDrawer.qml | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/controls/GlobalDrawer.qml b/src/controls/GlobalDrawer.qml +index 0e8e5120..9166ad7a 100644 +--- a/src/controls/GlobalDrawer.qml ++++ b/src/controls/GlobalDrawer.qml +@@ -301,6 +301,7 @@ OverlayDrawer { + anchors { + left: parent.left + right: parent.right ++ rightMargin: Math.min(0, -scrollView.width + mainFlickable.width) + } + spacing: 0 + y: bannerImage.visible ? Math.max(headerContainer.height, -mainFlickable.contentY) - height : 0 +-- +2.25.0 + diff --git a/kirigami2.changes b/kirigami2.changes index 9e86167..636cb75 100644 --- a/kirigami2.changes +++ b/kirigami2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 10 21:33:36 UTC 2020 - Christophe Giboudeaux + +- Add upstream patch 0001-make-headerParent-correctly-alignedwhen-there-is-a-s.patch + ------------------------------------------------------------------- Sun Feb 2 18:07:01 UTC 2020 - Christophe Giboudeaux diff --git a/kirigami2.spec b/kirigami2.spec index f6d1a33..538a939 100644 --- a/kirigami2.spec +++ b/kirigami2.spec @@ -35,6 +35,7 @@ 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 +Patch0: 0001-make-headerParent-correctly-alignedwhen-there-is-a-s.patch BuildRequires: extra-cmake-modules >= %{_tar_path} BuildRequires: kf5-filesystem BuildRequires: cmake(Qt5Core) >= 5.7.0