[SCM] LibreOffice packaging repository branch, ubuntu-oneiric-3.4, updated. libreoffice_3.4.2-2-186-gfcda99f
The following commit has been merged in the ubuntu-oneiric-3.4 branch:
commit fcda99fb7d8e90ee8d7afcd7505757ce6091b86b
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Fri Aug 26 18:17:15 2011 +0200
update libgcc_s patch for powerpc too
diff --git a/patches/ubuntufixes-core.diff b/patches/ubuntufixes-core.diff
index d705589..1cde1fb 100644
--- a/patches/ubuntufixes-core.diff
+++ b/patches/ubuntufixes-core.diff
@@ -1,8 +1,8 @@
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 12:23:09.473383123 +0200
-@@ -0,0 +1,1105 @@
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ libreoffice-3.4.2/libreoffice-build/patches/hotfixes/ubuntufixes-core.diff 2011-08-25 12:23:09.473383123 +0200
+@@ -0,0 +1,1106 @@
+git format-patch --stdout libreoffice-3.4.2.3..distro/ubuntu/oneiric-3.4 |sed -e 's|^--- a/|--- |' -e 's|^+++ b/|+++ |'
+From 1821350817000893ed9643f3081fca225ca151c2 Mon Sep 17 00:00:00 2001
+From: Rene Engelhard <rene@debian.org>
@@ -1072,26 +1072,27 @@ 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 f67d772edd08d22f9c5f2ab556cef33a7c8c5636 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
++Subject: [PATCH 8/8] lp#832121: libgcc_s magic breaks horribly on armel and
++ powerpc
+
+---
+ 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
++index 0b18d2c..7c20ef3 100644
+--- external/gcc3_specific/makefile.mk
++++ external/gcc3_specific/makefile.mk
+@@ -6,6 +6,11 @@ TARGET=gcc3_specific
+ .INCLUDE: settings.mk
+ # ------------------------------------------------------------------
+
-++.IF "$(CPU)" == "R"
+++.IF "$(CPU)" == "R" || "$(CPU)" == "P"
++all:
-++ echo "skipping libgcc_s magic on ARM."
+++ echo "skipping libgcc_s magic on $(CPUNAME)."
++
++.ELSE
+
--
LibreOffice packaging repository
Reply to: