[SCM] LibreOffice packaging repository branch, debian-experimental-3.4.0, updated. libreoffice_3.3.3-1-87-g6c26e01
The following commit has been merged in the debian-experimental-3.4.0 branch:
commit 6c26e01264ead2b1933e4adae4b00b31efea5916
Author: Rene Engelhard <rene@debian.org>
Date: Sat Jun 25 10:19:43 2011 +0000
readd bogusly/accidentially removed gcc 4.6 buildfix (-Z7 for cli_ure)
diff --git a/patches/gcc4.6.0.diff b/patches/gcc4.6.0.diff
new file mode 100644
index 0000000..ab30608
--- /dev/null
+++ b/patches/gcc4.6.0.diff
@@ -0,0 +1,29 @@
+--- /dev/null 2011-04-24 04:52:22.984502351 +0000
++++ libreoffice-3.4.0/libreoffice-build/patches/dev300/gcc4.6.0.diff 2011-04-29 22:34:08.000000000 +0000
+@@ -0,0 +1,9 @@
++--- cli_ure/util/makefile.pmk-old 2011-04-30 12:45:51.000000000 +0000
+++++ cli_ure/util/makefile.pmk 2011-04-30 12:45:55.000000000 +0000
++@@ -29,7 +29,6 @@
++ .IF "$(L10N_framework)"==""
++ .IF "$(COM)$(COMEX)" == "MSC11" || "$(COM)$(COMEX)"== "MSC10" || "$(ENABLE_MONO)" == "YES"
++ BUILD_FOR_CLI = "true"
++-CFLAGSENABLESYMBOLS:=-Z7
++ .ENDIF
++ .ENDIF # "L10N_framework"==""
+--- libreoffice-3.4.0/libreoffice-build/patches/dev300/apply-old 2011-04-30 11:42:54.000000000 +0000
++++ libreoffice-3.4.0/libreoffice-build/patches/dev300/apply 2011-04-30 11:43:23.000000000 +0000
+@@ -21,7 +21,7 @@
+
+ LinuxCommon : Common, FontConfigTemporaryHacks, \
+ LinuxOnly, msaccess, \
+- CliMonoCommon, Mono, MonoComp
++ CliMonoCommon, Mono, MonoComp, Gcc46
+ MacOSXCommon : Common
+ Win32Common : Common, Win32Only, CliMonoCommon, CliComponent
+ # Experimental sections
+@@ -1485,3 +1485,5 @@
+ [ PowerPC ]
+ no-minimaltoc.diff
+
++[ Gcc46 ]
++gcc4.6.0.diff
diff --git a/patches/packcomponents-remove-split-components.diff b/patches/packcomponents-remove-split-components.diff
index ef418a8..266de33 100644
--- a/patches/packcomponents-remove-split-components.diff
+++ b/patches/packcomponents-remove-split-components.diff
@@ -41,9 +41,9 @@
--- libreoffice-3.4.0/libreoffice-build/patches/dev300/apply-old 2011-06-14 01:21:36.000000000 +0200
+++ libreoffice-3.4.0/libreoffice-build/patches/dev300/apply 2011-06-14 01:21:48.000000000 +0200
@@ -1493,3 +1493,6 @@
- [ PowerPC ]
- no-minimaltoc.diff
+ [ Gcc46 ]
+ gcc4.6.0.diff
++
+[ DebianBaseOnly ]
+packcomponents-remove-split-components.diff
-+
diff --git a/patches/series b/patches/series
index 3e41a4f..a3cb27e 100644
--- a/patches/series
+++ b/patches/series
@@ -2,6 +2,7 @@ splash-progressbarcolor.diff
buildfix-patches.diff
no-minimaltoc.diff
update-debian-opt.diff
+gcc4.6.0.diff
odk-jni-include.diff
disable-sdbc-postgresql.diff
fix-connectivity-tests-with-system-hsqldb.diff
--
LibreOffice packaging repository
Reply to: