[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/, app-text/mupdf/files/

["Florian Schmaus" <flow@gentoo.org>]

commit:     3b49a6d09605a565ec329c53ee4e5adcc8c9c2b0
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 30 13:30:19 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 13:33:09 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b49a6d0

app-text/mupdf: Revert "fix strict-aliasing violations"

Sam pointed out that the patch my be wrong (although correct from a
strict aliasing view).

This reverts commit e69ffe486e072430217eb921a1886f93d8d74534.

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
Suggested-by: Sam James <sam <AT> gentoo.org>

 app-text/mupdf/files/mupdf-1.20.0-lcms2.patch | 20 --------------------
 app-text/mupdf/mupdf-1.20.0.ebuild            |  1 -
 2 files changed, 21 deletions(-)

diff --git a/app-text/mupdf/files/mupdf-1.20.0-lcms2.patch b/app-text/mupdf/files/mupdf-1.20.0-lcms2.patch
deleted file mode 100644
index a975d42d15e9..000000000000
--- a/app-text/mupdf/files/mupdf-1.20.0-lcms2.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/thirdparty/lcms2/src/cmsplugin.c
-+++ b/thirdparty/lcms2/src/cmsplugin.c
-@@ -177,7 +177,7 @@ cmsBool CMSEXPORT  _cmsReadFloat32Number(cmsContext ContextID, cmsIOHANDLER* io,
-     if (n != NULL) {
- 
-         tmp = _cmsAdjustEndianess32(tmp);
--        *n = *(cmsFloat32Number*)(void*)&tmp;
-+        *n = (cmsFloat32Number)tmp;
- 
-         // Safeguard which covers against absurd values
-         if (*n > 1E+20 || *n < -1E+20) return FALSE;
-@@ -308,7 +308,7 @@ cmsBool CMSEXPORT  _cmsWriteFloat32Number(cmsContext ContextID, cmsIOHANDLER* io
- 
-     _cmsAssert(io != NULL);
- 
--    tmp = *(cmsUInt32Number*) (void*) &n;
-+    tmp = (cmsUInt32Number)n;
-     tmp = _cmsAdjustEndianess32(tmp);
-     if (io -> Write(ContextID, io, sizeof(cmsUInt32Number), &tmp) != 1)
-             return FALSE;

diff --git a/app-text/mupdf/mupdf-1.20.0.ebuild b/app-text/mupdf/mupdf-1.20.0.ebuild
index 216bbfaa79e7..3d7f8f3e2946 100644
--- a/app-text/mupdf/mupdf-1.20.0.ebuild
+++ b/app-text/mupdf/mupdf-1.20.0.ebuild
@@ -51,7 +51,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.15-openssl-x11.patch
 	# General cross fixes from Debian (refreshed)
 	"${FILESDIR}"/${PN}-1.19.0-cross-fixes.patch
-	"${FILESDIR}"/${P}-lcms2.patch
 )
 
 src_prepare() {