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 CB46A158094 for ; Sat, 1 Oct 2022 06:56:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E1E7FE09D1; Sat, 1 Oct 2022 06:56:29 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C9E7FE09D1 for ; Sat, 1 Oct 2022 06:56:29 +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 D59A8340E23 for ; Sat, 1 Oct 2022 06:56:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 05C1F523 for ; Sat, 1 Oct 2022 06:56:27 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1664607123.f7d3daf96af5d450b3f983df77129c5aeac3c376.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/poppler-data/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/poppler-data/Manifest app-text/poppler-data/poppler-data-0.4.11-r1.ebuild X-VCS-Directories: app-text/poppler-data/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: f7d3daf96af5d450b3f983df77129c5aeac3c376 X-VCS-Branch: master Date: Sat, 1 Oct 2022 06:56:27 +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: f2e89f5c-bb54-4ed9-add9-31328137e24f X-Archives-Hash: 65f09ba58ee1f540bc8d87ae7fadea31 commit: f7d3daf96af5d450b3f983df77129c5aeac3c376 Author: Sam James gentoo org> AuthorDate: Sat Oct 1 06:49:48 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sat Oct 1 06:52:03 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7d3daf9 app-text/poppler-data: add additional cMaps files needed by ghostscript Quoting John from the Bug; >Ghostscript's official binary is built with bundled CMaps; on Gentoo, these are unbundled >in favor of those provided by app-text/poppler-data. Ghostscript's CMaps include 3 files >missing from poppler-data: Identity-H, Identity-V, and Identity-UTF16-H (CMap >resources for the special-purpose Adobe Identity-0 ROS), and the lack of these files is causing this issue. > >Fedora and Arch avoid this problem by using GS-bundled CMaps, while Debian >(and older versions of Fedora) relies on CMaps from poppler-data (like Gentoo does) >and includes the missing files in their poppler-data package, installing them to >/usr/share/poppler/cMap. (According to Debian, upstream poppler-data refuses to include them.) > >Two of these files are provided by Adobe Type Tools: >https://github.com/adobe-type-tools/cmap-resources/tree/master/Adobe-Identity-0/CMap > >and the third is from Artifex themselves: >http://git.ghostscript.com/?p=ghostpdl.git;a=blob;f=Resource/CMap/Identity-UTF16-H;hb=HEAD > >You can copy these 3 files to /usr/share/poppler/cMaps for a quick-and-dirty verification that >they resolve the issue; by doing so, I was able to produce a match for gs-fail-good.jpg and >pass the WeasyPrint test suite using ghostscript-gpl-9.56.1 (and 10.0). Including >these files with poppler-data seems like the best approach. (As noted in >Ghostscript's LICENSE file, Identity-UTF16-H is licensed under AGPL-3+.) Bug: https://bugs.gentoo.org/844115 Thanks-to: John Wudrick gmail.com> Signed-off-by: Sam James gentoo.org> app-text/poppler-data/Manifest | 1 + .../poppler-data/poppler-data-0.4.11-r1.ebuild | 27 ++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/app-text/poppler-data/Manifest b/app-text/poppler-data/Manifest index 3fe0df6c9ad8..9c070bc8218f 100644 --- a/app-text/poppler-data/Manifest +++ b/app-text/poppler-data/Manifest @@ -1 +1,2 @@ +DIST poppler-data-0.4.11-extra.tar.xz 3092 BLAKE2B 37d54a15a3725d4fe8c78ac2cb18cb4cc43cc65929822b6e4ac5e17c70f97dd3f4b144c34b4cb1c2439e58d379a61b6b348bc93304a1b730a6e37dd304c763ad SHA512 639dd5467cb06cb417dc1b09ca9db1f7233f902a54220899be3199a1081b91c69ff063f133080175312098ac8078ab8e2c4c91c89b460e8b92e6192f18395531 DIST poppler-data-0.4.11.tar.gz 4497282 BLAKE2B 01f0f9f3d933f45683a702c4d538d8fc59874512290f199b601c16f98f9b596ff249fbc992574d046931cc80f3685f94733248450d3a54f2f961951cdeda7c39 SHA512 a5b7ace28d1677e12f7500ab6345b277dc22cd48ace8d472c083933416879edf4da4efe8217b0e11f75a3387ed98d832fe50567884095b6c0e09ebd8802b0f32 diff --git a/app-text/poppler-data/poppler-data-0.4.11-r1.ebuild b/app-text/poppler-data/poppler-data-0.4.11-r1.ebuild new file mode 100644 index 000000000000..c65bde103305 --- /dev/null +++ b/app-text/poppler-data/poppler-data-0.4.11-r1.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +POPPLER_DATA_EXTRA_VERSION="0.4.11" +DESCRIPTION="Data files for poppler to support uncommon encodings without xpdfrc" +HOMEPAGE="https://poppler.freedesktop.org/" +SRC_URI="https://poppler.freedesktop.org/${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${POPPLER_DATA_EXTRA_VERSION}-extra.tar.xz" + +# AGPL-3+ for the extra files needed by ghostscript, bug #844115 +LICENSE="AGPL-3+ BSD GPL-2 MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" + +src_install() { + emake prefix="${EPREFIX}"/usr DESTDIR="${D}" install + + # We need to include extra cMaps for ghostscript, bug #844115 + cp "${WORKDIR}"/${PN}-${POPPLER_DATA_EXTRA_VERSION}-extra/Identity-* "${ED}"/usr/share/poppler/cMap || die + + # bug #409361 + dodir /usr/share/poppler/cMaps + cd "${ED}"/usr/share/poppler/cMaps || die + find ../cMap -type f -exec ln -s {} . \; || die +}