head 1.2; access; symbols pkgsrc-2016Q4:1.1.0.12 pkgsrc-2016Q4-base:1.1 pkgsrc-2016Q3:1.1.0.10 pkgsrc-2016Q3-base:1.1 pkgsrc-2016Q2:1.1.0.8 pkgsrc-2016Q2-base:1.1 pkgsrc-2016Q1:1.1.0.6 pkgsrc-2016Q1-base:1.1 pkgsrc-2015Q4:1.1.0.4 pkgsrc-2015Q4-base:1.1 pkgsrc-2015Q3:1.1.0.2 pkgsrc-2015Q3-base:1.1; locks; strict; comment @// @; 1.2 date 2016.12.29.19.10.28; author wiz; state dead; branches; next 1.1; commitid UT4GSflIUbUnEUzz; 1.1 date 2015.08.19.07.11.44; author he; state Exp; branches; next ; commitid ygYr891drt49FQxy; desc @@ 1.2 log @Remove old openoffice and libreoffice packages. As discussed on pkgsrc-users. @ text @$NetBSD: patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx,v 1.1 2015/08/19 07:11:44 he Exp $ --- bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx.orig 2014-09-16 20:10:41.000000000 +0000 +++ bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx @@@@ -31,6 +31,25 @@@@ #include "config_gcc.h" #include "uno/mapping.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; + }; +} +#else namespace CPPU_CURRENT_NAMESPACE { @@@@ -72,6 +91,7 @@@@ struct __cxa_eh_globals }; } +#endif // __cxa_get_globals is exported from libstdc++ since GCC 3.4.0 (CXXABI_1.3), // but it is only declared in cxxabi.h (in namespace __cxxabiv1) since @@@@ -109,7 +129,11 @@@@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); void fillUnoException( +#if _LIBCPP_VERSION + __cxxabiv1::__cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); +#else __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); +#endif } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ @ 1.1 log @Resurrect libreoffice4 from 2014-12-25 as libreoffice43, as found in pkgsrc-2014Q4, with the adaptation to build with libcmis-0.5 instead of libcmis-0.4 to allow build with more modern pkgsrc. This should bring back a version of libreoffice which is buildable on netbsd-6 -- it certainly builds for me on NetBSD/i386 6.1.5. @ text @d1 1 a1 1 $NetBSD: patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx,v 1.10 2014/10/30 16:45:39 ryoon Exp $ @