[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.6.2_rc1-1-1-g3233931

["Rene Engelhard" <rene@debian.org>]

The following commit has been merged in the debian-experimental-3.6 branch:
commit 3233931c5a72654f6ca1e2140184b925a2c9db05
Author: Rene Engelhard <rene@debian.org>
Date:   Mon Sep 17 15:12:59 2012 +0200

    try to work around HelpCompiler build failure with system-clucene (on mips) with gcc 4.4...

diff --git a/changelog b/changelog
index 7510968..68ca695 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:3.6.2~rc1-2) UNRELEASED; urgency=low
+
+  * debian/patches/gcc-4.4.diff: try to work around HelpCompiler build
+    failure with system-clucene (on mips) with gcc 4.4... 
+
+ -- Rene Engelhard <rene@debian.org>  Mon, 17 Sep 2012 14:48:19 +0200
+
 libreoffice (1:3.6.2~rc1-1) experimental; urgency=low
 
   * new upstream release candidate
diff --git a/patches/gcc-4.4.diff b/patches/gcc-4.4.diff
new file mode 100644
index 0000000..4a7af21
--- /dev/null
+++ b/patches/gcc-4.4.diff
@@ -0,0 +1,44 @@
+11:16 <@_rene_> I most wonder about that l10n failure with boost: http://zyklop. dyndns.org/~rene/helpcompiler-boost-mips.log.
+[...]
+11:18 <@Fridrich> _rene_: there is this define#if !defined(BOOST_NO_0X_HDR_TYPEINDEX)
+11:18 <@Fridrich>     std::size_t hash_value(std::type_index);
+11:18 <@Fridrich> #endif
+11:18 <@Fridrich> _rene_: is it possible some include order changed and that is sucked in
+11:19 <@_rene_> Fridrich: yeah, but it only fails on mips. the other archs work with the same boost version :) (ok, this could also be a boost bug, but...)
+11:20 <@Fridrich> _rene_: possible some misdetection of compiler capacities for mips?
+11:20 <@_rene_> yeah, just thought about that too after I posted t he last comment
+11:20 <@_rene_> indeed
+11:20 <@_rene_> checking whether arm-linux-gnueabi-gcc supports -std=gnu++0x without Language Defect 757... yes <-- "normal"
+11:21 <@_rene_> checking whether mips-linux-gnu-gcc-4.4 supports -std=gnu++0x without Language Defect 757... no <-- mips
+
+diff --git a/l10ntools/source/help/HelpCompiler.hxx b/l10ntools/source/help/HelpCompiler.hxx
+index 49ebd60..df943b4 100644
+--- a/l10ntools/source/help/HelpCompiler.hxx
++++ b/l10ntools/source/help/HelpCompiler.hxx
+@@ -30,6 +30,9 @@
+ #define HELPCOMPILER_HXX
+ 
+ #include <string>
++#ifndef HAVE_CXX0X
++#define BOOST_NO_0X_HDR_TYPEINDEX
++#endif
+ #include <boost/unordered_map.hpp>
+ #include <vector>
+ #include <list>
+diff --git a/l10ntools/Library_helplinker.mk b/l10ntools/Library_helplinker.mk
+index 8cabe50..c5fabe3 100644
+--- a/l10ntools/Library_helplinker.mk
++++ b/l10ntools/Library_helplinker.mk
+@@ -35,6 +35,12 @@ $(eval $(call gb_Library_add_defs,helplinker,\
+     -DHELPLINKER_DLLIMPLEMENTATION \
+ ))
+ 
++ifeq ($(HAVE_CXX0X),TRUE)
++$(eval $(call gb_Library_add_defs,helplinker,\
++    -DHAVE_CXX0X \
++))
++endif
++
+ $(eval $(call gb_Library_use_libraries,helplinker,\
+     sal \
+ ))
diff --git a/patches/series b/patches/series
index a62ebc9..0a82da7 100644
--- a/patches/series
+++ b/patches/series
@@ -27,3 +27,4 @@ ignore-sc_cellrangesbase-fails.diff
 build-dont-run-checks.diff
 #disable-broken-sdext_pdfimport-cppunit-test-for-now.diff
 disable-flaky-unoapi-tests.diff
+gcc-4.4.diff

-- 
LibreOffice packaging repository