diff --git a/0001-Pixel-align-children-of-GridViewInternal.patch b/0001-Pixel-align-children-of-GridViewInternal.patch new file mode 100644 index 0000000..de01f4d --- /dev/null +++ b/0001-Pixel-align-children-of-GridViewInternal.patch @@ -0,0 +1,40 @@ +From 9725a21bcd0ee07c48be5077a735710c5658cf59 Mon Sep 17 00:00:00 2001 +From: Fabian Vogt +Date: Thu, 7 May 2020 11:41:04 +0200 +Subject: [PATCH] Pixel align children of GridViewInternal + +Summary: +The scroll bar size can be odd (for breeze it's 21), which causes leftMargin +to be 12.5. This causes every delegate inside to be blurred. + +Test Plan: Monkeypatched, now kcm_style is no longer blurred. + +Reviewers: #frameworks, broulik, mart, davidedmundson + +Reviewed By: broulik, davidedmundson + +Subscribers: kde-frameworks-devel + +Tags: #frameworks + +Differential Revision: https://phabricator.kde.org/D29503 +--- + src/qmlcontrols/kcmcontrols/qml/private/GridViewInternal.qml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/qmlcontrols/kcmcontrols/qml/private/GridViewInternal.qml b/src/qmlcontrols/kcmcontrols/qml/private/GridViewInternal.qml +index b55dea3..5d09a3d 100644 +--- a/src/qmlcontrols/kcmcontrols/qml/private/GridViewInternal.qml ++++ b/src/qmlcontrols/kcmcontrols/qml/private/GridViewInternal.qml +@@ -37,7 +37,7 @@ GridView { + anchors { + fill: parent + margins: 2 +- leftMargin: scroll.QtControls.ScrollBar.vertical.visible ? 2 : internal.scrollBarSpace/2 + 2 ++ leftMargin: scroll.QtControls.ScrollBar.vertical.visible ? 2 : Math.round(internal.scrollBarSpace/2) + 2 + } + clip: true + activeFocusOnTab: true +-- +2.26.2 + diff --git a/kdeclarative-5.69.0.tar.xz b/kdeclarative-5.69.0.tar.xz deleted file mode 100644 index 4db6fad..0000000 --- a/kdeclarative-5.69.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:916618a660f9ddc319019bf63576d7a67fdf62669ef178a87a95dbd311ff6f38 -size 176112 diff --git a/kdeclarative-5.69.0.tar.xz.sig b/kdeclarative-5.69.0.tar.xz.sig deleted file mode 100644 index 02f81f5..0000000 --- a/kdeclarative-5.69.0.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEEU+a0e0XOo+DVt0V3WNDuZIpIs7sFAl6JFLMACgkQWNDuZIpI -s7vYbAf+IUNFlfoVUEB5SJ3DVWWPhBpg02KKBLW6UisbhB8g38r2GueevtDXg+Vz -9PdGFW+TCTIjXFTcAGG/lDCjpiyHQ+uMamTcwH0dK7FWZdLoKYLLIDPQqG1udG3y -PjgZ9A4/jtMIgvCpi8M5NjFY44wKGRK7PNKtsQ0hT9RpoIBJqiv6y28X8nYjZY1C -GDn+qooemD9O6lQZ1f8KWOOGJEm7yz1VifQo+UR3gpCUyRRAdlXOL7un0BgXuAK3 -7WuaBUYdLuUPQ3ezy9ZIm8+U9/PT3dVxmhki4se68vtHr7fiA6k+mAdw7qOwcFhV -DG2QNbMTgI2q1gb0S3H2mvVeVn+ZmA== -=gIz0 ------END PGP SIGNATURE----- diff --git a/kdeclarative-5.70.0.tar.xz b/kdeclarative-5.70.0.tar.xz new file mode 100644 index 0000000..8655762 --- /dev/null +++ b/kdeclarative-5.70.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8914c2266d7ea32f8028aee13ae5a7f39a3583f7ec74a74584577fb0f2bc09ef +size 175644 diff --git a/kdeclarative-5.70.0.tar.xz.sig b/kdeclarative-5.70.0.tar.xz.sig new file mode 100644 index 0000000..5aa390b --- /dev/null +++ b/kdeclarative-5.70.0.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEEU+a0e0XOo+DVt0V3WNDuZIpIs7sFAl6t9DIACgkQWNDuZIpI +s7u5EAgApaSgcz+OrkhI/caRrm/4EATbPwi4XucorJ+snHDetTygMpPSKOtQ2Gdr +kmbfCAIun2DYR9fhYvJZHZ9aIzuG/cw2ucDmz/HOF0MNak4f34b0+Vg2fozzD4PI +7vlNVlhe7jcIcQX9VY3RQqIRCBF6G+PZ2VB9AVRige+T2hzyIbItu/X6msig9wbc +OCCnJyA7mce1r1NbpCty7+0635l6BKtjG4IKaGCXOhEtDD5b0t/vGR+fe7g2x7Ih +QguYgzE+iYWsStUmh4JSM2KiiW12NOMLZuplc/3gol4MJievH3qBhBkKmbjkL+ZL +xj5x7K0xRCVE4wEfUN8WK84tHRhYbQ== +=DnjP +-----END PGP SIGNATURE----- diff --git a/kdeclarative.changes b/kdeclarative.changes index 655a8b4..c417d19 100644 --- a/kdeclarative.changes +++ b/kdeclarative.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Thu May 7 11:24:52 UTC 2020 - Christophe Giboudeaux + +- Add upstream patch: + * 0001-Pixel-align-children-of-GridViewInternal.patch + +------------------------------------------------------------------- +Sun May 3 09:39:50 UTC 2020 - Christophe Giboudeaux + +- Update to 5.70.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/kde-frameworks-5.70.0 +- Changes since 5.69.0: + * Introduce SettingState* elements to ease KCM writing + * Properly name the content of the kcmcontrols project + * Tweak kcmcontrols docs + * Add startCapture method + * [KeySequenceHelper] Work around Meta modifier behavior + * Also relase the window in the destructor + ------------------------------------------------------------------- Sun Apr 5 19:45:27 UTC 2020 - Christophe Giboudeaux diff --git a/kdeclarative.spec b/kdeclarative.spec index 6eae6fe..23de417 100644 --- a/kdeclarative.spec +++ b/kdeclarative.spec @@ -17,14 +17,14 @@ %define lname libKF5Declarative5 -%define _tar_path 5.69 +%define _tar_path 5.70 # 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: kdeclarative -Version: 5.69.0 +Version: 5.70.0 Release: 0 Summary: Integration of QML and KDE workspaces License: LGPL-2.1-or-later @@ -36,6 +36,8 @@ Source1: https://download.kde.org/stable/frameworks/%{_tar_path}/%{name}- Source2: frameworks.keyring %endif Source99: baselibs.conf +# PATCH-FIX-UPSTREAM +Patch0: 0001-Pixel-align-children-of-GridViewInternal.patch BuildRequires: cmake >= 3.0 BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: fdupes @@ -122,7 +124,7 @@ Development files. %lang_package -n %{lname} %prep -%setup -q +%autosetup -p1 %build %cmake_kf5 -d build