From ba69032723e68b95f144e20e77af8ad5b277b9e45fa4567b93b922ab91905903 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Thu, 12 Apr 2018 07:58:10 +0000
Subject: [PATCH] - Drop patch libreoffice-lto-failtest.patch as the problem
 was with   memcpy in wrong phases, fixed by cflag -flifetime-dse=1

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=640
---
 libreoffice-lto-failtest.patch | 13 -------------
 libreoffice.changes            |  6 ++++++
 libreoffice.spec               |  9 +++------
 3 files changed, 9 insertions(+), 19 deletions(-)
 delete mode 100644 libreoffice-lto-failtest.patch

diff --git a/libreoffice-lto-failtest.patch b/libreoffice-lto-failtest.patch
deleted file mode 100644
index 56a88c6..0000000
--- a/libreoffice-lto-failtest.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: libreoffice-6.0.3.2/sw/Module_sw.mk
-===================================================================
---- libreoffice-6.0.3.2.orig/sw/Module_sw.mk
-+++ libreoffice-6.0.3.2/sw/Module_sw.mk
-@@ -49,8 +49,6 @@ $(eval $(call gb_Module_add_targets,sw,\
- endif
- 
- $(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 df08916..065f870 100644
--- a/libreoffice.changes
+++ b/libreoffice.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Apr 12 07:57:17 UTC 2018 - tchvatal@suse.com
+
+- Drop patch libreoffice-lto-failtest.patch as the problem was with
+  memcpy in wrong phases, fixed by cflag -flifetime-dse=1
+
 -------------------------------------------------------------------
 Wed Apr 11 07:47:35 UTC 2018 - tchvatal@suse.com
 
diff --git a/libreoffice.spec b/libreoffice.spec
index 24dfca6..04f5031 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -101,8 +101,6 @@ 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
@@ -897,7 +895,6 @@ 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)
@@ -933,9 +930,9 @@ lo_jobs="%{?jobs:%{jobs}}"
 source %{_sysconfdir}/profile.d/alljava.sh
 # use RPM_OPT_FLAGS, ...
 # remove big debugsymbols as we simply consume too much space
-ARCH_FLAGS="`echo %{optflags} | sed -e 's/^-g /-g1 /g' -e 's/ -g / -g1 /g' -e 's/ -g$/ -g1/g'`"
-CFLAGS="$ARCH_FLAGS"
-CXXFLAGS="$ARCH_FLAGS"
+ARCH_FLAGS="`echo %{optflags} -flifetime-dse=1 | sed -e 's/^-g /-g1 /g' -e 's/ -g / -g1 /g' -e 's/ -g$/ -g1/g'`"
+CFLAGS="$ARCH_FLAGS -flifetime-dse=1"
+CXXFLAGS="$ARCH_FLAGS -flifetime-dse=1"
 export ARCH_FLAGS CFLAGS CXXFLAGS
 
 # Colada does not have .pc file and configure creator was really lazy