pool/libreoffice
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Drop patch libreoffice-lto-failtest.patch as the problem was with

Browse Source 
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
This commit is contained in:
Tomáš Chvátal 2018-04-12 07:58:10 +00:00 committed by Git OBS Bridge
parent 21c9e05385
commit ba69032723
3 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libreoffice-lto-failtest.patch
View File

@ -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 \

6
libreoffice.changes
View File

@ -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 Wed Apr 11 07:47:35 UTC 2018 - tchvatal@suse.com

9
libreoffice.spec
View File

@ -101,8 +101,6 @@ Patch5: 0001-Use-PYTHON_FOR_BUILD-instead-of-calling-python-direc.patch
Patch7: bnc1039203.patch Patch7: bnc1039203.patch
# LO-L3: Slide with chart has some strange (too large?) elements (PPTX) # LO-L3: Slide with chart has some strange (too large?) elements (PPTX)
Patch8: bnc1060128.patch Patch8: bnc1060128.patch
# PATCH-FIX-UPSTREAM disable test failing with LTO
Patch9: libreoffice-lto-failtest.patch
# try to save space by using hardlinks # try to save space by using hardlinks
Patch990: install-with-hardlinks.diff Patch990: install-with-hardlinks.diff
BuildRequires: %{name}-share-linker BuildRequires: %{name}-share-linker
@ -897,7 +895,6 @@ Provides additional %{langname} translations and resources for %{project}. \
%patch5 -p1 %patch5 -p1
%patch7 -p1 %patch7 -p1
%patch8 -p1 %patch8 -p1
%patch9 -p1
%patch990 -p1 %patch990 -p1
# Disable some of the failing tests (some are random) # Disable some of the failing tests (some are random)
@ -933,9 +930,9 @@ lo_jobs="%{?jobs:%{jobs}}"
source %{_sysconfdir}/profile.d/alljava.sh source %{_sysconfdir}/profile.d/alljava.sh
# use RPM_OPT_FLAGS, ... # use RPM_OPT_FLAGS, ...
# remove big debugsymbols as we simply consume too much space # 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'`" 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" CFLAGS="$ARCH_FLAGS -flifetime-dse=1"
CXXFLAGS="$ARCH_FLAGS" CXXFLAGS="$ARCH_FLAGS -flifetime-dse=1"
export ARCH_FLAGS CFLAGS CXXFLAGS export ARCH_FLAGS CFLAGS CXXFLAGS
# Colada does not have .pc file and configure creator was really lazy # Colada does not have .pc file and configure creator was really lazy