From 9b90fb92d8f3fb22fb79982ccc098886074e40b7 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Fri, 13 May 2016 15:28:12 +0200 Subject: [PATCH] Resolves: rhbz#1325858 fix build on 64-bit secondary arches --- ...30-lower-the-barrier-for-inferior-sy.patch | 44 +++++++++++++++++++ libreoffice.spec | 2 + 2 files changed, 46 insertions(+) create mode 100644 0001-Resolves-tdf-99730-lower-the-barrier-for-inferior-sy.patch diff --git a/0001-Resolves-tdf-99730-lower-the-barrier-for-inferior-sy.patch b/0001-Resolves-tdf-99730-lower-the-barrier-for-inferior-sy.patch new file mode 100644 index 0000000..43c93b8 --- /dev/null +++ b/0001-Resolves-tdf-99730-lower-the-barrier-for-inferior-sy.patch @@ -0,0 +1,44 @@ +From b35b601d9e3b43eaedb8576b70d10b657f625d6e Mon Sep 17 00:00:00 2001 +From: Eike Rathke +Date: Fri, 13 May 2016 14:56:01 +0200 +Subject: [PATCH] Resolves: tdf#99730 lower the barrier for inferior systems, + cripple the test + +Change-Id: Ifdb9330a0614800831d2e0b673d975e6304738e5 +--- + sc/qa/unit/ucalc_formula.cxx | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx +index fa49e0d..fb63065 100644 +--- a/sc/qa/unit/ucalc_formula.cxx ++++ b/sc/qa/unit/ucalc_formula.cxx +@@ -6847,16 +6847,22 @@ void Test::testFuncMDETERM() + aFormulaBuffer[13] = static_cast( '0' + nSize ); + m_pDoc->SetString(aPos, aFormulaBuffer.toString()); + ++#if SAL_TYPES_SIZEOFPOINTER == 4 + // On crappy 32-bit targets, presumably without extended precision on + // interim results or optimization not catching it, this test fails + // when comparing to 0.0, so have a narrow error margin. See also + // commit message of 8140309d636d4a870875f2dd75ed3dfff2c0fbaf +-#if SAL_TYPES_SIZEOFPOINTER == 4 + CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Calculation of MDETERM incorrect for singular integer matrix", + 0.0, m_pDoc->GetValue(aPos), 1e-12); + #else +- CPPUNIT_ASSERT_EQUAL_MESSAGE("Calculation of MDETERM incorrect for singular integer matrix", +- 0.0, m_pDoc->GetValue(aPos)); ++ // Even on one (and only one) x86_64 target the result was ++ // 6.34413156928661e-17 instead of 0.0 (tdf#99730) so lower the bar to ++ // 10e-14. ++ // Then again on aarch64, ppc64* and s390x it also fails. ++ // Sigh.. why do we even test this? The original complaint in tdf#32834 ++ // was about -9.51712667007776E-016 ++ CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Calculation of MDETERM incorrect for singular integer matrix", ++ 0.0, m_pDoc->GetValue(aPos), 1e-14); + #endif + } + +-- +2.7.4 + diff --git a/libreoffice.spec b/libreoffice.spec index 8a8b8b7..50a6fd6 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -238,6 +238,7 @@ Patch8: 0001-rbhz-1326602-avoid-exp.-bg-bitmaps-from-deleted-slid.patch Patch9: 0001-tdf-99353-take-the-footgun-away-from-FilterCache.patch Patch10: 0001-only-set-cur.-page-once-when-removing-mult.-pages.patch Patch11: 0001-improve-perf.-of-VCL-event-dispatch-take-II.patch +Patch12: 0001-Resolves-tdf-99730-lower-the-barrier-for-inferior-sy.patch %if 0%{?fedora} Patch400: 0001-Update-mdds-to-1.2.0.-Note-that-the-API-version-is-a.patch @@ -2244,6 +2245,7 @@ done %changelog * Fri May 13 2016 David Tardon - 1:5.2.0.0-5.alpha1 - rebuild for mdds 1.2.0 +- Resolves: rhbz#1325858 fix build on 64-bit secondary arches * Tue May 10 2016 David Tardon - 1:5.2.0.0-4.alpha1 - Resolves: rhbz#1333899 recommended pkgs are omitted from default