[SCM] LibreOffice packaging repository branch, ubuntu-oneiric-3.4, updated. libreoffice_3.4.1-1-148-g3521157
The following commit has been merged in the ubuntu-oneiric-3.4 branch:
commit 119a74bc0abc3b90b40e961c2f0d661a2167282d
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Tue Jul 19 17:28:22 2011 +0200
disable --dynamic-list-cpp-new/--dynamic-list-cpp-typeino as they SIGSEGV ld from binutils-2.21.52.20110707-1ubuntu1
diff --git a/patches/ubuntufixes.diff b/patches/ubuntufixes.diff
index d1e1252..9ac8be6 100644
--- a/patches/ubuntufixes.diff
+++ b/patches/ubuntufixes.diff
@@ -1,14 +1,14 @@
Index: libreoffice-3.4.1/libreoffice-build/patches/hotfixes/ubuntufixes.diff
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ libreoffice-3.4.1/libreoffice-build/patches/hotfixes/ubuntufixes.diff 2011-07-19 16:29:10.855486007 +0200
-@@ -0,0 +1,1149 @@
++++ libreoffice-3.4.1/libreoffice-build/patches/hotfixes/ubuntufixes.diff 2011-07-19 17:23:24.315530449 +0200
+@@ -0,0 +1,1192 @@
+./g format-patch libreoffice-3-4-0..libreoffice-3-4-0-ubuntu --stdout |sed -e 's|^--- a/|--- |' -e 's|^+++ b/|+++ |'
+===== main repo =====
+From c8b0c9ab769ca586407a49578f251e3aaa1b7ead Mon Sep 17 00:00:00 2001
+From: Rene Engelhard <rene@debian.org>
+Date: Thu, 30 Jun 2011 10:18:47 +0200
-+Subject: [PATCH 1/4] apply system-lpsolve-rpath.diff from libreoffice-build
++Subject: [PATCH 1/5] apply system-lpsolve-rpath.diff from libreoffice-build
+
+---
+ solenv/inc/libs.mk | 6 ++++++
@@ -39,7 +39,7 @@ Index: libreoffice-3.4.1/libreoffice-build/patches/hotfixes/ubuntufixes.diff
+From 36e80b8f2d8a79508f1f147c8def30f3140c54a7 Mon Sep 17 00:00:00 2001
+From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
+Date: Fri, 1 Jul 2011 10:45:59 +0200
-+Subject: [PATCH 2/4] disable default as-needed on linking
++Subject: [PATCH 2/5] disable default as-needed on linking
+
+ * for not breaking pkg-config provided link switches (because of order)
+---
@@ -65,7 +65,7 @@ Index: libreoffice-3.4.1/libreoffice-build/patches/hotfixes/ubuntufixes.diff
+From 72a1fc0064f2fe33765f60b6772eb056b3ae71c1 Mon Sep 17 00:00:00 2001
+From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
+Date: Sun, 3 Jul 2011 11:37:02 +0200
-+Subject: [PATCH 3/4] adding human theme to scp2
++Subject: [PATCH 3/5] adding human theme to scp2
+
+---
+ scp2/source/ooo/file_ooo.scp | 9 +++++++++
@@ -115,7 +115,7 @@ Index: libreoffice-3.4.1/libreoffice-build/patches/hotfixes/ubuntufixes.diff
+From 5312d2bea6c5c8214e30321b84dc6400661144eb Mon Sep 17 00:00:00 2001
+From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
+Date: Tue, 19 Jul 2011 13:16:14 +0200
-+Subject: [PATCH 4/4] disable default as-needed on linking for gbuild too
++Subject: [PATCH 4/5] disable default as-needed on linking for gbuild too
+
+ * for not breaking pkg-config provided link switches (because of order)
+---
@@ -137,6 +137,49 @@ Index: libreoffice-3.4.1/libreoffice-build/patches/hotfixes/ubuntufixes.diff
+--
+1.7.5.4
+
++
++From 803fd4e9b127241e06d0616d4b47b03b652a37bc Mon Sep 17 00:00:00 2001
++From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
++Date: Tue, 19 Jul 2011 17:20:43 +0200
++Subject: [PATCH 5/5] disable
++ --dynamic-list-cpp-new/--dynamic-list-cpp-typeino as
++ they SIGSEGV ld
++
++ * at least on linking transex in l10ntools/source with ld from binutils-2.21.52.20110707-1ubuntu1
++---
++ solenv/gbuild/platform/unxgcc.mk | 2 --
++ solenv/inc/unxgcc.mk | 2 +-
++ 2 files changed, 1 insertions(+), 3 deletions(-)
++
++diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
++index 7ad122e..2c3d4b5 100755
++--- solenv/gbuild/platform/unxgcc.mk
+++++ solenv/gbuild/platform/unxgcc.mk
++@@ -130,8 +130,6 @@ endif
++
++ ifneq ($(HAVE_LD_BSYMBOLIC_FUNCTIONS),)
++ gb_LinkTarget_LDFLAGS += \
++- -Wl,--dynamic-list-cpp-new \
++- -Wl,--dynamic-list-cpp-typeinfo \
++ -Wl,-Bsymbolic-functions \
++
++ endif
++diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
++index c73333f..8c19388 100644
++--- solenv/inc/unxgcc.mk
+++++ solenv/inc/unxgcc.mk
++@@ -180,7 +180,7 @@ LINKFLAGSRUNPATH_NONE=
++ # flag -Wl,-z,noexecstack sets the NX bit on the stack
++ LINKFLAGS=-Wl,-z,noexecstack -Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGS_SYSBASE)
++ .IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)" == "TRUE"
++-LINKFLAGS += -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo
+++LINKFLAGS += -Wl,-Bsymbolic-functions
++ .ENDIF
++
++ # linker flags for linking applications
++--
++1.7.5.4
++
+===== artwork =====
+===== base =====
+===== calc =====
--
LibreOffice packaging repository
Reply to: