pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/misc/libreoffice4 Fix FreeBSD 10.0 (clang) build, and ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/04a5b3e18803
branches: trunk
changeset: 635189:04a5b3e18803
user: ryoon <ryoon%pkgsrc.org@localhost>
date: Sun Jun 01 14:31:08 2014 +0000
description:
Fix FreeBSD 10.0 (clang) build, and add gstreamer support to OpenBSD
diffstat:
misc/libreoffice4/distinfo | 13 +-
misc/libreoffice4/patches/patch-bridges_source_cpp__uno_gcc3__linux__intel_except.cxx | 40 +++++
misc/libreoffice4/patches/patch-bridges_source_cpp__uno_gcc3__linux__intel_share.hxx | 75 ++++++++++
misc/libreoffice4/patches/patch-bridges_source_cpp__uno_gcc3__linux__intel_uno2cpp.cxx | 16 ++
misc/libreoffice4/patches/patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx | 59 +++----
misc/libreoffice4/patches/patch-bridges_source_cpp__uno_gcc3__linux__x86-64_uno2cpp.cxx | 16 +-
misc/libreoffice4/patches/patch-configure.ac | 39 ++++-
misc/libreoffice4/patches/patch-connectivity_source_parse_sqlbison.y | 15 ++
misc/libreoffice4/patches/patch-svtools_source_control_ctrlbox.cxx | 13 +
9 files changed, 242 insertions(+), 44 deletions(-)
diffs (truncated from 391 to 300 lines):
diff -r d5dabe90555b -r 04a5b3e18803 misc/libreoffice4/distinfo
--- a/misc/libreoffice4/distinfo Sun Jun 01 14:28:16 2014 +0000
+++ b/misc/libreoffice4/distinfo Sun Jun 01 14:31:08 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2014/05/16 11:53:56 ryoon Exp $
+$NetBSD: distinfo,v 1.17 2014/06/01 14:31:08 ryoon Exp $
SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093
RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b
@@ -138,9 +138,13 @@
SHA1 (libreoffice/libreoffice-translations-4.2.4.2.tar.xz) = 6c1849e270189b88b40583890820d915b4998fb9
RMD160 (libreoffice/libreoffice-translations-4.2.4.2.tar.xz) = 4c05f13af991c601ac2c98c073aa4a8251e69bd5
Size (libreoffice/libreoffice-translations-4.2.4.2.tar.xz) = 127819696 bytes
-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) = e63fff7c20c303db677edce71be56aaf555e8742
+SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__intel_except.cxx) = b7eb550e24f6fa5ff5a6c4121836803360a0883f
+SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__intel_share.hxx) = 5e02fb3bf5b446ed705b1ca4d6e38d9d3dbd73b6
+SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__intel_uno2cpp.cxx) = b01d697451973a873247a370ebec2cd5c3a8029d
+SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx) = 2becfe2404078ad6729c236dcc39994dc277eca6
+SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__x86-64_uno2cpp.cxx) = 5022ad96533aa1681e6fab323cadf803281a6c17
+SHA1 (patch-configure.ac) = 63ebfaae5d119dad6ce87d221fc71598b25f0b93
+SHA1 (patch-connectivity_source_parse_sqlbison.y) = 2dd006e2a039a4dddaca4357466bb45f3a1e0cd1
SHA1 (patch-i18npool_CustomTarget__collator.mk) = 8d5304470e47f48e0febdbe0072bf99016334828
SHA1 (patch-i18npool_Library__collator__data.mk) = a50574288ed7d6ad0bf45b6f0c30ad63a4043721
SHA1 (patch-i18npool_source_collator_collator__unicode.cxx) = 45bc3209137f9ddd2216181fc9a52a80c87cb243
@@ -151,3 +155,4 @@
SHA1 (patch-solenv_gbuild_Module.mk) = 78d57071ac2c884bb6406356f45db3c55b61c678
SHA1 (patch-solenv_gbuild_platform_NETBSD__INTEL__GCC.mk) = a0c2490d0ed5186278778f62505f3e4dc63422cd
SHA1 (patch-solenv_gbuild_platform_NETBSD__X86__64__GCC.mk) = a3afc8c8d82854f187ef455651b492ac801a63a0
+SHA1 (patch-svtools_source_control_ctrlbox.cxx) = 6b6a99bcf78b3e4ae27cedc9adbbf29a7889b76b
diff -r d5dabe90555b -r 04a5b3e18803 misc/libreoffice4/patches/patch-bridges_source_cpp__uno_gcc3__linux__intel_except.cxx
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/libreoffice4/patches/patch-bridges_source_cpp__uno_gcc3__linux__intel_except.cxx Sun Jun 01 14:31:08 2014 +0000
@@ -0,0 +1,40 @@
+$NetBSD: patch-bridges_source_cpp__uno_gcc3__linux__intel_except.cxx,v 1.1 2014/06/01 14:31:08 ryoon Exp $
+
+--- bridges/source/cpp_uno/gcc3_linux_intel/except.cxx.orig 2014-04-30 19:49:45.000000000 +0000
++++ bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
+@@ -22,11 +22,6 @@
+ #include <dlfcn.h>
+ #include <boost/unordered_map.hpp>
+
+-#include <cxxabi.h>
+-#ifndef _GLIBCXX_CDTOR_CALLABI // new in GCC 4.7 cxxabi.h
+-#define _GLIBCXX_CDTOR_CALLABI
+-#endif
+-
+ #include <rtl/strbuf.hxx>
+ #include <rtl/ustrbuf.hxx>
+ #include <osl/diagnose.h>
+@@ -248,7 +243,11 @@ void raiseException( uno_Any * pUnoExc,
+ Reference< XInterface >() );
+ }
+
++#ifdef _LIBCPP_VERSION
++ pCppExc = __cxxabiv1::__cxa_allocate_exception( pTypeDescr->nSize );
++#else
+ pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
++#endif
+ ::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
+
+ // destruct uno exception
+@@ -280,7 +279,11 @@ void raiseException( uno_Any * pUnoExc,
+ }
+ }
+
++#ifdef _LIBCPP_VERSION
++ __cxxabiv1::__cxa_throw( pCppExc, rtti, deleteException );
++#else
+ __cxa_throw( pCppExc, rtti, deleteException );
++#endif
+ }
+
+ //==================================================================================================
diff -r d5dabe90555b -r 04a5b3e18803 misc/libreoffice4/patches/patch-bridges_source_cpp__uno_gcc3__linux__intel_share.hxx
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/libreoffice4/patches/patch-bridges_source_cpp__uno_gcc3__linux__intel_share.hxx Sun Jun 01 14:31:08 2014 +0000
@@ -0,0 +1,75 @@
+$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 <uno/any2.h>
+
+-namespace CPPU_CURRENT_NAMESPACE
++#include <cxxabi.h>
++#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
diff -r d5dabe90555b -r 04a5b3e18803 misc/libreoffice4/patches/patch-bridges_source_cpp__uno_gcc3__linux__intel_uno2cpp.cxx
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/libreoffice4/patches/patch-bridges_source_cpp__uno_gcc3__linux__intel_uno2cpp.cxx Sun Jun 01 14:31:08 2014 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-bridges_source_cpp__uno_gcc3__linux__intel_uno2cpp.cxx,v 1.3 2014/06/01 14:31:08 ryoon Exp $
+
+--- bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx.orig 2014-04-30 19:49:45.000000000 +0000
++++ bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx
+@@ -203,7 +203,11 @@ static void cpp_call(
+ catch (...)
+ {
+ // fill uno exception
++#ifdef _LIBCPP_VERSION
++ CPPU_CURRENT_NAMESPACE::fillUnoException( __cxxabiv1::__cxa_get_globals()->caughtExceptions, *ppUnoExc, pThis->getBridge()->getCpp2Uno() );
++#else
+ fillUnoException( __cxa_get_globals()->caughtExceptions, *ppUnoExc, pThis->getBridge()->getCpp2Uno() );
++#endif
+
+ // temporary params
+ for ( ; nTempIndices--; )
diff -r d5dabe90555b -r 04a5b3e18803 misc/libreoffice4/patches/patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx
--- a/misc/libreoffice4/patches/patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx Sun Jun 01 14:28:16 2014 +0000
+++ b/misc/libreoffice4/patches/patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx Sun Jun 01 14:31:08 2014 +0000
@@ -1,25 +1,15 @@
-$NetBSD: patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx,v 1.3 2014/02/21 20:29:52 joerg Exp $
+$NetBSD: patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx,v 1.4 2014/06/01 14:31:08 ryoon Exp $
---- bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx.orig 2014-01-27 21:35:34.000000000 +0000
+--- bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx.orig 2014-04-30 19:49:45.000000000 +0000
+++ bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
-@@ -19,6 +19,7 @@
-
- #include "sal/config.h"
-
-+#include <cxxabi.h>
- #include <typeinfo>
- #include <exception>
- #include <cstddef>
-@@ -31,11 +32,36 @@
+@@ -31,6 +31,32 @@
#include "config_gcc.h"
#include "uno/mapping.h"
--namespace CPPU_CURRENT_NAMESPACE
-+// ----- 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 ) { }
@@ -33,28 +23,37 @@
+ virtual ~__si_class_type_info();
+ const __class_type_info *__base_type;
+ };
++
++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
+@@ -101,6 +127,9 @@ extern "C" void __cxa_throw(
+ __attribute__((noreturn));
+ }
+ #endif
++
++
+#endif
-+
-+namespace CPPU_CURRENT_NAMESPACE
-+{
+ namespace CPPU_CURRENT_NAMESPACE
+ {
+@@ -110,7 +139,11 @@ void raiseException(
+ uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
+ //==================================================================================================
+ void fillUnoException(
+#ifdef _LIBCPP_VERSION
-+using __cxxabiv1::__cxa_exception;
-+using __cxxabiv1::__cxa_eh_globals;
-+using ::_Unwind_Exception;
++ __cxxabiv1::__cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
+#else
- struct _Unwind_Exception
- {
- unsigned exception_class __attribute__((__mode__(__DI__)));
-@@ -70,7 +96,7 @@ struct __cxa_eh_globals
- __cxa_exception *caughtExceptions;
- unsigned int uncaughtExceptions;
- };
--
+ __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
+#endif
}
- // __cxa_get_globals is exported from libstdc++ since GCC 3.4.0 (CXXABI_1.3),
+ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff -r d5dabe90555b -r 04a5b3e18803 misc/libreoffice4/patches/patch-bridges_source_cpp__uno_gcc3__linux__x86-64_uno2cpp.cxx
--- a/misc/libreoffice4/patches/patch-bridges_source_cpp__uno_gcc3__linux__x86-64_uno2cpp.cxx Sun Jun 01 14:28:16 2014 +0000
+++ b/misc/libreoffice4/patches/patch-bridges_source_cpp__uno_gcc3__linux__x86-64_uno2cpp.cxx Sun Jun 01 14:31:08 2014 +0000
@@ -1,13 +1,19 @@
-$NetBSD: patch-bridges_source_cpp__uno_gcc3__linux__x86-64_uno2cpp.cxx,v 1.3 2014/02/21 20:29:52 joerg Exp $
+$NetBSD: patch-bridges_source_cpp__uno_gcc3__linux__x86-64_uno2cpp.cxx,v 1.4 2014/06/01 14:31:08 ryoon Exp $
---- bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx.orig 2014-01-27 21:35:34.000000000 +0000
+--- bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx.orig 2014-04-30 19:49:45.000000000 +0000
+++ bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
-@@ -290,7 +290,7 @@ static void cpp_call(
+@@ -290,10 +290,14 @@ static void cpp_call(
catch (...)
{
// fill uno exception
-- fillUnoException(
-+ CPPU_CURRENT_NAMESPACE::fillUnoException(
++#ifdef _LIBCPP_VERSION
++ CPPU_CURRENT_NAMESPACE::fillUnoException( __cxxabiv1::__cxa_get_globals()->caughtExceptions, *ppUnoExc, pThis->getBridge()->getCpp2Uno() );
++#else
+ fillUnoException(
reinterpret_cast< CPPU_CURRENT_NAMESPACE::__cxa_eh_globals * >(
__cxxabiv1::__cxa_get_globals())->caughtExceptions,
*ppUnoExc, pThis->getBridge()->getCpp2Uno());
++#endif
+
+ // temporary params
+ for ( ; nTempIndices--; )
diff -r d5dabe90555b -r 04a5b3e18803 misc/libreoffice4/patches/patch-configure.ac
--- a/misc/libreoffice4/patches/patch-configure.ac Sun Jun 01 14:28:16 2014 +0000
+++ b/misc/libreoffice4/patches/patch-configure.ac Sun Jun 01 14:31:08 2014 +0000
@@ -1,12 +1,30 @@
-$NetBSD: patch-configure.ac,v 1.3 2014/05/01 00:32:11 ryoon Exp $
+$NetBSD: patch-configure.ac,v 1.4 2014/06/01 14:31:08 ryoon Exp $
* Improve portability, replace == with =
* Detect pkgsrc apache-ant library
* Fix installation directory
Home |
Main Index |
Thread Index |
Old Index