commit: 51c1d02bab715ea8448c0b5e1e29b0f2def85259 Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com> AuthorDate: Fri Oct 27 22:00:24 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Oct 29 03:34:24 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51c1d02b
app-text/podofo: backport patch to fix tests with optimizations This allows us to drop the cautious use of -ffp-contract=off, since upstream has analyzed the issue and determined that it's a matter of tolerance, not an issue in the library itself, and rewritten the test a bit to not trip over this. No revbump needed. The library is the same both before and after this change, modulo some allowed compiler optimizations. https://github.com/podofo/podofo/issues/103#issuecomment-1783528312 Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/33572 Signed-off-by: Sam James <sam <AT> gentoo.org> ...st-Fixed-test-under-linux-when-compiled-w.patch | 35 ++++++++++++++++++++++ app-text/podofo/podofo-0.10.1-r1.ebuild | 12 ++++---- 2 files changed, 42 insertions(+), 5 deletions(-) diff --git a/app-text/podofo/files/0001-FIX-ColorTest-Fixed-test-under-linux-when-compiled-w.patch b/app-text/podofo/files/0001-FIX-ColorTest-Fixed-test-under-linux-when-compiled-w.patch new file mode 100644 index 000000000000..696f320134f0 --- /dev/null +++ b/app-text/podofo/files/0001-FIX-ColorTest-Fixed-test-under-linux-when-compiled-w.patch @@ -0,0 +1,35 @@ +From da91101b7afafa958669e11d0cabaeee3ff50b39 Mon Sep 17 00:00:00 2001 +From: Francesco Pretto <[email protected]> +Date: Fri, 27 Oct 2023 23:41:22 +0200 +Subject: [PATCH] [FIX] ColorTest: Fixed test under linux when compiled with + -march=x86-64-v3 + +Floating point contractions may cause some level of non determinsm when comparing the result of fp operations . See +https://stackoverflow.com/questions/62353629/does-the-same-floating-point-calculation-producing-different-results-when-perfor + +Fixes #103 +--- + test/unit/ColorTest.cpp | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/test/unit/ColorTest.cpp b/test/unit/ColorTest.cpp +index 419052a7..81f99c5b 100644 +--- a/test/unit/ColorTest.cpp ++++ b/test/unit/ColorTest.cpp +@@ -426,7 +426,12 @@ TEST_CASE("testCMYKConstructor") + double dGreen = M_VALUE * (1.0 - B_VALUE) + B_VALUE; + double dBlue = Y_VALUE * (1.0 - B_VALUE) + B_VALUE; + +- REQUIRE(color.ConvertToRGB() == PdfColor(1.0 - dRed, 1.0 - dGreen, 1.0 - dBlue)); ++ auto rgb1 = color.ConvertToRGB(); ++ PdfColor rgb2(1.0 - dRed, 1.0 - dGreen, 1.0 - dBlue); ++ ++ ASSERT_EQUAL(rgb1.GetRed(), rgb2.GetRed()); ++ ASSERT_EQUAL(rgb1.GetGreen(), rgb2.GetGreen()); ++ ASSERT_EQUAL(rgb1.GetBlue(), rgb2.GetBlue()); + } + + REQUIRE(color.ConvertToCMYK() == PdfColor(C_VALUE, M_VALUE, Y_VALUE, B_VALUE)); +-- +2.41.0 + diff --git a/app-text/podofo/podofo-0.10.1-r1.ebuild b/app-text/podofo/podofo-0.10.1-r1.ebuild index 01677dd282b6..9809f617298e 100644 --- a/app-text/podofo/podofo-0.10.1-r1.ebuild +++ b/app-text/podofo/podofo-0.10.1-r1.ebuild @@ -37,6 +37,13 @@ BDEPEND=" test? ( fontconfig? ( media-fonts/liberation-fonts ) ) " +PATCHES=( + # Dome optimizations cause testsuite failures due to floating point + # contraction. Fixed upstream by adding tolerance to the test itself: + # https://github.com/podofo/podofo/issues/103 + "${FILESDIR}"/0001-FIX-ColorTest-Fixed-test-under-linux-when-compiled-w.patch +) + src_prepare() { cmake_src_prepare if use test; then @@ -56,11 +63,6 @@ src_configure() { $(cmake_use_find_package fontconfig Fontconfig) ) - # some optimizations cause testsuite failures which may indicate - # unsoundness with contraction. Be cautious for now. Reported - # upstream as https://github.com/podofo/podofo/issues/103 - append-cxxflags $(test-flags-CXX -ffp-contract=off) - cmake_src_configure }
