[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.0.3-1-105-g540a6fc
The following commit has been merged in the debian-experimental-4.1 branch:
commit 540a6fc13e049b00a2bd2a0360e31f99ddfd69e2
Author: Rene Engelhard <rene@debian.org>
Date: Wed May 8 19:49:23 2013 +0200
git update; another pyuno-copy-for-python2.diff update
diff --git a/changelog b/changelog
index 646e155..5f5d6ef 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:4.1.0~beta1~git20130507-1) UNRELEASED; urgency=low
+libreoffice (1:4.1.0~beta1~git20130508-1) UNRELEASED; urgency=low
* new upstream snapshot
diff --git a/patches/pyuno-copy-for-python2.diff b/patches/pyuno-copy-for-python2.diff
index 738b693..c476693 100644
--- a/patches/pyuno-copy-for-python2.diff
+++ b/patches/pyuno-copy-for-python2.diff
@@ -54,7 +54,7 @@ diff -urN pyuno/Library_py2uno.mk py2uno/Library_py2uno.mk
+# vim:set noet sw=4 ts=4:
--- /dev/null 2012-11-27 20:03:56.000000000 +0100
+++ py2uno/Library_py2uno_wrapper.mk 2012-11-27 17:57:31.000000000 +0100
-@@ -0,0 +1,37 @@
+@@ -0,0 +1,49 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
@@ -77,6 +77,18 @@ diff -urN pyuno/Library_py2uno.mk py2uno/Library_py2uno.mk
+ python_headers \
+))
+
++# python "import pyuno" dlopens pyuno.so as RTLD_LOCAL, so g++ exception
++# handling used to not work, so pyuno.so (pyuno_wrapper) is just a thin wrapper
++# that dlopens libpyuno.so as RTLD_GLOBAL; but when pyuno.so wrapper links
++# against libstdc++ (which has not previously been loaded into python process),
++# that resolves its _ZNSs4_Rep20_S_empty_rep_storageE to itself, but later LO
++# libs (loaded though RTLD_GLOBAL libpyuno.so) may resolve that symbol to e.g.
++# cppu, because they happen to see that before libstdc++; so the requirement has
++# always been that RTLD_LOCAL-loaded pyuno.so wrapper implicitly load into the
++# process as little as possible:
++$(eval $(call gb_Library_add_ldflags,pyuno_wrapper,-nostdlib))
++$(eval $(call gb_Library_add_libs,pyuno_wrapper,-lc))
++
+ifneq ($(OS)$(COM),WNTMSC)
+ifeq ($(filter DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),)
+
@@ -234,7 +246,7 @@ diff -urN pyuno/Library_pyuno.mk py2uno/Library_pyuno.mk
-# vim:set noet sw=4 ts=4:
--- pyuno/Library_pyuno_wrapper.mk 2012-11-27 17:57:31.000000000 +0100
+++ /dev/null 2012-11-27 20:03:56.000000000 +0100
-@@ -1,37 +0,0 @@
+@@ -1,49 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
@@ -257,6 +269,18 @@ diff -urN pyuno/Library_pyuno.mk py2uno/Library_pyuno.mk
- python_headers \
-))
-
+-# python "import pyuno" dlopens pyuno.so as RTLD_LOCAL, so g++ exception
+-# handling used to not work, so pyuno.so (pyuno_wrapper) is just a thin wrapper
+-# that dlopens libpyuno.so as RTLD_GLOBAL; but when pyuno.so wrapper links
+-# against libstdc++ (which has not previously been loaded into python process),
+-# that resolves its _ZNSs4_Rep20_S_empty_rep_storageE to itself, but later LO
+-# libs (loaded though RTLD_GLOBAL libpyuno.so) may resolve that symbol to e.g.
+-# cppu, because they happen to see that before libstdc++; so the requirement has
+-# always been that RTLD_LOCAL-loaded pyuno.so wrapper implicitly load into the
+-# process as little as possible:
+-$(eval $(call gb_Library_add_ldflags,pyuno_wrapper,-nostdlib))
+-$(eval $(call gb_Library_add_libs,pyuno_wrapper,-lc))
+-
-ifneq ($(OS)$(COM),WNTMSC)
-ifeq ($(filter DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),)
-
--
LibreOffice packaging repository
Reply to: