From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AE7F8158094 for ; Thu, 30 Jun 2022 13:33:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C8715E05AC; Thu, 30 Jun 2022 13:33:42 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9275DE05AC for ; Thu, 30 Jun 2022 13:33:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C00D23418D0 for ; Thu, 30 Jun 2022 13:33:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EB7D4516 for ; Thu, 30 Jun 2022 13:33:39 +0000 (UTC) From: "Florian Schmaus" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" Message-ID: <1656595989.3b49a6d09605a565ec329c53ee4e5adcc8c9c2b0.flow@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/, app-text/mupdf/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/mupdf/files/mupdf-1.20.0-lcms2.patch app-text/mupdf/mupdf-1.20.0.ebuild X-VCS-Directories: app-text/mupdf/files/ app-text/mupdf/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: 3b49a6d09605a565ec329c53ee4e5adcc8c9c2b0 X-VCS-Branch: master Date: Thu, 30 Jun 2022 13:33:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7023cef9-06ef-48b1-9c63-336f47f146ed X-Archives-Hash: d9b1bb6f65cdbbc3bc9d77c4ce389899 commit: 3b49a6d09605a565ec329c53ee4e5adcc8c9c2b0 Author: Florian Schmaus gentoo org> AuthorDate: Thu Jun 30 13:30:19 2022 +0000 Commit: Florian Schmaus gentoo 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 gentoo.org> Suggested-by: Sam James 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() {