summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Schmaus <flow@gentoo.org>2022-06-30 15:30:19 +0200
committerFlorian Schmaus <flow@gentoo.org>2022-06-30 15:33:09 +0200
commit3b49a6d09605a565ec329c53ee4e5adcc8c9c2b0 (patch)
treedcdc6a841f105d63364fe16d94156e13162c65a5 /app-text
parentmedia-video/vdr: add a missing BDEPEND on 2.2.0-r7 (diff)
downloadgentoo-3b49a6d09605a565ec329c53ee4e5adcc8c9c2b0.tar.gz
gentoo-3b49a6d09605a565ec329c53ee4e5adcc8c9c2b0.tar.bz2
gentoo-3b49a6d09605a565ec329c53ee4e5adcc8c9c2b0.zip
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@gentoo.org> Suggested-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'app-text')
-rw-r--r--app-text/mupdf/files/mupdf-1.20.0-lcms2.patch20
-rw-r--r--app-text/mupdf/mupdf-1.20.0.ebuild1
2 files changed, 0 insertions, 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() {