head 1.6; access; symbols pkgsrc-2014Q3:1.5.0.4 pkgsrc-2014Q3-base:1.5 pkgsrc-2014Q2:1.5.0.2 pkgsrc-2014Q2-base:1.5 pkgsrc-2014Q1:1.3.0.2 pkgsrc-2014Q1-base:1.3; locks; strict; comment @// @; 1.6 date 2014.10.13.21.52.50; author ryoon; state dead; branches; next 1.5; commitid QhbhD7bGXdXkw5Ux; 1.5 date 2014.06.01.14.31.08; author ryoon; state Exp; branches; next 1.4; commitid VYafXyamqkbYnPCx; 1.4 date 2014.04.13.15.57.21; author tsutsui; state dead; branches; next 1.3; commitid 63qlzXGzJy4grxwx; 1.3 date 2014.02.21.20.29.52; author joerg; state Exp; branches 1.3.2.1; next 1.2; commitid cjK3cLVXoxYkA0qx; 1.2 date 2014.02.02.07.43.40; author ryoon; state dead; branches; next 1.1; commitid SCRPn9tBPxRmXunx; 1.1 date 2014.01.20.19.27.51; author joerg; state Exp; branches; next ; commitid mZR31TNIY8KOgTlx; 1.3.2.1 date 2014.04.22.06.51.51; author tron; state dead; branches; next ; commitid QVSlRyR7MTHb8Exx; desc @@ 1.6 log @Update to 4.3.2.2 from 4.2.5.2 * Use external boost again with Linux From Scratch patch * COLLADA support is disabled Changelog: New features and many bugfixes. See https://wiki.documentfoundation.org/ReleaseNotes/4.3 https://wiki.documentfoundation.org/Releases/4.3.2/RC1 https://wiki.documentfoundation.org/Releases/4.3.2/RC2 @ text @$NetBSD: patch-bridges_source_cpp__uno_gcc3__linux__intel_share.hxx,v 1.5 2014/06/01 14:31:08 ryoon Exp $ --- bridges/source/cpp_uno/gcc3_linux_intel/share.hxx.orig 2014-04-30 19:49:45.000000000 +0000 +++ bridges/source/cpp_uno/gcc3_linux_intel/share.hxx @@@@ -25,10 +25,39 @@@@ #include -namespace CPPU_CURRENT_NAMESPACE +#include +#ifndef _GLIBCXX_CDTOR_CALLABI // new in GCC 4.7 cxxabi.h +#define _GLIBCXX_CDTOR_CALLABI +#endif + +#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; + }; -void dummy_can_throw_anything( char const * ); +extern "C" void *__cxa_allocate_exception( std::size_t thrown_size ) _NOEXCEPT; + +extern "C" _LIBCPP_NORETURN void __cxa_throw( + void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ); +} + +#else + +namespace CPPU_CURRENT_NAMESPACE +{ // ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h @@@@ -86,6 +115,15 @@@@ extern "C" void __cxa_throw ( void *thrown_exception, void *tinfo, void (*dest) (void *) ) __attribute__((noreturn)); #endif +} + +#endif + +namespace CPPU_CURRENT_NAMESPACE +{ + +void dummy_can_throw_anything( char const * ); + // ----- //================================================================================================== @@@@ -93,8 +131,11 @@@@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); //================================================================================================== void fillUnoException( +#ifdef _LIBCPP_VERSION + __cxxabiv1::__cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); +#else __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); - +#endif } namespace x86 @ 1.5 log @Fix FreeBSD 10.0 (clang) build, and add gstreamer support to OpenBSD @ text @d1 1 a1 1 $NetBSD$ @ 1.4 log @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 @ text @d1 1 a1 1 $NetBSD: patch-bridges_source_cpp__uno_gcc3__linux__intel_share.hxx,v 1.3 2014/02/21 20:29:52 joerg Exp $ d3 1 a3 1 --- bridges/source/cpp_uno/gcc3_linux_intel/share.hxx.orig 2014-01-27 21:35:34.000000000 +0000 d5 1 a5 1 @@@@ -19,18 +19,44 @@@@ d7 1 a7 1 #include "uno/mapping.h" d9 1 d11 4 a14 7 #include #include #include #include +// ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h d18 1 a18 1 +{ d32 6 d40 6 a45 2 namespace CPPU_CURRENT_NAMESPACE { d47 3 a49 1 void dummy_can_throw_anything( char const * ); d51 16 a66 1 // ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h d68 1 a68 3 +using __cxxabiv1::__cxa_exception; +using __cxxabiv1::__cxa_eh_globals; +using ::_Unwind_Exception; d70 1 a70 7 struct _Unwind_Exception { @@@@ -66,7 +92,7 @@@@ struct __cxa_eh_globals __cxa_exception *caughtExceptions; unsigned int uncaughtExceptions; }; d75 1 a75 1 extern "C" CPPU_CURRENT_NAMESPACE::__cxa_eh_globals *__cxa_get_globals () throw(); @ 1.3 log @Reapply libc++ support. @ text @d1 1 a1 1 $NetBSD$ @ 1.3.2.1 log @Pullup ticket #4384 - requested by tsutsui misc/libreoffice4: build fix Revisions pulled up: - misc/libreoffice4/distinfo 1.12 - misc/libreoffice4/patches/patch-bridges_source_cpp__uno_gcc3__linux__intel_share.hxx deleted - misc/libreoffice4/patches/patch-bridges_source_cpp__uno_gcc3__linux__intel_uno2cpp.cxx deleted --- Module Name: pkgsrc Committed By: tsutsui Date: Sun Apr 13 15:57:21 UTC 2014 Modified Files: pkgsrc/misc/libreoffice4: distinfo Removed Files: pkgsrc/misc/libreoffice4/patches: patch-bridges_source_cpp__uno_gcc3__linux__intel_share.hxx patch-bridges_source_cpp__uno_gcc3__linux__intel_uno2cpp.cxx Log Message: 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 @ text @d1 1 a1 1 $NetBSD: patch-bridges_source_cpp__uno_gcc3__linux__intel_share.hxx,v 1.3 2014/02/21 20:29:52 joerg Exp $ @ 1.2 log @Update to 4.2.0.4 Changelog: * Many bugfixes * Many new features See https://wiki.documentfoundation.org/ReleaseNotes/4.2 and https://www.libreoffice.org/download/4-2-new-features-and-fixes/ @ text @d1 1 a1 1 $NetBSD: patch-bridges_source_cpp__uno_gcc3__linux__intel_share.hxx,v 1.1 2014/01/20 19:27:51 joerg Exp $ d3 1 a3 1 --- bridges/source/cpp_uno/gcc3_linux_intel/share.hxx.orig 2013-10-22 17:49:23.000000000 +0000 d5 1 a5 1 @@@@ -69,7 +69,33 @@@@ struct __cxa_eh_globals d7 8 a14 1 } d16 1 a33 5 + +extern "C" void *__cxa_allocate_exception( std::size_t thrown_size ) _NOEXCEPT; + +extern "C" _LIBCPP_NORETURN void __cxa_throw( + void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ); d36 10 d47 8 a54 1 extern "C" CPPU_CURRENT_NAMESPACE::__cxa_eh_globals *__cxa_get_globals () throw(); d56 1 d58 1 a58 2 namespace CPPU_CURRENT_NAMESPACE { @ 1.1 log @Fix build with Clang. Patches mostly from FreeBSD. @ text @d1 1 a1 1 $NetBSD$ @