[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.6.2_rc1-1-2-g4fc651a
The following commit has been merged in the debian-experimental-3.6 branch:
commit 4fc651aee4b9ee2ac1c21a017849236c24b4e0d5
Author: Rene Engelhard <rene@debian.org>
Date: Wed Sep 19 18:48:23 2012 +0200
patches/gcc-4.4.diff: update with more needed define BOOST_NO_0X_HDR_TYPEINDEX'es
diff --git a/changelog b/changelog
index 68ca695..d730acc 100644
--- a/changelog
+++ b/changelog
@@ -1,7 +1,7 @@
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...
+ failure with system-clucene with gcc 4.4...
-- Rene Engelhard <rene@debian.org> Mon, 17 Sep 2012 14:48:19 +0200
diff --git a/patches/gcc-4.4.diff b/patches/gcc-4.4.diff
index 4a7af21..0e60848 100644
--- a/patches/gcc-4.4.diff
+++ b/patches/gcc-4.4.diff
@@ -42,3 +42,52 @@ index 8cabe50..c5fabe3 100644
$(eval $(call gb_Library_use_libraries,helplinker,\
sal \
))
+--- a/xmlhelp/Library_ucpchelp1.mk-old 2012-09-19 13:58:49.627623148 +0000
++++ b/xmlhelp/Library_ucpchelp1.mk 2012-09-19 13:59:27.119809111 +0000
+@@ -94,4 +94,10 @@
+ xmlhelp/source/cxxhelp/util/Decompressor \
+ ))
+
++ifeq ($(HAVE_CXX0X),TRUE)
++$(eval $(call gb_Library_add_defs,ucpchelp1,\
++ -DHAVE_CXX0X \
++))
++endif
++
+ # vim: set shiftwidth=4 tabstop=4 noexpandtab:
+--- a/xmlhelp/source/cxxhelp/provider/databases.hxx-old 2012-09-19 13:57:56.727360851 +0000
++++ b/xmlhelp/source/cxxhelp/provider/databases.hxx 2012-09-19 13:58:22.187487740 +0000
+@@ -31,6 +31,9 @@
+
+ #include <set>
+ #include <vector>
++#ifndef HAVE_CXX0X
++#define BOOST_NO_0X_HDR_TYPEINDEX
++#endif
+ #include <boost/unordered_map.hpp>
+ #include <boost/unordered_set.hpp>
+ #include <osl/mutex.hxx>
+--- a/xmlhelp/source/cxxhelp/provider/db.hxx-old 2012-09-19 14:08:39.298547156 +0000
++++ b/xmlhelp/source/cxxhelp/provider/db.hxx 2012-09-19 14:09:09.958699171 +0000
+@@ -36,6 +36,9 @@
+
+ #include "com/sun/star/ucb/XSimpleFileAccess.hpp"
+
++#ifndef HAVE_CXX0X
++#define BOOST_NO_0X_HDR_TYPEINDEX
++#endif
+ #include <boost/unordered_map.hpp>
+ #include <rtl/string.hxx>
+
+--- a/sal/inc/osl/diagnose.hxx-old 2012-09-19 16:32:11.521549994 +0200
++++ b/sal/inc/osl/diagnose.hxx 2012-09-19 16:17:14.961104273 +0200
+@@ -33,6 +33,9 @@
+ #include <functional>
+ #include <typeinfo>
+
++#ifndef HAVE_CXX0X
++#define BOOST_NO_0X_HDR_TYPEINDEX
++#endif
+ #include "boost/unordered_set.hpp"
+ #include "osl/diagnose.h"
+ #include "osl/interlck.h"
--
LibreOffice packaging repository
Reply to: