[packages/qca] - rel 4; Qt5 needs c++11

bszx bszx at pld-linux.org
Mon Oct 21 17:40:57 CEST 2019


commit 9aff6615460525cc99e30da6cb6545fc1cb4329b
Author: Bartek Szady <bszx at bszx.eu>
Date:   Mon Oct 21 17:34:23 2019 +0200

    - rel 4; Qt5 needs c++11

 qca.spec  |  4 +++-
 qt5.patch | 10 ++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)
---
diff --git a/qca.spec b/qca.spec
index dc969d2..87b79d2 100644
--- a/qca.spec
+++ b/qca.spec
@@ -2,12 +2,13 @@ Summary:	Qt Cryptographic Architecture (QCA) Library
 Summary(pl.UTF-8):	Biblioteka Qt Cryptographic Architecture (QCA)
 Name:		qca
 Version:	2.1.3
-Release:	3
+Release:	4
 License:	LGPL v2.1
 Group:		Libraries
 Source0:	http://download.kde.org/stable/qca/%{version}/src/%{name}-%{version}.tar.xz
 # Source0-md5:	5019cc29efcf828681cd93164238ce26
 Patch0:		openssl.patch
+Patch1:		qt5.patch
 URL:		http://delta.affinix.com/qca/
 BuildRequires:	Qt5Core-devel
 BuildRequires:	Qt5Gui-devel
@@ -80,6 +81,7 @@ programistów.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 install -d build4
diff --git a/qt5.patch b/qt5.patch
new file mode 100644
index 0000000..da6606e
--- /dev/null
+++ b/qt5.patch
@@ -0,0 +1,10 @@
+--- qca-2.1.3/CMakeLists.txt.orig	2019-10-15 19:40:02.865390511 +0200
++++ qca-2.1.3/CMakeLists.txt	2019-10-15 19:52:34.177220661 +0200
+@@ -49,6 +49,7 @@
+   # Do not automatically link Qt executables to qtmain target on Windows.
+   # QCA exucatables use console mode only. Not need to link against qtmain.lib.
+   set(Qt5_NO_LINK_QTMAIN ON)
++  set(CMAKE_CXX_STANDARD 11)
+   find_package(Qt5Core QUIET)
+   mark_as_advanced(Qt5Core_DIR)
+ endif()
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/qca.git/commitdiff/9aff6615460525cc99e30da6cb6545fc1cb4329b



More information about the pld-cvs-commit mailing list