- Add patch to fix bsc#1127857:
* 0001-Fix-LTO-segfault-in-libtest_sw_uwriter-test.patch OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=761
This commit is contained in:
parent
1302655a9c
commit
7b9dd3f0a3
42
0001-Fix-LTO-segfault-in-libtest_sw_uwriter-test.patch
Normal file
42
0001-Fix-LTO-segfault-in-libtest_sw_uwriter-test.patch
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
From a1cd2b69ed7af0b9a07a099c38f7854b4b43d6be Mon Sep 17 00:00:00 2001
|
||||||
|
From: marxin <mliska@suse.cz>
|
||||||
|
Date: Thu, 7 Mar 2019 09:28:14 +0100
|
||||||
|
Subject: [PATCH] Fix LTO segfault in libtest_sw_uwriter test.
|
||||||
|
|
||||||
|
The problem was seen here:
|
||||||
|
https://bugzilla.suse.com/show_bug.cgi?id=1127857.
|
||||||
|
|
||||||
|
One needs to call SwGlobals::ensure in order to initialize
|
||||||
|
SfxApplication via SfxApplication::SetModule(SfxToolsModule::Writer.
|
||||||
|
|
||||||
|
Change-Id: I3add24b56dc44a93ad81c1b52539da821f6244fc
|
||||||
|
---
|
||||||
|
sw/qa/core/test_ToxTextGenerator.cxx | 7 +++++++
|
||||||
|
1 file changed, 7 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/sw/qa/core/test_ToxTextGenerator.cxx b/sw/qa/core/test_ToxTextGenerator.cxx
|
||||||
|
index 25304a382ed3..ffe76233282e 100644
|
||||||
|
--- a/sw/qa/core/test_ToxTextGenerator.cxx
|
||||||
|
+++ b/sw/qa/core/test_ToxTextGenerator.cxx
|
||||||
|
@@ -22,10 +22,17 @@
|
||||||
|
#include <cppunit/extensions/HelperMacros.h>
|
||||||
|
#include <cppunit/plugin/TestPlugIn.h>
|
||||||
|
|
||||||
|
+#include <swdll.hxx>
|
||||||
|
+
|
||||||
|
using namespace sw;
|
||||||
|
|
||||||
|
class ToxTextGeneratorTest : public CppUnit::TestFixture {
|
||||||
|
public:
|
||||||
|
+ virtual void setUp() override
|
||||||
|
+ {
|
||||||
|
+ SwGlobals::ensure();
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
void EmptyStringIsReturnedForPageNumberPlaceholderOfZeroItems();
|
||||||
|
void OneAtSignIsReturnedForPageNumberPlaceholderOfOneItem();
|
||||||
|
void TwoAtSignsAreReturnedForPageNumberPlaceholderOfOneItem();
|
||||||
|
--
|
||||||
|
2.21.0
|
||||||
|
|
||||||
|
|
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Mar 7 09:13:48 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
|
||||||
|
|
||||||
|
- Add patch to fix bsc#1127857:
|
||||||
|
* 0001-Fix-LTO-segfault-in-libtest_sw_uwriter-test.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Mar 4 12:37:41 UTC 2019 - Reinhard Max <max@suse.com>
|
Mon Mar 4 12:37:41 UTC 2019 - Reinhard Max <max@suse.com>
|
||||||
|
|
||||||
|
@ -103,6 +103,7 @@ Patch4: 0001-Speed-up-languagepack-installation.patch
|
|||||||
Patch5: old-boost.patch
|
Patch5: old-boost.patch
|
||||||
Patch6: kde5-32bit-build-fix.patch
|
Patch6: kde5-32bit-build-fix.patch
|
||||||
Patch7: libreoffice-postgresql.patch
|
Patch7: libreoffice-postgresql.patch
|
||||||
|
Patch8: 0001-Fix-LTO-segfault-in-libtest_sw_uwriter-test.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
|
||||||
# save time by relying on rpm check rather than doing stupid find+grep
|
# save time by relying on rpm check rather than doing stupid find+grep
|
||||||
@ -973,6 +974,7 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
|
|||||||
%patch5 -p1
|
%patch5 -p1
|
||||||
%patch6 -p1
|
%patch6 -p1
|
||||||
%patch7
|
%patch7
|
||||||
|
%patch8 -p1
|
||||||
%patch990 -p1
|
%patch990 -p1
|
||||||
%patch991 -p1
|
%patch991 -p1
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user