From be5df14cdb695f09ff6efe462c3a8758ceccccec Mon Sep 17 00:00:00 2001 From: David Tardon Date: Mon, 3 Feb 2014 22:01:42 +0100 Subject: [PATCH] disable firebird test as a patch --- 0001-disable-firebird-unit-test.patch | 24 ++++++++++++++++++++++++ libreoffice.spec | 5 +---- 2 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 0001-disable-firebird-unit-test.patch diff --git a/0001-disable-firebird-unit-test.patch b/0001-disable-firebird-unit-test.patch new file mode 100644 index 0000000..fcea6d2 --- /dev/null +++ b/0001-disable-firebird-unit-test.patch @@ -0,0 +1,24 @@ +From 47c076d6bbe8b4d131351642c8ba796271be74fe Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Mon, 3 Feb 2014 21:52:11 +0100 +Subject: [PATCH] disable firebird unit test + +--- + dbaccess/Module_dbaccess.mk | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk +index b9d7d56..824f3f5 100644 +--- a/dbaccess/Module_dbaccess.mk ++++ b/dbaccess/Module_dbaccess.mk +@@ -36,7 +36,6 @@ $(eval $(call gb_Module_add_l10n_targets,dbaccess,\ + + ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE) + $(eval $(call gb_Module_add_check_targets,dbaccess,\ +- CppunitTest_dbaccess_firebird_test \ + )) + endif + +-- +1.8.4.2 + diff --git a/libreoffice.spec b/libreoffice.spec index b82bb70..c126619 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -276,6 +276,7 @@ Patch13: 0001-Resolves-rhbz-912529-Kerkis-SmallCaps-shown-instead-.patch Patch14: 0001-Resolves-rhbz-1038189-refresh-printer-list-when-prin.patch Patch15: 0001-Related-rhbz-1047871-conditional-formatting-doesn-t-.patch Patch16: 0001-Use-sal_Int32-to-satisfy-oox-helper-helper.hxx-s-con.patch +Patch17: 0001-disable-firebird-unit-test.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/libreoffice @@ -1049,10 +1050,6 @@ git commit -q -a -m 'add Red Hat colors to palette' # apply patches git am %{patches} -# fdo#72987 firebird unit test fails on big endian platforms -sed -i -e /firebird_test/d dbaccess/Module_dbaccess.mk -git commit -q -a -m 'disable firebird unit test' - # TODO: check this # these are horribly incomplete--empty translations and copied english # strings with spattering of translated strings