[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.6.2_rc1-1-35-g3e64aef
The following commit has been merged in the debian-experimental-3.6 branch:
commit 3e64aefd80d18b286ae525b3e06f24d5356f4793
Author: Rene Engelhard <rene@debian.org>
Date: Mon Oct 8 13:49:15 2012 +0200
update to 3.6.3 rc1
diff --git a/changelog b/changelog
index 4384d01..ef224c1 100644
--- a/changelog
+++ b/changelog
@@ -1,10 +1,8 @@
-libreoffice (1:3.6.2-1) UNRELEASED; urgency=low
+libreoffice (1:3.6.3~rc1-1) UNRELEASED; urgency=low
- * new upstream release
+ * new upstream release candidate
[ Rene Engelhard ]
- * debian/patches/gcc-4.4.diff: try to work around HelpCompiler build
- failure with system-clucene with gcc 4.4...
* debian/rules:
- try again with gcc 4.6 for mips* since apparently testtools/smoketest
now work..
diff --git a/patches/gcc-4.4.diff b/patches/gcc-4.4.diff
deleted file mode 100644
index 0e60848..0000000
--- a/patches/gcc-4.4.diff
+++ /dev/null
@@ -1,93 +0,0 @@
-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 \
- ))
---- 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"
diff --git a/patches/series b/patches/series
index 0a82da7..a62ebc9 100644
--- a/patches/series
+++ b/patches/series
@@ -27,4 +27,3 @@ 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
diff --git a/rules b/rules
index ba54334..15aa430 100755
--- a/rules
+++ b/rules
@@ -69,11 +69,11 @@ USE_SOURCE_TARBALLS=y
USE_GIT_TARBALLS=n
ifeq "$(USE_GIT_TARBALLS)" "y"
GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
-lo_sources_ver=3.6.2.2
+lo_sources_ver=3.6.3.1
# NOT in proper libreoffice-3-6 branch
-# use ./g checkout -b tag-libreoffice-3.6.2.2 libreoffice-3.6.2.2
+# use ./g checkout -b tag-libreoffice-3.6.3.1 libreoffice-3.6.3.1
GIT_TAG=libreoffice-$(lo_sources_ver)
-GIT_BRANCH=libreoffice-3-6-2
+GIT_BRANCH=libreoffice-3-6-3
endif
ifeq "$(USE_SOURCE_TARBALLS)" "y"
lo_sources_ver=$(shell cat $(CURDIR)/sources.ver | cut -d= -f2)
--
LibreOffice packaging repository
Reply to: