diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2019-05-15 17:32:24 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2019-05-15 20:38:01 +0200 |
commit | 783aac2f542513144d7cb91e7de930e1fb6c9203 (patch) | |
tree | 506f03bfc6807d3c2f68740baabdc8edabf1246d /app-crypt/qca/files | |
parent | net-libs/libesmtp: Drop old (diff) | |
download | gentoo-783aac2f542513144d7cb91e7de930e1fb6c9203.tar.gz gentoo-783aac2f542513144d7cb91e7de930e1fb6c9203.tar.bz2 gentoo-783aac2f542513144d7cb91e7de930e1fb6c9203.zip |
app-crypt/qca: Drop 2.1.3-r2
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'app-crypt/qca/files')
-rw-r--r-- | app-crypt/qca/files/qca-2.1.3-c++11.patch | 97 | ||||
-rw-r--r-- | app-crypt/qca/files/qca-2.1.3-deps.patch | 38 |
2 files changed, 0 insertions, 135 deletions
diff --git a/app-crypt/qca/files/qca-2.1.3-c++11.patch b/app-crypt/qca/files/qca-2.1.3-c++11.patch deleted file mode 100644 index a12f96bfcf4a..000000000000 --- a/app-crypt/qca/files/qca-2.1.3-c++11.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 5f18ebc705ec98e883aa63cb537e36e6a08b7e34 Mon Sep 17 00:00:00 2001 -From: Alon Bar-Lev <alon.barlev@gmail.com> -Date: Tue, 21 Mar 2017 12:23:17 +0200 -Subject: [PATCH] build: fix C++11 throwing distructors - -For >=C++11, explicitly mark throwing destructors `noexcept(false)` - -Thanks: Peter-Levine <plevine457@gmail.com> ---- - Doxyfile.in | 2 +- - src/botantools/botan/alloc_mmap/mmap_mem.cpp | 2 +- - src/botantools/botan/botan/allocate.h | 8 +++++++- - src/botantools/botan/botan/mem_pool.h | 2 +- - src/botantools/botan/mem_pool.cpp | 2 +- - 5 files changed, 11 insertions(+), 5 deletions(-) - -diff --git a/Doxyfile.in b/Doxyfile.in -index 59d9afe..844c234 100644 ---- a/Doxyfile.in -+++ b/Doxyfile.in -@@ -1070,7 +1070,7 @@ PREDEFINED = DOXYGEN_SHOULD_SKIP_THIS \ - # The macro definition that is found in the sources will be used. - # Use the PREDEFINED tag if you want to use a different macro definition. - --EXPAND_AS_DEFINED = QCA_EXPORT -+EXPAND_AS_DEFINED = QCA_EXPORT QCA_NOEXCEPT - - # If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then - # doxygen's preprocessor will remove all function-like macros that are alone -diff --git a/src/botantools/botan/alloc_mmap/mmap_mem.cpp b/src/botantools/botan/alloc_mmap/mmap_mem.cpp -index 362b688..54f0d23 100644 ---- a/src/botantools/botan/alloc_mmap/mmap_mem.cpp -+++ b/src/botantools/botan/alloc_mmap/mmap_mem.cpp -@@ -107,7 +107,7 @@ void* MemoryMapping_Allocator::alloc_block(u32bit n) - umask(old_umask); - } - -- ~TemporaryFile() -+ ~TemporaryFile() QCA_NOEXCEPT(false) - { - delete[] filepath; - if(fd != -1 && close(fd) == -1) -diff --git a/src/botantools/botan/botan/allocate.h b/src/botantools/botan/botan/allocate.h -index 0ac351e..52bc397 100644 ---- a/src/botantools/botan/botan/allocate.h -+++ b/src/botantools/botan/botan/allocate.h -@@ -40,6 +40,12 @@ namespace QCA { // WRAPNS_LINE - #include <string> - namespace QCA { // WRAPNS_LINE - -+#if __cplusplus >= 201103L -+#define QCA_NOEXCEPT(x) noexcept(x) -+#else -+#define QCA_NOEXCEPT(x) -+#endif -+ - namespace Botan { - - /************************************************* -@@ -58,7 +64,7 @@ class Allocator - virtual void init() {} - virtual void destroy() {} - -- virtual ~Allocator() {} -+ virtual ~Allocator() QCA_NOEXCEPT(false) {} - }; - - /************************************************* -diff --git a/src/botantools/botan/botan/mem_pool.h b/src/botantools/botan/botan/mem_pool.h -index 32834b8..1cb903e 100644 ---- a/src/botantools/botan/botan/mem_pool.h -+++ b/src/botantools/botan/botan/mem_pool.h -@@ -63,7 +63,7 @@ class Pooling_Allocator : public Allocator - void destroy(); - - Pooling_Allocator(u32bit, bool); -- ~Pooling_Allocator(); -+ ~Pooling_Allocator() QCA_NOEXCEPT(false); - private: - void get_more_core(u32bit); - byte* allocate_blocks(u32bit); -diff --git a/src/botantools/botan/mem_pool.cpp b/src/botantools/botan/mem_pool.cpp -index 00280ec..baa47aa 100644 ---- a/src/botantools/botan/mem_pool.cpp -+++ b/src/botantools/botan/mem_pool.cpp -@@ -171,7 +171,7 @@ Pooling_Allocator::Pooling_Allocator(u32bit p_size, bool) : - /************************************************* - * Pooling_Allocator Destructor * - *************************************************/ --Pooling_Allocator::~Pooling_Allocator() -+Pooling_Allocator::~Pooling_Allocator() QCA_NOEXCEPT(false) - { - delete mutex; - if(blocks.size()) --- -2.10.2 - diff --git a/app-crypt/qca/files/qca-2.1.3-deps.patch b/app-crypt/qca/files/qca-2.1.3-deps.patch deleted file mode 100644 index e1ef2e5c0e7e..000000000000 --- a/app-crypt/qca/files/qca-2.1.3-deps.patch +++ /dev/null @@ -1,38 +0,0 @@ -From e854f357f4037e2c8c781ebd04ec5164a882b9b3 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Thu, 12 Apr 2018 00:45:50 +0200 -Subject: [PATCH] Make Qt5Network conditional on BUILD_TESTS - -Summary: I did not find it in use somewhere else. - -Reviewers: iromanov, sitter, rjvbb - -Reviewed By: rjvbb - -Subscribers: fvogt - -Differential Revision: https://phabricator.kde.org/D12129 ---- - CMakeLists.txt | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 28b0169..65b95f8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -59,7 +59,11 @@ if (Qt5Core_FOUND) - message(STATUS "Building with Qt5 support") - # Got from ECM - # Distros have no ECM. So I just copied required cmake modules. -- find_package(Qt5Transitional REQUIRED Core Network) -+ if(BUILD_TESTS) -+ find_package(Qt5Transitional REQUIRED Core Network) -+ else() -+ find_package(Qt5Transitional REQUIRED Core) -+ endif() - include(ECMQt4To5Porting) - - include(GNUInstallDirs) --- -2.17.1 - |