[SCM] LibreOffice packaging repository branch, ubuntu-quantal-3.6, updated. libreoffice_3.5.4-5-155-gb46c0cf
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit db5a50a1d94f9404a020cada593ed063bbb3be43
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Thu Jun 28 09:12:56 2012 +0200
reenable disable-xmloff-subsequentchecks-for-fdo-51324-for-no.diff
while checking for gcc version 4.7 is not enough in theory, in practice it does
the job. In theory we would need to check if any of the dependencies:
- where compiled with gcc 4.7 or later
- with --std=c++0x, --std=gnu++0x, --std=c++11 or --std=gnu++11
as that is enough to trigger the bug, even when compiling our own stuff with gcc-4.6.
However, there is no way to check that quickly.
diff --git a/changelog b/changelog
index ad3ef4d..2db1c52 100644
--- a/changelog
+++ b/changelog
@@ -1,8 +1,10 @@
libreoffice (1:3.6.0~beta2-0ubuntu1~ppa3) quantal; urgency=low
* force disable HAVE_CXX0X for ABI incompatibilty
+ * keep xmloff unoapi disabled on gcc-4.7 builds for now, even though we
+ ourselves should be good
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Wed, 27 Jun 2012 13:10:19 +0200
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Thu, 28 Jun 2012 09:23:08 +0200
libreoffice (1:3.6.0~beta2-0ubuntu1~ppa2) quantal; 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
new file mode 100644
index 0000000..01e9165
--- /dev/null
+++ b/patches/disable-xmloff-subsequentchecks-for-fdo-51324-for-no.diff
@@ -0,0 +1,34 @@
+--- 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 a1e8fe5..a2ef8a7 100644
--- a/patches/series
+++ b/patches/series
@@ -30,3 +30,4 @@ disable-broken-sdext_pdfimport-cppunit-test-for-now.diff
lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff
remove-broken-mysqlcon-version-check.diff
trying-to-force-CXX0X-off-for-ABI-incompatibility.diff
+disable-xmloff-subsequentchecks-for-fdo-51324-for-no.diff
--
LibreOffice packaging repository
Reply to: