From 499094d747c6c07dce89c8c683ebad09608acda0 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Wed, 23 Aug 2023 08:47:22 +0200 Subject: [PATCH] Patch to fix FTB in ppc64le --- libreoffice.spec | 3 +++ lo-7.6-ppc64le-tests.patch | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 lo-7.6-ppc64le-tests.patch diff --git a/libreoffice.spec b/libreoffice.spec index 8ebbba0..c1cc7f7 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -277,6 +277,8 @@ Patch8: 0001-Only-pass-I.-arguments-to-g-ir-scanner-by-using-pkg-.patch Patch9: 0001-Adapt-test-code-to-cURL-8.2.0.patch Patch10: 0002-Fix-heap-use-after-free.patch # not upstreamed +# fix FTB in ppc64le from sharkcz +Patch11: lo-7.6-ppc64le-tests.patch Patch500: 0001-disable-libe-book-support.patch %global instdir %{_libdir} @@ -2257,6 +2259,7 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : %changelog * Wed Aug 23 2023 Mattia Verga - 1:7.6.0.3-3 - Disable another failing test under s390x +- Add patch to fix FTB under ppc64le * Tue Aug 15 2023 Mattia Verga - 1:7.6.0.3-2 - Disable unreliable test under s390x diff --git a/lo-7.6-ppc64le-tests.patch b/lo-7.6-ppc64le-tests.patch new file mode 100644 index 0000000..4732451 --- /dev/null +++ b/lo-7.6-ppc64le-tests.patch @@ -0,0 +1,19 @@ +diff -up libreoffice-7.6.0.3/testtools/source/bridgetest/bridgetest.cxx.orig libreoffice-7.6.0.3/testtools/source/bridgetest/bridgetest.cxx +--- libreoffice-7.6.0.3/testtools/source/bridgetest/bridgetest.cxx.orig 2023-08-21 13:15:31.738062821 +0200 ++++ libreoffice-7.6.0.3/testtools/source/bridgetest/bridgetest.cxx 2023-08-21 13:15:56.607246816 +0200 +@@ -469,6 +469,7 @@ static bool performTest( + equals(aData, aSV2ret) && equals(aData, aRet2), + "getValues2 test"); + } ++#if 0 + { + TwoFloats aIn(1.1f, 2.2f); + TwoFloats aOut = xLBT->echoTwoFloats(aIn); +@@ -479,6 +480,7 @@ static bool performTest( + FourFloats aOut = xLBT->echoFourFloats(aIn); + bRet = check( memcmp(&aIn, &aOut, sizeof(FourFloats)) == 0, "four floats struct test" ) && bRet; + } ++#endif + { + MixedFloatAndInteger aIn(7.7f, 8); + MixedFloatAndInteger aOut = xLBT->echoMixedFloatAndInteger(aIn);