diff options
Diffstat (limited to 'dev-libs/beecrypt/files')
4 files changed, 0 insertions, 411 deletions
diff --git a/dev-libs/beecrypt/files/beecrypt-4.2.1-build-system.patch b/dev-libs/beecrypt/files/beecrypt-4.2.1-build-system.patch deleted file mode 100644 index e35095f53b6e..000000000000 --- a/dev-libs/beecrypt/files/beecrypt-4.2.1-build-system.patch +++ /dev/null @@ -1,160 +0,0 @@ ---- beecrypt-4.2.1/configure.ac -+++ beecrypt-4.2.1/configure.ac -@@ -11,7 +11,7 @@ - - # Checks for package options - AC_ARG_ENABLE(expert-mode, [ --enable-expert-mode follow user-defined CFLAGS settings [[default=no]]],[ -- ac_enable_expert_mode=yes -+ ac_enable_expert_mode=$enableval - ],[ - if test "X$CFLAGS" != "X"; then - echo "enabling expert mode" -@@ -25,7 +25,7 @@ - if test "$ac_enable_expert_mode" = yes; then - AC_MSG_ERROR([--enable-debug cannot be used in conjunction with --enable-expert-mode]) - fi -- ac_enable_debug=yes -+ ac_enable_debug=$enableval - ],[ - ac_enable_debug=no - ]) -@@ -456,7 +456,7 @@ - ac_cv_python_include="-I`$PYTHON -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_inc()'`" - ]) - AC_CACHE_CHECK([where to install python libraries], ac_cv_python_libdir, [ -- ac_cv_python_libdir=`$PYTHON -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib()'` -+ ac_cv_python_libdir=`$PYTHON -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib(1, 0)'` - ]) - fi - fi ---- beecrypt-4.2.1/acinclude.m4 -+++ beecrypt-4.2.1/acinclude.m4 -@@ -498,15 +498,6 @@ AC_DEFUN([BEE_GNU_CC],[ - AC_SUBST(OPENMP_LIBS,"-lgomp") - fi - case $bc_target_arch in -- x86_64 | athlon64 | athlon-fx | k8 | opteron | em64t | nocona) -- CC="$CC -m64" -- ;; -- i[[3456]]86 | \ -- pentium* | \ -- athlon*) -- CC="$CC -m32" -- CCAS="$CCAS -m32" -- ;; - ia64) - case $target_os in - # HP/UX on Itanium needs to be told that a long is 64-bit! -@@ -525,17 +516,8 @@ AC_DEFUN([BEE_GNU_CC],[ - aix*) - CC="$CC -maix64" - ;; -- linux*) -- CC="$CC -m64" -- ;; - esac - ;; -- sparc | sparcv8*) -- CC="$CC -m32" -- ;; -- sparc64 | sparcv9*) -- CC="$CC -m64" -- ;; - esac - # Certain platforms needs special flags for multi-threaded code - if test "$ac_enable_threads" = yes; then -@@ -646,14 +646,6 @@ dnl BEE_GNU_CXX - AC_DEFUN([BEE_GNU_CXX],[ - AC_REQUIRE([AC_PROG_CXX]) - case $bc_target_arch in -- x86_64 | athlon64 | athlon-fx | k8 | opteron | em64t | nocona | core2) -- CXX="$CXX -m64" -- ;; -- i[[3456]]86 | \ -- pentium* | \ -- athlon*) -- CXX="$CXX -m32" -- ;; - ia64) - case $target_os in - # HP/UX on Itanium needs to be told that a long is 64-bit! -@@ -672,17 +664,8 @@ AC_DEFUN([BEE_GNU_CXX],[ - aix*) - CXX="$CXX -maix64" - ;; -- linux*) -- CXX="$CXX -m64" -- ;; - esac - ;; -- sparc | sparcv8*) -- CXX="$CXX -m32" -- ;; -- sparc64 | sparcv9*) -- CXX="$CXX -m64" -- ;; - esac - # Certain platforms needs special flags for multi-threaded code - if test "$ac_enable_threads" = yes; then ---- beecrypt-4.2.1/java/Makefile.am -+++ beecrypt-4.2.1/java/Makefile.am -@@ -26,7 +26,7 @@ - - INCLUDES = -I$(top_srcdir)/include - --libaltdir=$(prefix)/lib@LIBALT@ -+libaltdir=$(libdir) - - libalt_LTLIBRARIES = libbeecrypt_java.la - ---- beecrypt-4.2.1/acinclude.m4 -+++ beecrypt-4.2.1/acinclude.m4 -@@ -1589,20 +1589,5 @@ - AC_SUBST(TYPEDEF_BC_THREADID_T,$bc_typedef_bc_threadid_t) - ]) -- --AH_BOTTOM([ --#if ENABLE_THREADS --# ifndef _REENTRANT --# define _REENTRANT --# endif --# if LINUX --# define _LIBC_REENTRANT --# endif --#else --# ifdef _REENTRANT --# undef _REENTRANT --# endif --#endif --]) - - - dnl BEE_THREAD_LOCAL_STORAGE -@@ -1623,7 +1609,5 @@ - ]) - - AH_BOTTOM([ --#if !ENABLE_THREAD_LOCAL_STORAGE --# define __thread --#endif -+#include "config.threads.h" - ]) ---- beecrypt-4.2.1/config.threads.h -+++ beecrypt-4.2.1/config.threads.h -@@ -0,0 +1,16 @@ -+#if ENABLE_THREADS -+# ifndef _REENTRANT -+# define _REENTRANT -+# endif -+# if LINUX -+# define _LIBC_REENTRANT -+# endif -+#else -+# ifdef _REENTRANT -+# undef _REENTRANT -+# endif -+#endif -+ -+#if !ENABLE_THREAD_LOCAL_STORAGE -+# define __thread -+#endif 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 deleted file mode 100755 index 0cb291d8ff15..000000000000 --- a/dev-libs/beecrypt/files/beecrypt-4.2.1-c++11-allow-throw-in-destructors.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- 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-cast-uchar.patch b/dev-libs/beecrypt/files/beecrypt-4.2.1-cast-uchar.patch deleted file mode 100644 index 8efedc01e4aa..000000000000 --- a/dev-libs/beecrypt/files/beecrypt-4.2.1-cast-uchar.patch +++ /dev/null @@ -1,214 +0,0 @@ -beecrypt's c++ api uses jchar arrays for strings, while ICU 59 expects -char16_t type - -In practice these both seem to be defined as short int on amd64 so it -might be okay to just reinterpret_cast them? There's probably no easy -way out on a platform where char16_t won't match jchar - -Patch by Valeriy Malov <jazzvoid@gmail.com> -https://bugs.gentoo.org/618676 - ---- a/c++/io/DataInputStream.cxx -+++ b/c++/io/DataInputStream.cxx -@@ -201,7 +201,7 @@ String DataInputStream::readUTF() throw (IOException) - jchar* buffer = new jchar[ulen+1]; - - status = U_ZERO_ERROR; -- ucnv_toUChars(_utf, buffer, ulen+1, (const char*) data, (jint) utflen, &status); -+ ucnv_toUChars(_utf, reinterpret_cast<UChar*>(buffer), ulen+1, (const char*) data, (jint) utflen, &status); - - delete[] data; - -@@ -232,7 +232,7 @@ String DataInputStream::readLine() throw (IOException) - - array<jchar> target_buffer(80); - jint target_offset = 0; -- UChar* target = target_buffer.data(); -+ UChar* target = reinterpret_cast<UChar*>(target_buffer.data()); - const UChar* target_limit = target+1; - char source_buffer[MAX_BYTES_PER_CHARACTER]; - const char* source = source_buffer; ---- a/c++/io/DataOutputStream.cxx -+++ b/c++/io/DataOutputStream.cxx -@@ -187,7 +187,7 @@ void DataOutputStream::writeUTF(const String& str) throw (IOException) - const array<jchar>& src = str.toCharArray(); - - // the expected status code here is U_BUFFER_OVERFLOW_ERROR -- jint need = ucnv_fromUChars(_utf, 0, 0, src.data(), src.size(), &status); -+ jint need = ucnv_fromUChars(_utf, 0, 0, reinterpret_cast<const UChar*>(src.data()), src.size(), &status); - if (U_FAILURE(status)) - if (status != U_BUFFER_OVERFLOW_ERROR) - throw IOException("ucnv_fromUChars failed"); -@@ -200,7 +200,7 @@ void DataOutputStream::writeUTF(const String& str) throw (IOException) - status = U_ZERO_ERROR; - - // the expected status code here is U_STRING_NOT_TERMINATED_WARNING -- ucnv_fromUChars(_utf, (char*) buffer, need, src.data(), src.size(), &status); -+ ucnv_fromUChars(_utf, (char*) buffer, need, reinterpret_cast<const UChar*>(src.data()), src.size(), &status); - if (status != U_STRING_NOT_TERMINATED_WARNING) - { - delete[] buffer; ---- a/c++/io/PrintStream.cxx -+++ b/c++/io/PrintStream.cxx -@@ -191,7 +191,7 @@ void PrintStream::print(jchar ch) throw () - UErrorCode status = U_ZERO_ERROR; - - // do conversion of one character -- size_t used = ucnv_fromUChars(_loc, buffer, 8, &ch, 1, &status); -+ size_t used = ucnv_fromUChars(_loc, buffer, 8, reinterpret_cast<UChar*>(&ch), 1, &status); - if (U_FAILURE(status)) - throw IOException("failure in ucnv_fromUChars"); - -@@ -268,14 +268,14 @@ void PrintStream::print(jlong x) throw () - - void PrintStream::print(const array<jchar>& chars) throw () - { -- print(chars.data(), chars.size()); -+ print(reinterpret_cast<const UChar*>(chars.data()), chars.size()); - } - - void PrintStream::print(const String& str) throw () - { - const array<jchar>& tmp = str.toCharArray(); - -- print(tmp.data(), tmp.size()); -+ print(reinterpret_cast<const UChar*>(tmp.data()), tmp.size()); - } - - void PrintStream::println() throw () ---- a/c++/lang/String.cxx -+++ b/c++/lang/String.cxx -@@ -33,6 +33,8 @@ using namespace beecrypt::lang; - #include <unicode/ustdio.h> - #include <unicode/ustring.h> - -+static_assert(sizeof(jchar) == sizeof(UChar), "jchar and UChar sizes mismatch"); -+ - String::String(array<jchar>& swapWith) - { - assert(swapWith.size() <= Integer::MAX_VALUE); -@@ -56,7 +58,7 @@ String::String() - - String::String(char c) : _value(1) - { -- u_charsToUChars(&c, _value.data(), 1); -+ u_charsToUChars(&c, reinterpret_cast<UChar*>(_value.data()), 1); - } - - String::String(jchar c) : _value(&c, 1) -@@ -67,7 +69,7 @@ String::String(const char* value) : _value(::strlen(value)) - { - assert(_value.size() <= Integer::MAX_VALUE); - -- u_charsToUChars(value, _value.data(), _value.size()); -+ u_charsToUChars(value, reinterpret_cast<UChar*>(_value.data()), _value.size()); - } - - String::String(const jchar* value, int offset, int length) : _value(value+offset, length) -@@ -449,7 +451,7 @@ std::ostream& beecrypt::lang::operator<<(std::ostream& stream, const String& str - if (U_FAILURE(status)) - throw RuntimeException("ucnv_open failed"); - -- int need = ucnv_fromUChars(loc, 0, 0, src.data(), src.size(), &status); -+ int need = ucnv_fromUChars(loc, 0, 0, reinterpret_cast<const UChar*>(src.data()), src.size(), &status); - if (U_FAILURE(status)) - if (status != U_BUFFER_OVERFLOW_ERROR) - throw RuntimeException("ucnv_fromUChars failed"); -@@ -458,7 +460,7 @@ std::ostream& beecrypt::lang::operator<<(std::ostream& stream, const String& str - - status = U_ZERO_ERROR; - -- ucnv_fromUChars(loc, out, need+1, src.data(), src.size(), &status); -+ ucnv_fromUChars(loc, out, need+1, reinterpret_cast<const UChar*>(src.data()), src.size(), &status); - if (U_FAILURE(status)) - throw RuntimeException("ucnv_fromUChars failed"); - ---- a/c++/lang/StringBuffer.cxx -+++ b/c++/lang/StringBuffer.cxx -@@ -35,7 +35,7 @@ StringBuffer::StringBuffer() : _buffer(16) - - StringBuffer::StringBuffer(const char* s) : _buffer(16 + strlen(s)) - { -- u_charsToUChars(s, _buffer.data(), _used = strlen(s)); -+ u_charsToUChars(s, reinterpret_cast<UChar*>(_buffer.data()), _used = strlen(s)); - } - - StringBuffer::StringBuffer(const String& s) : _buffer(16 + s._value.size()) -@@ -53,7 +53,7 @@ StringBuffer& StringBuffer::append(char c) - synchronized (this) - { - core_ensureCapacity(_used+1); -- u_charsToUChars(&c, _buffer.data() + _used++, 1); -+ u_charsToUChars(&c, reinterpret_cast<UChar*>(_buffer.data() + _used++), 1); - } - return *this; - } -@@ -88,7 +88,7 @@ StringBuffer& StringBuffer::append(const char* s) - jint need = strlen(s); - - core_ensureCapacity(_used + need); -- u_charsToUChars(s, _buffer.data() + _used, need); -+ u_charsToUChars(s, reinterpret_cast<UChar*>(_buffer.data() + _used), need); - - _used += need; - } ---- a/c++/lang/StringBuilder.cxx -+++ b/c++/lang/StringBuilder.cxx -@@ -38,7 +38,7 @@ StringBuilder::StringBuilder() : _buffer(16) - - StringBuilder::StringBuilder(const char* s) : _buffer(16 + strlen(s)) - { -- u_charsToUChars(s, _buffer.data(), _used = strlen(s)); -+ u_charsToUChars(s, reinterpret_cast<UChar*>(_buffer.data()), _used = strlen(s)); - } - - StringBuilder::StringBuilder(const String& s) : _buffer(16 + s._value.size()) -@@ -55,7 +55,7 @@ StringBuilder& StringBuilder::append(char c) - { - ensureCapacity(_used+1); - -- u_charsToUChars(&c, _buffer.data() + _used++, 1); -+ u_charsToUChars(&c, reinterpret_cast<UChar*>(_buffer.data() + _used++), 1); - - return *this; - } -@@ -97,7 +97,7 @@ StringBuilder& StringBuilder::append(const char* s) - - ensureCapacity(_used + need); - -- u_charsToUChars(s, _buffer.data() + _used, need); -+ u_charsToUChars(s, reinterpret_cast<UChar*>(_buffer.data() + _used), need); - - _used += need; - ---- a/c++/security/Provider.cxx -+++ b/c++/security/Provider.cxx -@@ -90,7 +90,7 @@ Object* Provider::setProperty(const String& key, const String& value) - - UErrorCode status = U_ZERO_ERROR; - -- ucnv_fromUChars(_conv, symname, 1024, src.data(), src.size(), &status); -+ ucnv_fromUChars(_conv, symname, 1024, reinterpret_cast<const UChar*>(src.data()), src.size(), &status); - - if (status != U_ZERO_ERROR) - throw RuntimeException("error in ucnv_fromUChars"); ---- a/c++/security/Security.cxx -+++ b/c++/security/Security.cxx -@@ -104,7 +104,7 @@ void Security::initialize() - - const array<jchar>& src = value->toCharArray(); - -- int need = ucnv_fromUChars(_loc, 0, 0, src.data(), src.size(), &status); -+ int need = ucnv_fromUChars(_loc, 0, 0, reinterpret_cast<const UChar*>(src.data()), src.size(), &status); - if (U_FAILURE(status)) - if (status != U_BUFFER_OVERFLOW_ERROR) - throw RuntimeException("ucnv_fromUChars failed"); -@@ -112,7 +112,7 @@ void Security::initialize() - char* shared_library = new char[need+1]; - - status = U_ZERO_ERROR; -- ucnv_fromUChars(_loc, shared_library, need+1, src.data(), src.size(), &status); -+ ucnv_fromUChars(_loc, shared_library, need+1, reinterpret_cast<const UChar*>(src.data()), src.size(), &status); - if (U_FAILURE(status)) - throw RuntimeException("ucnv_fromUChars failed"); - 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 deleted file mode 100644 index dff5d8c04ab9..000000000000 --- a/dev-libs/beecrypt/files/beecrypt-4.2.1-gcc-4.7.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/include/beecrypt/c++/util/AbstractSet.h -+++ b/include/beecrypt/c++/util/AbstractSet.h -@@ -56,7 +56,7 @@ - if (c->size() != size()) - return false; - -- return containsAll(*c); -+ return this->containsAll(*c); - } - return false; - } |