head 1.11; access; symbols pkgsrc-2014Q4:1.10.0.2 pkgsrc-2014Q4-base:1.10 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.11 date 2015.02.04.18.19.34; author ryoon; state dead; branches; next 1.10; commitid opoci09XAqv7GI8y; 1.10 date 2014.10.30.16.45.39; author ryoon; state Exp; branches; next 1.9; commitid YUrrntXMeRN5hfWx; 1.9 date 2014.10.28.17.25.07; author ryoon; state Exp; branches; next 1.8; commitid Ye50fCopd2qKyZVx; 1.8 date 2014.10.24.03.09.35; author ryoon; state dead; branches; next 1.7; commitid GVCmXmCECXddXoVx; 1.7 date 2014.10.15.22.07.46; author joerg; state Exp; branches; next 1.6; commitid lpfZb84K4USBxlUx; 1.6 date 2014.10.13.21.52.50; author ryoon; state dead; branches; next 1.5; commitid QhbhD7bGXdXkw5Ux; 1.5 date 2014.06.22.23.59.36; author ryoon; state Exp; branches; next 1.4; commitid 31bLR4xAMLX6RzFx; 1.4 date 2014.06.01.14.31.08; author ryoon; state Exp; branches; next 1.3; commitid VYafXyamqkbYnPCx; 1.3 date 2014.02.21.20.29.52; author joerg; state Exp; branches; 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; desc @@ 1.11 log @Update to 4.4.0.3 * Disable JFreeReport for report builder. I have gotten build error. * Use OpenGL. * Use GStreamer 1.x Changelog: New features: see https://wiki.documentfoundation.org/ReleaseNotes/4.4 Summary: == Writer * Master Doument Templates * Shapes can have a TextBox * Improvements to Track Changes * Style dropdown * Line numbering easier to apply for headers and footers * Status bar improvements * Toolbar improvements * Navigator bookmarks * AutoCorrect improvements == Calc * Statistics Wizard (alternative to Excel's Add-in "Analysis ToolPak") * Direct conversion of formulas into static values * Formula engine (AGGREGATE spreadsheet function) * Toolbar improvements * Sheet context menu == Impress and Draw * Text of Master View Object Previews * Select and toggle off master elements directly via Delete * OpenGL transitions * Page Title field * Inherit current style of cells when inserting New row/column in table * Password for editing * Printing: use specified paper size * Zoom Mode button * Toolbar improvements * Menubar improvements == Math * Color support == Core * Included fonts (Caladea and Carlito) * Digitally signed PDF export * Drawing objects * Technical Dictionary == LibreOfficeKit * Impress supports tile rendering == Filters * Many import filters are improved * SharePoint OneDrive connection == GUI * Dialogs conversion to WidgetLayout finished * Sifr as the default icon theme on OS X * Changes to rulers * Start Center * New default templates * New color selector * Reworked paragraph line spacing dropdown * Bullet and Numbering dropdown * Sidebar changes * Context menu changes * Edit / Read-only mode * Tab changes * Firefox Themes * Image scaling * Simplification of Special Character dialog * Icon improvements * Locale in About dialog * UI text improvements == Localization * New languages/locales with locale data (ca-ES-valencia) * Improved language tools (spell-check dictionaries, thesaurus, hyphenation patterns) Bugfixes: https://wiki.documentfoundation.org/Releases/4.4.0/RC1 https://wiki.documentfoundation.org/Releases/4.4.0/RC2 https://wiki.documentfoundation.org/Releases/4.4.0/RC3 @ text @$NetBSD: patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx,v 1.10 2014/10/30 16:45:39 ryoon 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.10 log @Fix path of a patch. FIx build. Thank you, wiz@@. @ text @d1 1 a1 1 $NetBSD: patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx,v 1.9 2014/10/28 17:25:07 ryoon Exp $ @ 1.9 log @clang build should be fixed. @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- /usr/tmp/pkgsrc/misc/libreoffice4/work/libreoffice-4.3.2.2/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx.orig 2014-09-16 20:10:41.000000000 +0000 +++ /usr/tmp/pkgsrc/misc/libreoffice4/work/libreoffice-4.3.2.2/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx @ 1.8 log @Fix GCC build. I will revisit clang build later. @ text @d1 1 a1 1 $NetBSD: patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx,v 1.7 2014/10/15 22:07:46 joerg Exp $ d3 2 a4 2 --- 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 d39 1 a39 1 @@@@ -109,7 +129,7 @@@@ void raiseException( d43 1 a43 1 - __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); d45 3 @ 1.7 log @Fix clang build again for amd64. @ text @d1 1 a1 1 $NetBSD$ @ 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 @d1 1 a1 1 $NetBSD: patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx,v 1.5 2014/06/22 23:59:36 ryoon Exp $ d3 1 a3 1 --- bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx.orig 2014-04-30 19:49:45.000000000 +0000 d5 1 a5 1 @@@@ -31,6 +31,32 @@@@ a25 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 *) ); a26 1 + a27 1 + d31 3 a33 1 @@@@ -102,6 +128,9 @@@@ extern "C" void __cxa_throw( a34 3 #endif + a35 3 + namespace CPPU_CURRENT_NAMESPACE { d37 3 a39 1 @@@@ -110,7 +139,11 @@@@ void raiseException( d41 1 a41 1 //================================================================================================== d43 1 a43 1 +#ifdef _LIBCPP_VERSION a44 3 +#else __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); +#endif @ 1.5 log @Bump PKGREVISION * Accept python27 * Support debug build and target for debugging Mostly from richard@@. @ text @d1 1 a1 1 $NetBSD: patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx,v 1.4 2014/06/01 14:31:08 ryoon Exp $ @ 1.4 log @Fix FreeBSD 10.0 (clang) build, and add gstreamer support to OpenBSD @ text @d1 1 a1 1 $NetBSD: patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx,v 1.3 2014/02/21 20:29:52 joerg Exp $ d38 1 a38 2 @@@@ -101,6 +127,9 @@@@ extern "C" void __cxa_throw( __attribute__((noreturn)); d41 1 d43 1 a44 2 +#endif d47 1 @ 1.3 log @Reapply libc++ support. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx.orig 2014-01-27 21:35:34.000000000 +0000 d5 1 a5 9 @@@@ -19,6 +19,7 @@@@ #include "sal/config.h" +#include #include #include #include @@@@ -31,11 +32,36 @@@@ a8 2 -namespace CPPU_CURRENT_NAMESPACE +// ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h d12 1 a12 1 { d26 5 d32 5 d38 6 a43 1 -// ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h a44 3 + +namespace CPPU_CURRENT_NAMESPACE +{ d46 6 d53 1 a53 3 +using __cxxabiv1::__cxa_exception; +using __cxxabiv1::__cxa_eh_globals; +using ::_Unwind_Exception; d55 1 a55 8 struct _Unwind_Exception { unsigned exception_class __attribute__((__mode__(__DI__))); @@@@ -70,7 +96,7 @@@@ struct __cxa_eh_globals __cxa_exception *caughtExceptions; unsigned int uncaughtExceptions; }; - d59 1 a59 1 // __cxa_get_globals is exported from libstdc++ since GCC 3.4.0 (CXXABI_1.3), @ 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__x86-64_share.hxx,v 1.1 2014/01/20 19:27:51 joerg Exp $ d3 1 a3 1 --- bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx.orig 2013-10-22 17:49:23.000000000 +0000 d7 1 a7 1 #include "uno/mapping.h" d13 3 a15 3 @@@@ -28,6 +29,11 @@@@ namespace CPPU_CURRENT_NAMESPACE // ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h d17 2 a18 16 +#ifdef _LIBCPP_VERSION +using __cxxabiv1::__cxa_exception; +using __cxxabiv1::__cxa_eh_globals; +using ::_Unwind_Exception; +#else struct _Unwind_Exception { unsigned exception_class __attribute__((__mode__(__DI__))); @@@@ -62,9 +68,37 @@@@ struct __cxa_eh_globals __cxa_exception *caughtExceptions; unsigned int uncaughtExceptions; }; +#endif + +} + d22 1 a22 1 +{ d36 1 d38 2 a39 1 +extern "C" void *__cxa_allocate_exception( std::size_t thrown_size ) _NOEXCEPT; d41 2 a42 3 +extern "C" _LIBCPP_NORETURN void __cxa_throw( + void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ); } d44 4 a47 2 +using __cxxabiv1::__cxa_get_globals; + d49 8 a56 8 extern "C" CPPU_CURRENT_NAMESPACE::__cxa_eh_globals *__cxa_get_globals () throw(); namespace CPPU_CURRENT_NAMESPACE @@@@ -81,9 +115,13 @@@@ extern "C" void *__cxa_allocate_exceptio extern "C" void __cxa_throw ( void *thrown_exception, void *tinfo, void (*dest) (void *) ) __attribute__((noreturn)); #endif +} d58 1 d60 1 a60 7 // ----- +namespace CPPU_CURRENT_NAMESPACE +{ //================================================================================================== void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); @ 1.1 log @Fix build with Clang. Patches mostly from FreeBSD. @ text @d1 1 a1 1 $NetBSD$ @