rpm/purpose
SHA256
1
0
Fork 0
forked from pool/purpose
Code Pull Requests Activity

Updating link to change in openSUSE:Factory/purpose revision 38.0

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/purpose?expand=0&rev=601a5a1eb89fa27f66e19b63130e6d09
This commit is contained in:
OBS User buildservice-autocommit
2020-09-14 10:12:21 +00:00
committed by Git OBS Bridge
parent 33f493d979
commit 9c4de118e9
3 changed files with 42 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
0001-Revert-Port-some-qt5.15-deprecated-method.patch Normal file
View File

@@ -0,0 +1,33 @@
From 565032fe5b2db979a7554735707a5415cebca3fc Mon Sep 17 00:00:00 2001
From: Nicolas Fella <nicolas.fella@gmx.de>
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

6
purpose.changes
View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Sep 12 11:17:45 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
- Add patch to fix build with Qt 5.15.1:
* 0001-Revert-Port-some-qt5.15-deprecated-method.patch
-------------------------------------------------------------------
Sun Sep 6 12:50:30 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>

4
purpose.spec
View File

@@ -36,6 +36,8 @@ 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
@@ -112,7 +114,7 @@ This package contains development files needed to build applications which rely
%lang_package
%prep
%setup -q
%autosetup -p1
%build
%cmake_kf5 -d build