[packages/kf5-purpose] - fix building with qt 5.15 - rel 5
baggins
baggins at pld-linux.org
Sun Jul 12 20:49:50 CEST 2020
commit eda51aa3f3bf411c530873db10fab00223364d16
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Jul 12 20:49:32 2020 +0200
- fix building with qt 5.15
- rel 5
kf5-purpose.spec | 4 +++-
qt-5.15.patch | 14 ++++++++++++++
2 files changed, 17 insertions(+), 1 deletion(-)
---
diff --git a/kf5-purpose.spec b/kf5-purpose.spec
index 161aa7a..5abe7de 100644
--- a/kf5-purpose.spec
+++ b/kf5-purpose.spec
@@ -5,12 +5,13 @@
Summary: Offers available actions for a specific purpose
Name: kf5-%{kfname}
Version: 5.67.0
-Release: 4
+Release: 5
License: LGPL v2.1+
Group: X11/Libraries
Source0: http://download.kde.org/stable/frameworks/%{kdeframever}/%{kfname}-%{version}.tar.xz
# Source0-md5: 4039367834bc9039a84261b5a8d9912c
Patch0: %{name}-main_js.patch
+Patch1: qt-5.15.patch
URL: http://www.kde.org/
BuildRequires: Qt5Core-devel >= %{qtver}
BuildRequires: Qt5Test-devel >= %{qtver}
@@ -67,6 +68,7 @@ Pliki nagłówkowe dla programistów używających %{kfname}.
%prep
%setup -q -n %{kfname}-%{version}
%patch0 -p0
+%patch1 -p1
%build
install -d build
diff --git a/qt-5.15.patch b/qt-5.15.patch
new file mode 100644
index 0000000..7c65141
--- /dev/null
+++ b/qt-5.15.patch
@@ -0,0 +1,14 @@
+--- purpose-5.67.0/src/externalprocess/purposeprocess_main.cpp~ 2020-02-02 13:57:25.000000000 +0100
++++ purpose-5.67.0/src/externalprocess/purposeprocess_main.cpp 2020-07-12 20:47:03.042743144 +0200
+@@ -90,11 +90,7 @@
+
+ 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;
+ }
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kf5-purpose.git/commitdiff/eda51aa3f3bf411c530873db10fab00223364d16
More information about the pld-cvs-commit
mailing list