gentoo auto-resync : 29:10:2023 - 09:35:42

3 files changed, 47 insertions, 7 deletions

diff --git a/app-text/podofo/Manifest b/app-text/podofo/Manifest
index bf8e03bc7241..ccfd2a7c1a1e 100644
--- a/app-text/podofo/Manifest
+++ b/app-text/podofo/Manifest
@@ -1,8 +1,9 @@
+AUX 0001-FIX-ColorTest-Fixed-test-under-linux-when-compiled-w.patch 1476 BLAKE2B b4f014bc690768a97c6e2d2d21f24a2539a2b7429aaa3a778987226610929751226f87829d15a843158cdee243dee27dbc98a538f3150fa77e950121d68263c8 SHA512 513848767ab848f7e913c36cc9d4fe8f1fd157c4ff86df1eba97524cf88d6bee775ab4ae39bece86dc6d38898e3a4ef5900ba842603b88517424986ec04585cf
 AUX podofo-0.9.6_p20190928-cmake_lua_version.patch 522 BLAKE2B b911b2ab2b35f5eccb58b32e575a775fe43cac1576831bb4e47d10c666a1e7040d8c01c865ee63ef1c3ff3c1a1feb2059dc25c71924b61995302dad21c32c868 SHA512 953f41b44468918aa96af42ecf3de8e3dd0d7721ed7c6283d8a6d44941caf70d9ef63d7d59ee1d94081fdc91a915ba8770bc335f8af5d60b24cd1f6c04698f6f
 DIST podofo-0.10.1-test-resources.tar.gz 4228392 BLAKE2B 95526d145a18976d5b9f782dfcac15e17bc4ef20a22ca5892905a19193ad88c2855cb8551886754c334f6ca666b9b74fe9a3b5c89ce774fa24e579f563be57c6 SHA512 4cb33e5a6050ef745cda42b7fdf53fee9f45d4d488555b79c9cdd6680c5265065aac92ad3d72ea0b75eee9a73098f920a3dd61b7728db6d2171888cbc83c6d55
 DIST podofo-0.10.1.tar.gz 1690279 BLAKE2B 0fc161c467ffce07c1b2cb1a2124ffddc6c18189b5c8b31dc1212921637601a667cd2b0d6f1269214bd0fe47e8853367283e3053813d45aed01589f0dfb1c29b SHA512 cbbd183cd940345f9b077b7da140414c27badc70fdf754e2f3c6f0e51c25072de46d7fe312b014c0eab359bd03e9dca0283260db00f079c5014e268d5c5ef5c9
 DIST podofo-0.9.8-bug-888463.patch 1269 BLAKE2B 632e9326112eecb484a15a532fc218263eab081acaf2af2bc1cc3d1020347846ce9ce82147d9d2fa9b42d690270b01b68eaf621cfbbdcfce041b8d651754c08e SHA512 9b0764d8697fad57107647a620f6dbe5d8025628faf02b1d6839d3f975216b16a58ccc115f58809aa4e31fb6b4b487b1490eedf468ddc8b90e494f68d8e50dc6
 DIST podofo-0.9.8.tar.gz 1012918 BLAKE2B 5d343128bcf06dbb8ef1d70b32f580a800726c33e4c14c86a6c7df0278a34b2d96cba7975c00d32e792596ca3cb54fa66fee262b49a240cd52e31646947b943e SHA512 b220322114450f1656c73d325f5172bc4cec0b1913e98b4eb2455f8ed7394bcaa47438d41003c9678937ef44d411e135431ddd6784f83d3663337d471baa02b1
-EBUILD podofo-0.10.1-r1.ebuild 2271 BLAKE2B 88adc6154ecfd642475e0b77ad9ccbf2f3c13d617ff3679ea32b95c435c78fedd0da80341f620f9b655b14995e26a42eaa2b3083db4d3b40065c17a3f2b095d5 SHA512 9a3ad3f91f9ce0b0c0716360fb242b51ab6789c45d617de51d28a2cd528e5e26056978cf38ea2794ae607aadd8b78213c01c9c782254f1481501e444c37517b7
+EBUILD podofo-0.10.1-r1.ebuild 2295 BLAKE2B 728502897366ad068ac4c150ce3891b0528049c2e90b97167dec0888c1472dd62dee466cce680cab9732462145506e6d5099575695fb4a1ebc47fcc94ade19b8 SHA512 945e3d2b351e5d8a3495054931ed668282f9c80eec7d7510e48c1ff1f17f0883ddb56d93a49fdc4a8c84bd07a06bf59d52cee1b095bae12982a6ad3fca62a595
 EBUILD podofo-0.9.8-r1.ebuild 3304 BLAKE2B 9914548743904ca027878a0c8584786e427700744bd6e56bc8f4c4b21de837a85d66cf74c56072b7ae39a918202a2f2955c521439f8aa4699327229d430026c1 SHA512 dd67345ef90972668c896cbb81f3a8bb31289da2a008f8b2b896d9f80cc5c0bb2df24348cbc9a92e753a072f7630ee474567194eb723990186d248667cbd8470
 MISC metadata.xml 485 BLAKE2B 80da5271943f738cfbc6076d00e93ea404208f8d24604beab0f2cfd339efc535e1b217f87f9d2a87908db0c9c1b77759b66355d5c0a3f61aef128b44990c9969 SHA512 4ea145783ae9f42702dcf2936d2f5bed576f0222675f481d7a2118d44ab7eecfa12d889707942a5c60482f37e1e36e2476657fd401d523022cc1b2d9c76e56ca
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..45edd8454dfb
--- /dev/null
+++ b/app-text/podofo/files/0001-FIX-ColorTest-Fixed-test-under-linux-when-compiled-w.patch
@@ -0,0 +1,37 @@
+https://github.com/podofo/podofo/commit/da91101b7afafa958669e11d0cabaeee3ff50b39
+
+From da91101b7afafa958669e11d0cabaeee3ff50b39 Mon Sep 17 00:00:00 2001
+From: Francesco Pretto <ceztko@gmail.com>
+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..03852080e471 100644
--- a/app-text/podofo/podofo-0.10.1-r1.ebuild
+++ b/app-text/podofo/podofo-0.10.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake flag-o-matic
+inherit cmake
 
 DESCRIPTION="PoDoFo is a C++ library to work with the PDF file format"
 HOMEPAGE="https://github.com/podofo/podofo"
@@ -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
 }