[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.5.4-5-104-g09006f1
The following commit has been merged in the debian-experimental-3.6 branch:
commit 09006f1d9a05583dff25117b5e530f1b0e2c4ef0
Author: Rene Engelhard <rene@debian.org>
Date: Sun Jun 24 17:44:08 2012 +0200
add proper gcc version check to disable-xmloff-subsequentchecks-for-fdo-51324-for-no.diff
diff --git a/patches/disable-xmloff-subsequentchecks-for-fdo-51324-for-no.diff b/patches/disable-xmloff-subsequentchecks-for-fdo-51324-for-no.diff
index 0a0dd99..c43f839 100644
--- a/patches/disable-xmloff-subsequentchecks-for-fdo-51324-for-no.diff
+++ b/patches/disable-xmloff-subsequentchecks-for-fdo-51324-for-no.diff
@@ -1,27 +1,34 @@
-From cf8640ded9612f65789931e99d2ad98b1e2b940a Mon Sep 17 00:00:00 2001
-From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
-Date: Fri, 22 Jun 2012 12:05:34 +0200
-Subject: [PATCH] disable xmloff subsequentchecks for fdo#51324 for now
-
-Change-Id: Ie59810c1c6ff3523631a4fc75de48d09c7f461b3
----
- xmloff/Module_xmloff.mk | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/xmloff/Module_xmloff.mk b/xmloff/Module_xmloff.mk
-index db84838..bc5f90f 100644
---- a/xmloff/Module_xmloff.mk
-+++ b/xmloff/Module_xmloff.mk
-@@ -35,7 +35,8 @@ $(eval $(call gb_Module_add_targets,xmloff,\
+--- 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 \
))
--$(eval $(call gb_Module_add_subsequentcheck_targets,xmloff,\
-+# fdo#51324
-+#$(eval $(call gb_Module_add_subsequentcheck_targets,xmloff,\
++ifneq "$(GCCVER)" "040700"
+ $(eval $(call gb_Module_add_subsequentcheck_targets,xmloff,\
JunitTest_xmloff_unoapi \
))
++endif
---
-1.7.9.5
-
+ #todo: map file
+ #todo: xmlkywd.lib - built, but never used?!
--
LibreOffice packaging repository
Reply to: