From 33f493d979a48eb2674c1da70e482770aaf4c5f3c281608da389e254193c299e Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Sat, 12 Sep 2020 12:54:36 +0000 Subject: [PATCH] osc copypac from project:KDE:Frameworks5 package:purpose revision:89 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/purpose?expand=0&rev=91 --- ...t-Port-some-qt5.15-deprecated-method.patch | 33 ------------------- purpose-5.73.0.tar.xz | 3 -- purpose-5.73.0.tar.xz.sig | 11 ------- purpose-5.74.0.tar.xz | 3 ++ purpose-5.74.0.tar.xz.sig | 11 +++++++ purpose.changes | 18 ++++++++-- purpose.spec | 13 ++++---- 7 files changed, 36 insertions(+), 56 deletions(-) delete mode 100644 0001-Revert-Port-some-qt5.15-deprecated-method.patch delete mode 100644 purpose-5.73.0.tar.xz delete mode 100644 purpose-5.73.0.tar.xz.sig create mode 100644 purpose-5.74.0.tar.xz create mode 100644 purpose-5.74.0.tar.xz.sig diff --git a/0001-Revert-Port-some-qt5.15-deprecated-method.patch b/0001-Revert-Port-some-qt5.15-deprecated-method.patch deleted file mode 100644 index d21cb81..0000000 --- a/0001-Revert-Port-some-qt5.15-deprecated-method.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 565032fe5b2db979a7554735707a5415cebca3fc Mon Sep 17 00:00:00 2001 -From: Nicolas Fella -Date: Sun, 2 Aug 2020 19:16:47 +0200 -Subject: [PATCH] Revert "Port some qt5.15 deprecated method" - -QLocalSocket::socketError does not exist and error isn't actually deprecated - -This reverts commit 3f430a23057dde018fa2df7bfa90a01f9d68a97f. ---- - src/externalprocess/purposeprocess_main.cpp | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - -diff --git a/src/externalprocess/purposeprocess_main.cpp b/src/externalprocess/purposeprocess_main.cpp -index 170777c..bc308ed 100644 ---- a/src/externalprocess/purposeprocess_main.cpp -+++ b/src/externalprocess/purposeprocess_main.cpp -@@ -90,12 +90,7 @@ public: - - private Q_SLOTS: - void error() { --#if (QT_VERSION <= QT_VERSION_CHECK(5, 15, 0)) -- const auto socketError = m_socket.error(); --#else -- const auto socketError = m_socket.socketError(); --#endif -- qCWarning(PURPOSE_EXTERNAL_PROCESS_LOG) << "socket error:" << socketError; -+ qCWarning(PURPOSE_EXTERNAL_PROCESS_LOG) << "socket error:" << m_socket.error(); - } - - void propertyChanged() { --- -2.25.1 - diff --git a/purpose-5.73.0.tar.xz b/purpose-5.73.0.tar.xz deleted file mode 100644 index 936413f..0000000 --- a/purpose-5.73.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6f4d440cb708b636430e3206f879ca5c2e6cdfcf62f92ce173d43e291fbeed32 -size 155468 diff --git a/purpose-5.73.0.tar.xz.sig b/purpose-5.73.0.tar.xz.sig deleted file mode 100644 index 7429fe3..0000000 --- a/purpose-5.73.0.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEEU+a0e0XOo+DVt0V3WNDuZIpIs7sFAl8lz+8ACgkQWNDuZIpI -s7vZdwf+J9l6i0rMUGxIqOXjs62Eru6nD+Gfa+epWdyvlqtMSjkGuIMlFoHYIgIz -BZQdJHApiG40hWpd6bLSiA15lC8Q3cv/QGZHsYsAzVj/yUUDPYq0pF90dcyMJiNo -eBshaXT+hwUEBP//e3rVFBU0lFVqi2TwHAyE5cLFvXZ3MGTFW7D9W6dK/2IxY6Z7 -nGGZTEaPWz055jy1bqgLfHFrWmZdKIkQkED5c4CWAsmvwdFGlH0YpL6KYWWt3lwN -xrctbdzeG7bIn/jNhZZXrG3xml4awYpl9LSkkzrDB2sAfp4iBSs5LJ9czRRFUDH8 -OTEgs1WpJfZPkj9K4hLhpyvES5G9ug== -=hH2s ------END PGP SIGNATURE----- diff --git a/purpose-5.74.0.tar.xz b/purpose-5.74.0.tar.xz new file mode 100644 index 0000000..af6d51a --- /dev/null +++ b/purpose-5.74.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1f65696558e82808b2beb3715da2e833a6e1f214f33bcc670ef0f023bb044205 +size 156216 diff --git a/purpose-5.74.0.tar.xz.sig b/purpose-5.74.0.tar.xz.sig new file mode 100644 index 0000000..e82395a --- /dev/null +++ b/purpose-5.74.0.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEEU+a0e0XOo+DVt0V3WNDuZIpIs7sFAl9UyjYACgkQWNDuZIpI +s7tdEQf/UgerLNJQ7eDIKElVW99O9OyqtYasWo+Ru6Kty5xGoDVkW3yJlp5+UXLv +/7iXaoeimZjd9BwA6tFk5Eg0YXOiwD/ZsMOguk1vZHo77PRf4LbIj+4lkVSnah1y +UDOKLrz/iqIxkRIplbSxScYGYMgnsSYeszzpFrpDARsYNRhdRtgaKrmZHq0n6tJ+ +8G7Hiw9NcdlRBHqb22aAmml+tlkKVaKW6S4vhJmxaA83KQEbN/SqkOWMt7wLbt7q +CUOtNIIc1p1s+VDM9CkA/GMVcSe9lDtP61GGIeW6JaFVM+cZUxn6CGpz6YqGqHn1 +KcDAtWQ1ptjJzyVaUl0jtVkrs2uwzg== +=fUWD +-----END PGP SIGNATURE----- diff --git a/purpose.changes b/purpose.changes index 76afbc3..64c776b 100644 --- a/purpose.changes +++ b/purpose.changes @@ -1,8 +1,20 @@ ------------------------------------------------------------------- -Sat Sep 12 11:17:45 UTC 2020 - Fabian Vogt +Sun Sep 6 12:50:30 UTC 2020 - Christophe Giboudeaux -- Add patch to fix build with Qt 5.15.1: - * 0001-Revert-Port-some-qt5.15-deprecated-method.patch +- Update to 5.74.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/kde-frameworks-5.74.0 +- Changes since 5.73.0: + * autotests: append to $QML2_IMPORT_PATH rather than replacing it + * Apply initial configuration data when loading config UI + * Restore behaviour of AlternativesView + * [jobcontroller] Disable separate process + * Rework job view handling (kde#419170) + * Remove obsolete COPYING files + * Remove obsolete KDevelop information + * Add license texts according to REUSE specification + * Convert license statements to SPDX expressions ------------------------------------------------------------------- Sun Aug 2 07:13:58 UTC 2020 - Christophe Giboudeaux diff --git a/purpose.spec b/purpose.spec index a03dc4b..40f3b4c 100644 --- a/purpose.spec +++ b/purpose.spec @@ -17,14 +17,14 @@ %define lname libKF5Purpose5 -%define _tar_path 5.73 +%define _tar_path 5.74 # 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: purpose -Version: 5.73.0 +Version: 5.74.0 Release: 0 Summary: Framework to integrate services and actions in applications License: LGPL-2.1-or-later @@ -36,8 +36,6 @@ Source1: https://download.kde.org/stable/frameworks/%{_tar_path}/%{name}- Source2: frameworks.keyring %endif Source99: baselibs.conf -# PATCH-FIX-UPSTREAM -Patch1: 0001-Revert-Port-some-qt5.15-deprecated-method.patch BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: intltool BuildRequires: kf5-filesystem @@ -114,7 +112,7 @@ This package contains development files needed to build applications which rely %lang_package %prep -%autosetup -p1 +%setup -q %build %cmake_kf5 -d build @@ -153,15 +151,17 @@ This package contains development files needed to build applications which rely %endif %files -n %{lname} -%license COPYING* +%license LICENSES/* %{_kf5_libdir}/libKF5Purpose.so.* %{_kf5_debugdir}/*.categories %{_kf5_debugdir}/*.renamecategories %files -n libKF5PurposeWidgets5 +%license LICENSES/* %{_kf5_libdir}/libKF5PurposeWidgets.so.* %files +%license LICENSES/* %{_kf5_libdir}/libPhabricatorHelpers.so.* %{_kf5_libdir}/libReviewboardHelpers.so.* %{_kf5_libexecdir}/ @@ -174,6 +174,7 @@ This package contains development files needed to build applications which rely %{_kf5_sharedir}/accounts/ %files devel +%license LICENSES/* %{_kf5_libdir}/libKF5Purpose.so %{_kf5_libdir}/libKF5PurposeWidgets.so %{_kf5_libdir}/cmake/KDEExperimentalPurpose/