diff options
author | tsutsui <tsutsui> | 2014-04-13 15:57:21 +0000 |
---|---|---|
committer | tsutsui <tsutsui> | 2014-04-13 15:57:21 +0000 |
commit | 875d2a0651beeef5b818c47606766609583f87cc (patch) | |
tree | 6700be8ff69639c66fa3421ab257e789d93253c0 /misc/libreoffice4 | |
parent | b220fdc619668383ceea4333bce21f5fa3c6ce16 (diff) | |
download | pkgsrc-875d2a0651beeef5b818c47606766609583f87cc.tar.gz |
Remove broken and untested libc++ patches. PR/48716
- these patches break build on i386, even on pkgsrc-2014Q1
- these patches have no patch comment and it's fatal on pkglint
- these patches have never been sent to upstream even before 4.2.2.1 update
- the wrong patch committer has ignored the PR for a week
Diffstat (limited to 'misc/libreoffice4')
3 files changed, 1 insertions, 74 deletions
diff --git a/misc/libreoffice4/distinfo b/misc/libreoffice4/distinfo index 5aa6fc6e8ab..03612ee9356 100644 --- a/misc/libreoffice4/distinfo +++ b/misc/libreoffice4/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.11 2014/04/06 04:07:05 ryoon Exp $ +$NetBSD: distinfo,v 1.12 2014/04/13 15:57:21 tsutsui Exp $ SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093 RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b @@ -138,8 +138,6 @@ Size (libreoffice/libreoffice-help-4.2.2.1.tar.xz) = 1855420 bytes SHA1 (libreoffice/libreoffice-translations-4.2.2.1.tar.xz) = f31d051aaa0d3d14c2eefbe7df94ba1cfd105113 RMD160 (libreoffice/libreoffice-translations-4.2.2.1.tar.xz) = 07091d30e6494294d3462bd44f19ceee4f0d3484 Size (libreoffice/libreoffice-translations-4.2.2.1.tar.xz) = 127588320 bytes -SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__intel_share.hxx) = e127a8f380adb154dc90e1616700df28608b9469 -SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__intel_uno2cpp.cxx) = 0d6a90764f38f25165cbf997e4b37699a5b1ab49 SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx) = adb326c48a7dd05f2de56e12a7c15836545dab4e SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__x86-64_uno2cpp.cxx) = a27b4b580f53260b00bcbd5897986da2505f28ab SHA1 (patch-configure.ac) = 38d8d81518764f8589c7540ddc7687da2d347366 diff --git a/misc/libreoffice4/patches/patch-bridges_source_cpp__uno_gcc3__linux__intel_share.hxx b/misc/libreoffice4/patches/patch-bridges_source_cpp__uno_gcc3__linux__intel_share.hxx deleted file mode 100644 index 1cac1f59409..00000000000 --- a/misc/libreoffice4/patches/patch-bridges_source_cpp__uno_gcc3__linux__intel_share.hxx +++ /dev/null @@ -1,58 +0,0 @@ -$NetBSD: patch-bridges_source_cpp__uno_gcc3__linux__intel_share.hxx,v 1.3 2014/02/21 20:29:52 joerg Exp $ - ---- bridges/source/cpp_uno/gcc3_linux_intel/share.hxx.orig 2014-01-27 21:35:34.000000000 +0000 -+++ bridges/source/cpp_uno/gcc3_linux_intel/share.hxx -@@ -19,18 +19,44 @@ - - #include "uno/mapping.h" - -+#include <cxxabi.h> - #include <typeinfo> - #include <exception> - #include <cstddef> - - #include <uno/any2.h> - -+// ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h -+#ifdef _LIBCPP_VERSION -+ -+namespace __cxxabiv1 -+{ -+ struct __class_type_info : public std::type_info -+ { -+ explicit __class_type_info( const char *__n ) : type_info( __n ) { } -+ virtual ~__class_type_info(); -+ }; -+ -+ struct __si_class_type_info : public __class_type_info -+ { -+ explicit __si_class_type_info( const char *__n, const __class_type_info *__b ) : -+ __class_type_info( __n ), __base_type( __b ) { } -+ virtual ~__si_class_type_info(); -+ const __class_type_info *__base_type; -+ }; -+} -+ - namespace CPPU_CURRENT_NAMESPACE - { - - void dummy_can_throw_anything( char const * ); - - // ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h -+#ifdef _LIBCPP_VERSION -+using __cxxabiv1::__cxa_exception; -+using __cxxabiv1::__cxa_eh_globals; -+using ::_Unwind_Exception; -+#else - - struct _Unwind_Exception - { -@@ -66,7 +92,7 @@ struct __cxa_eh_globals - __cxa_exception *caughtExceptions; - unsigned int uncaughtExceptions; - }; -- -+#endif - } - - extern "C" CPPU_CURRENT_NAMESPACE::__cxa_eh_globals *__cxa_get_globals () throw(); diff --git a/misc/libreoffice4/patches/patch-bridges_source_cpp__uno_gcc3__linux__intel_uno2cpp.cxx b/misc/libreoffice4/patches/patch-bridges_source_cpp__uno_gcc3__linux__intel_uno2cpp.cxx deleted file mode 100644 index caf81ec265c..00000000000 --- a/misc/libreoffice4/patches/patch-bridges_source_cpp__uno_gcc3__linux__intel_uno2cpp.cxx +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bridges_source_cpp__uno_gcc3__linux__intel_uno2cpp.cxx,v 1.1 2014/02/21 20:29:52 joerg Exp $ - ---- bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx.orig 2014-01-27 21:35:34.000000000 +0000 -+++ bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx -@@ -203,7 +203,7 @@ static void cpp_call( - catch (...) - { - // fill uno exception -- fillUnoException( __cxa_get_globals()->caughtExceptions, *ppUnoExc, pThis->getBridge()->getCpp2Uno() ); -+ CPPU_CURRENT_NAMESPACE::fillUnoException( __cxa_get_globals()->caughtExceptions, *ppUnoExc, pThis->getBridge()->getCpp2Uno() ); - - // temporary params - for ( ; nTempIndices--; ) |