Add patches to build with cryptocpp version 8.3
Sophie Brun
3 years ago
|
0 |
From: Sophie Brun <[email protected]>
|
|
1 |
Date: Wed, 6 Jan 2021 10:06:04 +0100
|
|
2 |
Subject: Include missing header
|
|
3 |
MIME-Version: 1.0
|
|
4 |
Content-Type: text/plain; charset="utf-8"
|
|
5 |
Content-Transfer-Encoding: 8bit
|
|
6 |
|
|
7 |
Last-Update: 2021-01-06
|
|
8 |
|
|
9 |
The build fails with:
|
|
10 |
/<<PKGBUILDDIR>>/src/unsafessl/sslunsaferingbuffer_p.h:57:1: note: ‘INT_MAX’ is defined in header ‘<climits>’; did you forget to ‘#include <climits>’?
|
|
11 |
56 | #include <QtCore/qvector.h>
|
|
12 |
+++ |+#include <climits>
|
|
13 |
57 |
|
|
14 |
---
|
|
15 |
src/unsafessl/sslunsaferingbuffer_p.h | 3 +++
|
|
16 |
1 file changed, 3 insertions(+)
|
|
17 |
|
|
18 |
diff --git a/src/unsafessl/sslunsaferingbuffer_p.h b/src/unsafessl/sslunsaferingbuffer_p.h
|
|
19 |
index 02abc87..f033ae5 100644
|
|
20 |
--- a/src/unsafessl/sslunsaferingbuffer_p.h
|
|
21 |
+++ b/src/unsafessl/sslunsaferingbuffer_p.h
|
|
22 |
@@ -55,6 +55,9 @@
|
|
23 |
#include <QtCore/qbytearray.h>
|
|
24 |
#include <QtCore/qvector.h>
|
|
25 |
|
|
26 |
+// Add missing climits header for INT_MAX
|
|
27 |
+#include <climits>
|
|
28 |
+
|
|
29 |
QT_BEGIN_NAMESPACE
|
|
30 |
|
|
31 |
#ifndef QRINGBUFFER_CHUNKSIZE
|
|
0 |
From: Sophie Brun <[email protected]>
|
|
1 |
Date: Wed, 6 Jan 2021 09:39:02 +0100
|
|
2 |
Subject: fix FindCryptoPP for version >= 8.3
|
|
3 |
|
|
4 |
Last-Update: 2021-01-06
|
|
5 |
|
|
6 |
Since version 8.3 the cryptopp config.h file does no longer contains the
|
|
7 |
CRYPTOPP_VERSION variable. The variable is now in config_ver.h file.
|
|
8 |
---
|
|
9 |
FindCryptoPP.cmake | 6 +++++-
|
|
10 |
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
11 |
|
|
12 |
diff --git a/FindCryptoPP.cmake b/FindCryptoPP.cmake
|
|
13 |
index 74a01e8..ae7cd6a 100644
|
|
14 |
--- a/FindCryptoPP.cmake
|
|
15 |
+++ b/FindCryptoPP.cmake
|
|
16 |
@@ -75,7 +75,11 @@ ELSEIF (CRYPTOPP_LIBRARY_RELEASE)
|
|
17 |
ENDIF (CRYPTOPP_LIBRARY_DEBUG AND CRYPTOPP_LIBRARY_RELEASE)
|
|
18 |
|
|
19 |
IF (CRYPTOPP_INCLUDE_DIR)
|
|
20 |
- SET (_CRYPTOPP_VERSION_HEADER ${CRYPTOPP_INCLUDE_DIR}/cryptopp/config.h)
|
|
21 |
+ SET (_CRYPTOPP_VERSION_HEADER ${CRYPTOPP_INCLUDE_DIR}/cryptopp/config_ver.h)
|
|
22 |
+
|
|
23 |
+ IF (NOT EXISTS ${_CRYPTOPP_VERSION_HEADER})
|
|
24 |
+ SET (_CRYPTOPP_VERSION_HEADER ${CRYPTOPP_INCLUDE_DIR}/cryptopp/config.h)
|
|
25 |
+ ENDIF (NOT EXISTS ${_CRYPTOPP_VERSION_HEADER})
|
|
26 |
|
|
27 |
IF (EXISTS ${_CRYPTOPP_VERSION_HEADER})
|
|
28 |
FILE (STRINGS ${_CRYPTOPP_VERSION_HEADER} _CRYPTOPP_VERSION_TMP REGEX
|
|
0 |
fix-FindCryptoPP-for-version-8.3.patch
|
|
1 |
add-missing-header.patch
|