From a15292da4e754d0ca078558499debe5dbca19f5b55130dbaacdccb07fb3f3d26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 9 Apr 2018 08:31:08 +0000 Subject: [PATCH] - Add patch to disable test failing with LTO: * libreoffice-lto-failtest.patch OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=632 --- libreoffice-lto-failtest.patch | 20 ++++++++++++++++++++ libreoffice.changes | 6 ++++++ libreoffice.spec | 3 +++ 3 files changed, 29 insertions(+) create mode 100644 libreoffice-lto-failtest.patch diff --git a/libreoffice-lto-failtest.patch b/libreoffice-lto-failtest.patch new file mode 100644 index 0000000..eb8d967 --- /dev/null +++ b/libreoffice-lto-failtest.patch @@ -0,0 +1,20 @@ +diff --git a/dictionaries b/dictionaries +index c8e86617a771..f2a8f86e8b90 160000 +--- a/dictionaries ++++ b/dictionaries +@@ -1 +1 @@ +-Subproject commit c8e86617a771c53813a86d64bd3467aa75c63307 ++Subproject commit f2a8f86e8b9066b244a65b5944a4d6d4ef24b04c-dirty +diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk +index 8fb2836f70e6..9036e8940d94 100644 +--- a/sw/Module_sw.mk ++++ b/sw/Module_sw.mk +@@ -53,8 +53,6 @@ $(eval $(call gb_Module_add_check_targets,sw,\ + )) + + $(eval $(call gb_Module_add_slowcheck_targets,sw,\ +- $(if $(and $(filter $(COM),MSC),$(MERGELIBS)),, \ +- CppunitTest_sw_uwriter) \ + CppunitTest_sw_docbookexport \ + CppunitTest_sw_fodfexport \ + CppunitTest_sw_htmlexport \ diff --git a/libreoffice.changes b/libreoffice.changes index 7aa7c1e..0242637 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Apr 9 08:30:30 UTC 2018 - tchvatal@suse.com + +- Add patch to disable test failing with LTO: + * libreoffice-lto-failtest.patch + ------------------------------------------------------------------- Fri Apr 6 14:27:40 UTC 2018 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 80cf234..bc33ed9 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -97,6 +97,8 @@ Patch5: 0001-Use-PYTHON_FOR_BUILD-instead-of-calling-python-direc.patch Patch7: bnc1039203.patch # LO-L3: Slide with chart has some strange (too large?) elements (PPTX) Patch8: bnc1060128.patch +# PATCH-FIX-UPSTREAM disable test failing with LTO +Patch9: libreoffice-lto-failtest.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff BuildRequires: %{name}-share-linker @@ -884,6 +886,7 @@ Provides additional %{langname} translations and resources for %{project}. \ %patch5 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 %patch990 -p1 # Disable some of the failing tests (some are random)