[SCM] LibreOffice packaging repository branch, master, updated. 02f9a6a277758f22a2b694d55f8f06008c99783f
The following commit has been merged in the master branch:
commit 02f9a6a277758f22a2b694d55f8f06008c99783f
Author: Rene Engelhard <rene@debian.org>
Date: Sat Apr 30 12:50:07 2011 +0000
also remove -Z7 from cli_ure, gcc 4.6 doesn't like it
diff --git a/patches/gcc4.6.0.diff b/patches/gcc4.6.0.diff
index 2d9532a..d48f3d7 100644
--- a/patches/gcc4.6.0.diff
+++ b/patches/gcc4.6.0.diff
@@ -1,6 +1,6 @@
--- /dev/null 2011-04-24 04:52:22.984502351 +0000
+++ libreoffice-3.3.2/libreoffice-build/patches/dev300/gcc4.6.0.diff 2011-04-29 22:34:08.000000000 +0000
-@@ -0,0 +1,294 @@
+@@ -0,0 +1,303 @@
+diff --git basegfx/source/polygon/b2dpolygon.cxx basegfx/source/polygon/b2dpolygon.cxx
+index f88069b..4e578a9 100644
+--- basegfx/source/polygon/b2dpolygon.cxx
@@ -295,6 +295,15 @@
+ #include <vector>
+
+ template<class T>
++--- 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.3.2/libreoffice-build/patches/dev300/apply-old 2011-04-30 11:42:54.000000000 +0000
+++ libreoffice-3.3.2/libreoffice-build/patches/dev300/apply 2011-04-30 11:43:23.000000000 +0000
@@ -23,7 +23,7 @@
--
LibreOffice packaging repository
Reply to: