head	1.2;
access;
symbols
	pkgsrc-2014Q3:1.1.0.4
	pkgsrc-2014Q3-base:1.1
	pkgsrc-2014Q2:1.1.0.2
	pkgsrc-2014Q2-base:1.1;
locks; strict;
comment	@// @;


1.2
date	2014.10.13.21.52.50;	author ryoon;	state dead;
branches;
next	1.1;
commitid	QhbhD7bGXdXkw5Ux;

1.1
date	2014.06.01.14.31.08;	author ryoon;	state Exp;
branches;
next	;
commitid	VYafXyamqkbYnPCx;


desc
@@


1.2
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_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
 }
 
 //==================================================================================================
@


1.1
log
@Fix FreeBSD 10.0 (clang) build, and add gstreamer support to OpenBSD
@
text
@d1 1
a1 1
$NetBSD$
@