From 7b9dd3f0a3da3272c349ff693246affe79b39df92645403b7b2c83eff2ce17e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 7 Mar 2019 09:15:46 +0000 Subject: [PATCH 1/2] - 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 --- ...-segfault-in-libtest_sw_uwriter-test.patch | 42 +++++++++++++++++++ libreoffice.changes | 6 +++ libreoffice.spec | 2 + 3 files changed, 50 insertions(+) create mode 100644 0001-Fix-LTO-segfault-in-libtest_sw_uwriter-test.patch diff --git a/0001-Fix-LTO-segfault-in-libtest_sw_uwriter-test.patch b/0001-Fix-LTO-segfault-in-libtest_sw_uwriter-test.patch new file mode 100644 index 0000000..159f8bc --- /dev/null +++ b/0001-Fix-LTO-segfault-in-libtest_sw_uwriter-test.patch @@ -0,0 +1,42 @@ +From a1cd2b69ed7af0b9a07a099c38f7854b4b43d6be Mon Sep 17 00:00:00 2001 +From: marxin +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 + #include + ++#include ++ + using namespace sw; + + class ToxTextGeneratorTest : public CppUnit::TestFixture { + public: ++ virtual void setUp() override ++ { ++ SwGlobals::ensure(); ++ } ++ + void EmptyStringIsReturnedForPageNumberPlaceholderOfZeroItems(); + void OneAtSignIsReturnedForPageNumberPlaceholderOfOneItem(); + void TwoAtSignsAreReturnedForPageNumberPlaceholderOfOneItem(); +-- +2.21.0 + + \ No newline at end of file diff --git a/libreoffice.changes b/libreoffice.changes index 90fb6d5..24c11b9 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 7 09:13:48 UTC 2019 - Tomáš Chvátal + +- 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 diff --git a/libreoffice.spec b/libreoffice.spec index d6b4784..952ce79 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -103,6 +103,7 @@ Patch4: 0001-Speed-up-languagepack-installation.patch Patch5: old-boost.patch Patch6: kde5-32bit-build-fix.patch Patch7: libreoffice-postgresql.patch +Patch8: 0001-Fix-LTO-segfault-in-libtest_sw_uwriter-test.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff # 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 %patch6 -p1 %patch7 +%patch8 -p1 %patch990 -p1 %patch991 -p1 From d8d59a2f7f3fb305af2a48d65c179e484030c38deffddc81c3c2aaa7ee8caaa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 8 Mar 2019 09:24:57 +0000 Subject: [PATCH 2/2] - Require firebird as default driver for base if enabled OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=763 --- libreoffice.changes | 5 +++++ libreoffice.spec | 10 +++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/libreoffice.changes b/libreoffice.changes index 24c11b9..3c26fb1 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Mar 8 09:23:06 UTC 2019 - Tomáš Chvátal + +- Require firebird as default driver for base if enabled + ------------------------------------------------------------------- Thu Mar 7 09:13:48 UTC 2019 - Tomáš Chvátal diff --git a/libreoffice.spec b/libreoffice.spec index 952ce79..b068c86 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -408,14 +408,10 @@ Group: Productivity/Office/Suite Requires: %{name} = %{version} Requires: pentaho-reporting-flow-engine Obsoletes: %{name}-base-drivers-mysql -%if 0%{?suse_version} <= 1500 Supplements: %{name} -%endif -%ifarch %{ix86} -Requires: jre-32 >= 1.6 -%endif -%ifarch x86_64 aarch64 -Requires: jre-64 >= 1.6 +# default database connector +%if %{with firebird} +Requires: %{name}-base-drivers-firebird %endif %description base