[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.5.4-5-112-g78c2f91
The following commit has been merged in the debian-experimental-3.6 branch:
commit a6ddc4389441a5feffd87a8c33ddd9c0deca2b13
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Wed Jun 27 13:12:25 2012 +0200
fdo#51324: disable CXX0X ABI for incompatibility
diff --git a/changelog b/changelog
index f33f3ba..f41f424 100644
--- a/changelog
+++ b/changelog
@@ -1,5 +1,6 @@
libreoffice (1:3.6.0~beta2-1) UNRELEASED; urgency=low
+ [ Rene Engelhard ]
* new upstream beta release
- fixes splashscreen location in multi-monitor setups
(closes: #657444, #431473)
@@ -29,6 +30,9 @@ libreoffice (1:3.6.0~beta2-1) UNRELEASED; urgency=low
their respective places
* debian/uno-libs3.symbols: update
+ [Björn Michaelsen]
+ * force disable HAVE_CXX0X for ABI incompatibilty
+
-- Rene Engelhard <rene@debian.org> Thu, 03 May 2012 13:44:05 +0200
libreoffice (1:3.5.4-5) unstable; urgency=low
diff --git a/patches/disable-xmloff-subsequentchecks-for-fdo-51324-for-no.diff b/patches/disable-xmloff-subsequentchecks-for-fdo-51324-for-no.diff
deleted file mode 100644
index 01e9165..0000000
--- a/patches/disable-xmloff-subsequentchecks-for-fdo-51324-for-no.diff
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/configure.in-old 2012-06-24 17:26:46.094370935 +0200
-+++ b/configure.in 2012-06-24 17:27:17.306525701 +0200
-@@ -2599,6 +2599,7 @@
- AC_MSG_RESULT([gcc $_gcc_version])
- fi
- fi
-+AC_SUBST(GCCVER)
-
- dnl ===================================================================
- dnl Is GCC actually Clang?
---- a/config_host.mk.in-old 2012-06-24 17:28:01.030742514 +0200
-+++ b/config_host.mk.in 2012-06-24 17:28:21.430843669 +0200
-@@ -49,6 +49,7 @@
- export CLUCENE_LIBS=@CLUCENE_LIBS@
- export COM=@COM@
- export COM_GCC_IS_CLANG=@COM_GCC_IS_CLANG@
-+export GCCVER=@GCCVER@
- export COMEX=@COMEX@
- export COMMONS_CODEC_JAR=@COMMONS_CODEC_JAR@
- export COMMONS_HTTPCLIENT_JAR=@COMMONS_HTTPCLIENT_JAR@
---- a/xmloff/Module_xmloff.mk-old 2012-06-24 17:32:08.911971688 +0200
-+++ b/xmloff/Module_xmloff.mk 2012-06-24 17:32:20.352028415 +0200
-@@ -35,9 +35,11 @@
- Package_inc \
- ))
-
-+ifneq "$(GCCVER)" "40700"
- $(eval $(call gb_Module_add_subsequentcheck_targets,xmloff,\
- JunitTest_xmloff_unoapi \
- ))
-+endif
-
- #todo: map file
- #todo: xmlkywd.lib - built, but never used?!
diff --git a/patches/series b/patches/series
index 043ec00..7fc0942 100644
--- a/patches/series
+++ b/patches/series
@@ -27,5 +27,5 @@ pyuno-py3-module.diff
ignore-sc_cellrangesbase-fails.diff
build-dont-run-checks.diff
#lp-904212-add-missing-mimetypes-to-impress.desktop.diff
-disable-xmloff-subsequentchecks-for-fdo-51324-for-no.diff
disable-broken-sdext_pdfimport-cppunit-test-for-now.diff
+trying-to-force-CXX0X-off-for-ABI-incompatibility.diff
diff --git a/patches/trying-to-force-CXX0X-off-for-ABI-incompatibility.diff b/patches/trying-to-force-CXX0X-off-for-ABI-incompatibility.diff
new file mode 100644
index 0000000..1fa52e0
--- /dev/null
+++ b/patches/trying-to-force-CXX0X-off-for-ABI-incompatibility.diff
@@ -0,0 +1,28 @@
+From df542d5a4a2bac3d279977682cd629ec964e002b Mon Sep 17 00:00:00 2001
+From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
+Date: Wed, 27 Jun 2012 13:07:44 +0200
+Subject: [PATCH] trying to force CXX0X off for ABI incompatibility
+
+Change-Id: I3f20252bfd3f3e4c8790dba322c6e50c496018bf
+---
+ configure.in | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/configure.in b/configure.in
+index 9cf0baa..fc5bfc7 100644
+--- a/configure.in
++++ b/configure.in
+@@ -4752,6 +4752,10 @@ return !(i != 0 && j != 0);
+ fi
+ fi
+
++dnl force CXX0X features off as they are ABI incompatible
++dnl see https://lists.ubuntu.com/archives/ubuntu-devel/2012-June/035310.html
++HAVE_CXX0X=
++
+ AC_SUBST(HAVE_CXX0X)
+ AC_SUBST(HAVE_GCC_NO_LONG_DOUBLE)
+ AC_SUBST(HAVE_GCC_AVX)
+--
+1.7.9.5
+
--
LibreOffice packaging repository
Reply to: