[SCM] LibreOffice packaging repository branch, ubuntu-natty-3.3.1, updated. 42fbf01e62e34354ba7260f1bd695ffa38d94379
The following commit has been merged in the ubuntu-natty-3.3.1 branch:
commit 42fbf01e62e34354ba7260f1bd695ffa38d94379
Author: Matthias Klose <doko@canonical.com>
Date: Tue Mar 1 14:43:18 2011 +0100
lp#727118: no minimal-toc on ppc64
diff --git a/changelog b/changelog
index 06aa49b..6f4463b 100644
--- a/changelog
+++ b/changelog
@@ -2,9 +2,10 @@ libreoffice (1:3.3.1-1ubuntu5) UNRELEASED; urgency=low
* completely disable the arm patch for natty (LP: #726529)
* make libreoffice-gtk recommend either tango or human (LP: #726921)
+ * added ppc fixes (LP: #727118)
* regenerate control file
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Tue, 01 Mar 2011 12:39:12 +0100
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Tue, 01 Mar 2011 14:49:17 +0100
libreoffice (1:3.3.1-1ubuntu4) natty; urgency=low
diff --git a/patches/no-minimaltoc.diff b/patches/no-minimaltoc.diff
new file mode 100644
index 0000000..e48a956
--- /dev/null
+++ b/patches/no-minimaltoc.diff
@@ -0,0 +1,24 @@
+Index: libreoffice-3.3.1/libreoffice-build/patches/dev300/apply
+===================================================================
+--- libreoffice-3.3.1.orig/libreoffice-build/patches/dev300/apply 2011-03-01 14:37:29.144671999 +0100
++++ libreoffice-3.3.1/libreoffice-build/patches/dev300/apply 2011-03-01 14:40:52.064672001 +0100
+@@ -2391,4 +2391,4 @@
+
+ [ UbuntuOnly ]
+ ppc64-openjdk.diff
+-
++no-minimaltoc.diff
+Index: libreoffice-3.3.1/libreoffice-build/patches/dev300/no-minimaltoc.diff
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ libreoffice-3.3.1/libreoffice-build/patches/dev300/no-minimaltoc.diff 2011-03-01 14:37:20.344672014 +0100
+@@ -0,0 +1,9 @@
++--- solenv/inc/unxlngppc64.mk
+++++ solenv/inc/unxlngppc64.mk
++@@ -30,5 +30,4 @@
++ .INCLUDE : unxlngppc.mk
++
++ CDEFS+=-DPOWERPC64
++-CFLAGSCXX+=-mminimal-toc
++ BUILD64=1
++
diff --git a/patches/series b/patches/series
index 8312ce6..b7f4e5f 100644
--- a/patches/series
+++ b/patches/series
@@ -12,3 +12,4 @@ desktop-templates.diff
desktop-translations.diff
human-icons-add.diff
ppc-openjdk.diff
+no-minimaltoc.diff
--
LibreOffice packaging repository
Reply to: