Hello community, here is the log from the commit of package purpose for openSUSE:Factory checked in at 2020-09-14 12:12:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/purpose (Old) and /work/SRC/openSUSE:Factory/.purpose.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "purpose" Mon Sep 14 12:12:21 2020 rev:38 rq:833989 version:5.73.0 Changes: -------- --- /work/SRC/openSUSE:Factory/purpose/purpose.changes 2020-08-12 12:29:35.708186107 +0200 +++ /work/SRC/openSUSE:Factory/.purpose.new.4249/purpose.changes 2020-09-14 12:14:37.336320160 +0200 @@ -1,0 +2,6 @@ +Sat Sep 12 11:17:45 UTC 2020 - Fabian Vogt <[email protected]> + +- Add patch to fix build with Qt 5.15.1: + * 0001-Revert-Port-some-qt5.15-deprecated-method.patch + +------------------------------------------------------------------- New: ---- 0001-Revert-Port-some-qt5.15-deprecated-method.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ purpose.spec ++++++ --- /var/tmp/diff_new_pack.Y4RwBE/_old 2020-09-14 12:14:42.200325129 +0200 +++ /var/tmp/diff_new_pack.Y4RwBE/_new 2020-09-14 12:14:42.200325129 +0200 @@ -36,6 +36,8 @@ 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 @@ -112,7 +114,7 @@ %lang_package %prep -%setup -q +%autosetup -p1 %build %cmake_kf5 -d build ++++++ 0001-Revert-Port-some-qt5.15-deprecated-method.patch ++++++ >From 565032fe5b2db979a7554735707a5415cebca3fc Mon Sep 17 00:00:00 2001 From: Nicolas Fella <[email protected]> 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
