From 346a856106eac9a7731c37e71dff3057b4c6d69c85bce75f43aaac9e48454335 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Wed, 7 Aug 2019 12:43:55 +0000 Subject: [PATCH 1/3] Cleanup: - Don't lower minimum Qt version anymore - Drop patches for Qt 5.9 - Drop patches for Leap 42.x - Drop conditionals for no longer supported distribution versions OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kdeclarative?expand=0&rev=198 --- kdeclarative.changes | 5 +++++ kdeclarative.spec | 5 +---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/kdeclarative.changes b/kdeclarative.changes index 32ae7e1..419d86d 100644 --- a/kdeclarative.changes +++ b/kdeclarative.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jul 19 11:39:46 UTC 2019 - Wolfgang Bauer + +- Don't lower minimum Qt version anymore, it requires 5.11 now + ------------------------------------------------------------------- Sun Jul 14 06:41:37 UTC 2019 - lbeltrame@kde.org diff --git a/kdeclarative.spec b/kdeclarative.spec index f0864a6..0a0590a 100644 --- a/kdeclarative.spec +++ b/kdeclarative.spec @@ -58,9 +58,9 @@ KDeclarative provides integration of QML and KDE workspaces. %package -n %{lname} Summary: Integration of QML and KDE workspaces +Group: System/GUI/KDE # QQmlPropertyMap leaks private but exported QObjectPrivate symbol # https://bugreports.qt.io/browse/QTBUG-46433 and https://bugs.launchpad.net/bugs/1426335 -Group: System/GUI/KDE %requires_eq libQt5Core5 %if %{with lang} Recommends: %{lname}-lang = %{version} @@ -119,9 +119,6 @@ Development files. %prep %setup -q -%if 0%{?suse_version} == 1500 -sed -i -e "s/^set *(REQUIRED_QT_VERSION 5.10.0)$/set(REQUIRED_QT_VERSION 5.9.0)/" CMakeLists.txt -%endif %build %cmake_kf5 -d build From 815a582c89a98a381f872a0c58e51849b0acb8d6079785c57d758521196f2245 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sun, 11 Aug 2019 21:07:10 +0000 Subject: [PATCH 2/3] Frameworks 5.61 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kdeclarative?expand=0&rev=199 --- frameworks.keyring | 29 +++++++++++++++++++++++++++++ kdeclarative-5.60.0.tar.xz | 3 --- kdeclarative-5.61.0.tar.xz | 3 +++ kdeclarative-5.61.0.tar.xz.sig | 11 +++++++++++ kdeclarative.changes | 16 ++++++++++++++++ kdeclarative.spec | 14 +++++++++----- 6 files changed, 68 insertions(+), 8 deletions(-) create mode 100644 frameworks.keyring delete mode 100644 kdeclarative-5.60.0.tar.xz create mode 100644 kdeclarative-5.61.0.tar.xz create mode 100644 kdeclarative-5.61.0.tar.xz.sig diff --git a/frameworks.keyring b/frameworks.keyring new file mode 100644 index 0000000..7086353 --- /dev/null +++ b/frameworks.keyring @@ -0,0 +1,29 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQENBFfNUR8BCADDjPXScwObp7mWwUnrjqrM0gGg+pId6vqe0a5A4xr+Rgj26quK +2qJLym0mmul/uh2M8z486qDTQYQaTEppFCosH3WqFonTN2LWpHcujeVABXkAe9qo +DHBZZRMw8CXtiEwvJ/xV/MXTR7G0QCqT4HF045SAyyBjusBiiGly32JEDD4FdjHj +KKUrAJyyoc6frake7ZMO0SO3tQNwmi4T5KLSoxhi3Zgez2k9GPZEj4/W7l5Ne0zQ +7C8Tgo8wraqj/8pzjfP6+Dc2LHOTtu8DGDQkXEFa9VvuAotOtI8Kjff+bOd36WTL +L2dk69Bb7WbhRLkkavHZCdKOpfyBtVn+hGWRABEBAAG0G0RhdmlkIEZhdXJlIDxm +YXVyZUBrZGUub3JnPokBPQQTAQgAJwUCV81RHwIbAwUJCWYBgAULCQgHAgYVCAkK +CwIEFgIDAQIeAQIXgAAKCRBY0O5kikizu/01B/46hG+MaTFW1CVevZrGyPacmDRj +pQhx/ODadBkVXXaJyr7aNKT3EvAedyT82SGT/ch+aqXjZK1kEwK6zITqoOZZUt2I +CjBN4+UfLrWwlKldZShbhJ6NMHJIeYQ5EDlMw7TWVn0OPkRuDvLEasgOhxR9ZjWW +c5wlcZXXy8N+wGSR0bThzl0pdFcIy9Z3g411ZOvjUdDuWqtKUH9iy1VdVyba7FXI +x/BqAXIVsAaIFNsJBZZ7C7j1a1IlTykRLiDjh3mpyBfX4xfMTo4z6pjfQsoPebJl +TlCnwAkIxeyatGXm4OCqEA9zPVd1Ju7+XuEr6+15ENYJ4oYsZjfyScHHJdWMuQEN +BFfNUR8BCADe5wRc/QFL92npVAgzPQ9mJKopscRcxs0f2DM7EBPzUFvWGRIGRdB8 +obXfzBp4Pfyzqky7C1X/j7ENzx+Kol1AJ93wjUEfLoZ/zsvoj9ZT3GdjeVQeReKY +d4th7Jqo4qxvi33Pud0jZsENezzgdd4npiNN9bFX0mjNKNHL9o1n5nTm9pfDI/AS +PZz2RoRO7oUJb+aX6hKxTBaKoAiZHybAXQVchtwJx0O4wLbZ3E4ytJdcATlPDNXS +jw2Lmns8aGa6DBGyqiG6g1PlCnOI2Q/cQK1zbkSisfoCbpEq1MgIzuZSoJ00NIEp +eiACoR82565G68yAb+uKHkcFrYkfDT41ABEBAAGJASUEGAEIAA8FAlfNUR8CGwwF +CQlmAYAACgkQWNDuZIpIs7vWkgf9GNUZmD0UgbQmj0nwkEHum1g7LD+MZL0+P2kg +HyEL3Cm01ot9d+X5ed/gAJ6hDR55KYxHi+/wwwkCNDLoQoP+7VZq2fMiGD0/bDar +oWQqbckqDZU4l69u9NbYvVWHUerfwKfi0ZKN5sJqLwIkr57wEX0I/TBGoMuFB27q +2qyloS5m1Q2pke2mmZjKSqE0jxZJ7iFGJO/Buyjgd1B2kr0DaGaCrh0wjfVjAWpt +klK95Phry1jQc7W0Z4ZdWpB79S1yW670eutSC4fMjvsNxROGkPx4dDkyG5nToeau +zhEh/pXho2Eo/aFEqqY42GMSlN9rf7ekaTNo7OxsE7vvCB0fug== +=4o3u +-----END PGP PUBLIC KEY BLOCK----- diff --git a/kdeclarative-5.60.0.tar.xz b/kdeclarative-5.60.0.tar.xz deleted file mode 100644 index 4ca4b54..0000000 --- a/kdeclarative-5.60.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bbfd1438752866352e4fc7cb69b616c7413eb0b765f73777aa52d5063e2eefb4 -size 173240 diff --git a/kdeclarative-5.61.0.tar.xz b/kdeclarative-5.61.0.tar.xz new file mode 100644 index 0000000..79768d5 --- /dev/null +++ b/kdeclarative-5.61.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:464a77f88cce72c1616654c371068c11d51e484e0de5c0c5e032126d71afedaa +size 174692 diff --git a/kdeclarative-5.61.0.tar.xz.sig b/kdeclarative-5.61.0.tar.xz.sig new file mode 100644 index 0000000..d666e58 --- /dev/null +++ b/kdeclarative-5.61.0.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEEU+a0e0XOo+DVt0V3WNDuZIpIs7sFAl1GAJgACgkQWNDuZIpI +s7ve8wf9FzhZOYeMnHxzrHkSKRtTDS10MHHIGIo5VMejp+u92NhDixyRYzK4r9XN +35tbZv6/8C9qLWl4IR/wVuycqU6P3ADkJuzuOFhIgrUZJ5SxpMhrv/h6pCOLCz33 +eVN9PjF36ZB+r1xjmD6uuClNynEiu+8JGlaYauMsJpCo+NuKDTNALmKidB5O7v5F +UyojqHn6f5w0S9m0yF8XdW48Vqwe0cw9lm1cjPeg5yrUUJdIstdeb/KbhvmRwrAD +cX8j/GT5Ma0M2FDvAR5Y+uaRa8IwNDsSMS3hTGOYJRdm5okyAJbQSEyK2Ifb6F4P +b6jSIq8HIE6lYn4+hgew4Q4dOM5Jxg== +=uhga +-----END PGP SIGNATURE----- diff --git a/kdeclarative.changes b/kdeclarative.changes index 419d86d..0321f5e 100644 --- a/kdeclarative.changes +++ b/kdeclarative.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Wed Aug 7 17:51:16 UTC 2019 - Christophe Giboudeaux + +- Update to 5.61.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.61.0.php +- Changes since 5.60.0: + * Scrollview - Don't fill the parent with the view (kde#407643) + * introduce FallbackTapHandler + * Fix typo - GridView -> ScrollView + * KRun QML proxy: port away from deprecated KRun API + * Docs: fix bad example code + * KRun QML proxy: fix path/URL confusion + * Calendar events: allow plugins to show event details + ------------------------------------------------------------------- Fri Jul 19 11:39:46 UTC 2019 - Wolfgang Bauer diff --git a/kdeclarative.spec b/kdeclarative.spec index 0a0590a..40e56a5 100644 --- a/kdeclarative.spec +++ b/kdeclarative.spec @@ -17,21 +17,25 @@ %define lname libKF5Declarative5 -%define _tar_path 5.60 +%define _tar_path 5.61 # 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.60.0 +Version: 5.61.0 Release: 0 Summary: Integration of QML and KDE workspaces License: LGPL-2.1-or-later Group: System/GUI/KDE URL: https://www.kde.org -Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz -Source1: baselibs.conf +Source: https://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz +%if %{with_lang} +Source1: https://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz.sig +Source2: frameworks.keyring +%endif +Source99: baselibs.conf BuildRequires: cmake >= 3.0 BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: fdupes @@ -58,9 +62,9 @@ KDeclarative provides integration of QML and KDE workspaces. %package -n %{lname} Summary: Integration of QML and KDE workspaces -Group: System/GUI/KDE # QQmlPropertyMap leaks private but exported QObjectPrivate symbol # https://bugreports.qt.io/browse/QTBUG-46433 and https://bugs.launchpad.net/bugs/1426335 +Group: System/GUI/KDE %requires_eq libQt5Core5 %if %{with lang} Recommends: %{lname}-lang = %{version} From be66933a2762f55f7fbc3371675f6cfdb7bc9d5c9219794cf90da69c55412be6 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Mon, 12 Aug 2019 00:06:08 +0000 Subject: [PATCH 3/3] Fix the condition OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kdeclarative?expand=0&rev=200 --- kdeclarative.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kdeclarative.spec b/kdeclarative.spec index 40e56a5..f96c117 100644 --- a/kdeclarative.spec +++ b/kdeclarative.spec @@ -31,7 +31,7 @@ License: LGPL-2.1-or-later Group: System/GUI/KDE URL: https://www.kde.org Source: https://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz -%if %{with_lang} +%if %{with lang} Source1: https://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz.sig Source2: frameworks.keyring %endif