summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter-Levine <plevine457@gmail.com>2016-10-13 18:40:20 -0400
committerDavid Seifert <soap@gentoo.org>2016-10-23 16:17:06 +0200
commit34e8da00ccfbb0f6d50c78dfce6ada72a971c568 (patch)
treeb8fb544d36c2d51bc9310301b7ab7bd414ed6788 /dev-libs/beecrypt/files
parentmedia-libs/jasper: Remove old (diff)
downloadgentoo-34e8da00ccfbb0f6d50c78dfce6ada72a971c568.tar.gz
gentoo-34e8da00ccfbb0f6d50c78dfce6ada72a971c568.tar.bz2
gentoo-34e8da00ccfbb0f6d50c78dfce6ada72a971c568.zip
dev-libs/beecrypt: Allow for compiling with GCC 6
Gentoo-bug: 596904 * EAPI=6 * Improve DOCS and HTML_DOCS handling * Minor QA fixes Closes: https://github.com/gentoo/gentoo/pull/2551 Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'dev-libs/beecrypt/files')
-rwxr-xr-xdev-libs/beecrypt/files/beecrypt-4.2.1-c++11-allow-throw-in-destructors.patch26
-rw-r--r--dev-libs/beecrypt/files/beecrypt-4.2.1-gcc-4.7.patch4
2 files changed, 28 insertions, 2 deletions
diff --git a/dev-libs/beecrypt/files/beecrypt-4.2.1-c++11-allow-throw-in-destructors.patch b/dev-libs/beecrypt/files/beecrypt-4.2.1-c++11-allow-throw-in-destructors.patch
new file mode 100755
index 000000000000..0cb291d8ff15
--- /dev/null
+++ b/dev-libs/beecrypt/files/beecrypt-4.2.1-c++11-allow-throw-in-destructors.patch
@@ -0,0 +1,26 @@
+--- beecrypt-4.2.1/include/beecrypt/c++/lang/Object.h.old 2016-10-12 18:40:10.878868563 -0400
++++ beecrypt-4.2.1/include/beecrypt/c++/lang/Object.h 2016-10-12 19:17:22.508857979 -0400
+@@ -145,7 +145,11 @@
+ waiter* prev;
+
+ waiter(bc_threadid_t owner, unsigned int lock_count);
++#if __cplusplus < 201103L
+ ~waiter();
++#else
++ ~waiter() noexcept(false);
++#endif
+ };
+
+ waiter* _lock_head;
+--- beecrypt-4.2.1/c++/lang/Object.cxx.old 2016-10-12 18:40:39.024665316 -0400
++++ beecrypt-4.2.1/c++/lang/Object.cxx 2016-10-12 19:14:41.630529720 -0400
+@@ -767,6 +767,9 @@
+ }
+
+ Object::FairMonitor::waiter::~waiter()
++#if __cplusplus >= 201103L
++noexcept(false)
++#endif
+ {
+ #if WIN32
+ if (!CloseHandle(event))
diff --git a/dev-libs/beecrypt/files/beecrypt-4.2.1-gcc-4.7.patch b/dev-libs/beecrypt/files/beecrypt-4.2.1-gcc-4.7.patch
index 64d513bde63f..dff5d8c04ab9 100644
--- a/dev-libs/beecrypt/files/beecrypt-4.2.1-gcc-4.7.patch
+++ b/dev-libs/beecrypt/files/beecrypt-4.2.1-gcc-4.7.patch
@@ -1,5 +1,5 @@
---- include/beecrypt/c++/util/AbstractSet.h
-+++ include/beecrypt/c++/util/AbstractSet.h
+--- a/include/beecrypt/c++/util/AbstractSet.h
++++ b/include/beecrypt/c++/util/AbstractSet.h
@@ -56,7 +56,7 @@
if (c->size() != size())
return false;