[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 cd53c70a84775a09f2b60c0a346c74ceca7c65b4
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Tue Jul 19 16:33:13 2011 +0200
update ubuntufixes: as-needed fix for gbuild, bump libebook so name again
diff --git a/patches/ubuntufixes.diff b/patches/ubuntufixes.diff
index 527d6e3..d1e1252 100644
--- a/patches/ubuntufixes.diff
+++ b/patches/ubuntufixes.diff
@@ -1,8 +1,8 @@
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-15 11:34:51.146844295 +0200
-@@ -0,0 +1,1127 @@
++++ libreoffice-3.4.1/libreoffice-build/patches/hotfixes/ubuntufixes.diff 2011-07-19 16:29:10.855486007 +0200
+@@ -0,0 +1,1149 @@
+./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
@@ -112,31 +112,28 @@ Index: libreoffice-3.4.1/libreoffice-build/patches/hotfixes/ubuntufixes.diff
+1.7.5.4
+
+
-+From 70d08e23ec7f65f3033ae8902816d823b8b5a4c5 Mon Sep 17 00:00:00 2001
++From 5312d2bea6c5c8214e30321b84dc6400661144eb Mon Sep 17 00:00:00 2001
+From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
-+Date: Fri, 15 Jul 2011 11:31:40 +0200
-+Subject: [PATCH 4/4] remove -Wl,--dynamic-list-cpp-new
-+ -Wl,--dynamic-list-cpp-typeinfo linkflags
++Date: Tue, 19 Jul 2011 13:16:14 +0200
++Subject: [PATCH 4/4] disable default as-needed on linking for gbuild too
+
-+ * this breaks ld from binutils-2.21.52.20110707-1ubuntu1 on linking transex
-+ in l10ntools/source
++ * for not breaking pkg-config provided link switches (because of order)
+---
-+ solenv/inc/unxgcc.mk | 2 +-
-+ 1 files changed, 1 insertions(+), 1 deletions(-)
++ solenv/gbuild/platform/linux.mk | 1 +
++ 1 files changed, 1 insertions(+), 0 deletions(-)
+
-+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
++diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk
++index 4ef02d5..be7e6c0 100755
++--- solenv/gbuild/platform/linux.mk
+++++ solenv/gbuild/platform/linux.mk
++@@ -27,6 +27,7 @@
++
++ gb_LinkTarget_LDFLAGS += \
++ -Wl,-z,defs \
+++ -Wl,--no-as-needed \
++
++ include $(GBUILDDIR)/platform/unxgcc.mk
+
-+ # linker flags for linking applications
+--
+1.7.5.4
+
@@ -322,7 +319,7 @@ Index: libreoffice-3.4.1/libreoffice-build/patches/hotfixes/ubuntufixes.diff
+From 8f6b27d7e4e352bc03d4360fbe2a4de0118acfcb Mon Sep 17 00:00:00 2001
+From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
+Date: Wed, 29 Jun 2011 19:15:31 +0200
-+Subject: [PATCH] lp#720716: more translations in desktop files
++Subject: [PATCH 1/2] lp#720716: more translations in desktop files
+
+---
+ sysui/desktop/menus/base.desktop | 5 +
@@ -1070,6 +1067,31 @@ Index: libreoffice-3.4.1/libreoffice-build/patches/hotfixes/ubuntufixes.diff
+--
+1.7.5.4
+
++
++From 795ac1b9088af83e36661d59b816edbe5aef5eab Mon Sep 17 00:00:00 2001
++From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
++Date: Tue, 19 Jul 2011 15:48:36 +0200
++Subject: [PATCH 2/2] libebook-1.2.so SONAME bumped again
++
++---
++ connectivity/source/drivers/evoab2/EApi.cxx | 1 +
++ 1 files changed, 1 insertions(+), 0 deletions(-)
++
++diff --git a/connectivity/source/drivers/evoab2/EApi.cxx b/connectivity/source/drivers/evoab2/EApi.cxx
++index 1767ec1..f93d67a 100644
++--- connectivity/source/drivers/evoab2/EApi.cxx
+++++ connectivity/source/drivers/evoab2/EApi.cxx
++@@ -35,6 +35,7 @@
++ #define DECLARE_FN_POINTERS 1
++ #include "EApi.h"
++ static const char *eBookLibNames[] = {
+++ "libebook-1.2.so.11", // bumped again
++ "libebook-1.2.so.10", // bumped again
++ "libebook-1.2.so.9", // evolution-2.8
++ "libebook-1.2.so.5", // evolution-2.4 and 2.6+
++--
++1.7.5.4
++
+===== libs-extern =====
+===== libs-extern-sys =====
+===== libs-gui =====
--
LibreOffice packaging repository
Reply to: