[SCM] LibreOffice packaging repository branch, ubuntu-oneiric-3.4, updated. libreoffice_3.4.2-2-176-gfaf5073
The following commit has been merged in the ubuntu-oneiric-3.4 branch:
commit faf5073bf33905235d96a2d43f44886c6413638c
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Thu Aug 25 12:25:11 2011 +0200
refreshing core patch queue for real, including fix for lp#832121
diff --git a/patches/ubuntufixes-core.diff b/patches/ubuntufixes-core.diff
index b774b66..d705589 100644
--- a/patches/ubuntufixes-core.diff
+++ b/patches/ubuntufixes-core.diff
@@ -1,13 +1,13 @@
Index: libreoffice-3.4.2/libreoffice-build/patches/hotfixes/ubuntufixes-core.diff
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ libreoffice-3.4.2/libreoffice-build/patches/hotfixes/ubuntufixes-core.diff 2011-08-25 01:57:42.923666333 +0200
-@@ -0,0 +1,1068 @@
++++ libreoffice-3.4.2/libreoffice-build/patches/hotfixes/ubuntufixes-core.diff 2011-08-25 12:23:09.473383123 +0200
+@@ -0,0 +1,1105 @@
+git format-patch --stdout libreoffice-3.4.2.3..distro/ubuntu/oneiric-3.4 |sed -e 's|^--- a/|--- |' -e 's|^+++ b/|+++ |'
-+From 199bcf985154d33b534d87d1c96c48cbc74a0427 Mon Sep 17 00:00:00 2001
++From 1821350817000893ed9643f3081fca225ca151c2 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/7] apply system-lpsolve-rpath.diff from libreoffice-build
++Subject: [PATCH 1/8] apply system-lpsolve-rpath.diff from libreoffice-build
+
+---
+ solenv/inc/libs.mk | 6 ++++++
@@ -35,10 +35,10 @@ Index: libreoffice-3.4.2/libreoffice-build/patches/hotfixes/ubuntufixes-core.dif
+1.7.5.4
+
+
-+From ec039d9de329cd423e1fbba0dcd474d3bd6157b3 Mon Sep 17 00:00:00 2001
++From 83eed6f49ede0f7b60d3b19e9cc558a90c762ecc 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/7] disable default as-needed on linking
++Subject: [PATCH 2/8] disable default as-needed on linking
+
+ * for not breaking pkg-config provided link switches (because of order)
+---
@@ -61,10 +61,10 @@ Index: libreoffice-3.4.2/libreoffice-build/patches/hotfixes/ubuntufixes-core.dif
+1.7.5.4
+
+
-+From d167d8f03677a8f1da44117dc0205517b3e13a9f Mon Sep 17 00:00:00 2001
++From 903c82fa3bfeafe33965ca5d38c4ff144dbad572 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/7] adding human theme to scp2
++Subject: [PATCH 3/8] adding human theme to scp2
+
+---
+ scp2/source/ooo/file_ooo.scp | 9 +++++++++
@@ -111,10 +111,10 @@ Index: libreoffice-3.4.2/libreoffice-build/patches/hotfixes/ubuntufixes-core.dif
+1.7.5.4
+
+
-+From 2b716070ae4f3cbc7e6b6010bc9477be723031f5 Mon Sep 17 00:00:00 2001
++From 4441ba7add7cd954b7f9077585d10033cc4ded2b 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/7] disable default as-needed on linking for gbuild too
++Subject: [PATCH 4/8] disable default as-needed on linking for gbuild too
+
+ * for not breaking pkg-config provided link switches (because of order)
+---
@@ -137,10 +137,10 @@ Index: libreoffice-3.4.2/libreoffice-build/patches/hotfixes/ubuntufixes-core.dif
+1.7.5.4
+
+
-+From d1515499896ea4e043abeb9abc7471d87ed1a982 Mon Sep 17 00:00:00 2001
++From 2c1ac0ff6558bd2b3dafe79a76a5fbaaa6507ba3 Mon Sep 17 00:00:00 2001
+From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
+Date: Wed, 29 Jun 2011 19:49:36 +0200
-+Subject: [PATCH 5/7] apply ubuntu-palette.diff
++Subject: [PATCH 5/8] apply ubuntu-palette.diff
+
+---
+ extras/source/palettes/standard.soc | 3 +
@@ -275,10 +275,10 @@ Index: libreoffice-3.4.2/libreoffice-build/patches/hotfixes/ubuntufixes-core.dif
+1.7.5.4
+
+
-+From 148c3a6455fc4015cc6cbc62de0251fae4542512 Mon Sep 17 00:00:00 2001
++From 9d3fb278999edb233eb1c2612412a06cd150e396 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 6/7] lp#720716: more translations in desktop files
++Subject: [PATCH 6/8] lp#720716: more translations in desktop files
+
+---
+ sysui/desktop/menus/base.desktop | 5 +
@@ -1020,10 +1020,10 @@ Index: libreoffice-3.4.2/libreoffice-build/patches/hotfixes/ubuntufixes-core.dif
+1.7.5.4
+
+
-+From 9f049da15b0dca23a5951f32896a47f2c00ad2dc Mon Sep 17 00:00:00 2001
++From 1518416ac6a692c2234dfa3cb4b98a382ebe65cc Mon Sep 17 00:00:00 2001
+From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
+Date: Wed, 29 Jun 2011 19:20:43 +0200
-+Subject: [PATCH 7/7] lp#746375: soffice.bin crashed with SIGSEGV in
++Subject: [PATCH 7/8] lp#746375: soffice.bin crashed with SIGSEGV in
+ uno_type_sequence_construct()
+
+---
@@ -1071,3 +1071,40 @@ Index: libreoffice-3.4.2/libreoffice-build/patches/hotfixes/ubuntufixes-core.dif
+--
+1.7.5.4
+
++
++From b08a517917f5f8a525cb2587018bda771357bb0c Mon Sep 17 00:00:00 2001
++From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
++Date: Thu, 25 Aug 2011 00:23:31 +0200
++Subject: [PATCH 8/8] lp#832121: libgcc_s magic breaks horribly on armel
++
++---
++ external/gcc3_specific/makefile.mk | 6 ++++++
++ 1 files changed, 6 insertions(+), 0 deletions(-)
++
++diff --git a/external/gcc3_specific/makefile.mk b/external/gcc3_specific/makefile.mk
++index 0b18d2c..11c7e48 100644
++--- external/gcc3_specific/makefile.mk
+++++ external/gcc3_specific/makefile.mk
++@@ -6,6 +6,11 @@ TARGET=gcc3_specific
++ .INCLUDE: settings.mk
++ # ------------------------------------------------------------------
++
+++.IF "$(CPU)" == "R"
+++all:
+++ echo "skipping libgcc_s magic on ARM."
+++
+++.ELSE
++
++ .IF "$(BUILD_SPECIAL)"==""
++
++@@ -83,6 +88,7 @@ $(LB)$/libgcc_s.so.$(SHORTSTDC3) :
++
++ .ENDIF
++ .ENDIF # "$(BUILD_SPECIAL)"==""
+++.ENDIF
++
++
++ .INCLUDE: target.mk
++--
++1.7.5.4
++
--
LibreOffice packaging repository
Reply to: