From d725480af7cbc67d784e5d96f973fa41e9030123 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 19 Jan 2024 14:07:55 +0000 Subject: gentoo auto-resync : 19:01:2024 - 14:07:55 --- app-text/ghostscript-gpl/Manifest | 2 + .../files/ghostscript-gpl-10.02.1-c99-2.patch | 53 ++++++ .../ghostscript-gpl-10.02.1-r1.ebuild | 199 +++++++++++++++++++++ 3 files changed, 254 insertions(+) create mode 100644 app-text/ghostscript-gpl/files/ghostscript-gpl-10.02.1-c99-2.patch create mode 100644 app-text/ghostscript-gpl/ghostscript-gpl-10.02.1-r1.ebuild (limited to 'app-text/ghostscript-gpl') diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest index 7e8ba3609a58..4d683071e99e 100644 --- a/app-text/ghostscript-gpl/Manifest +++ b/app-text/ghostscript-gpl/Manifest @@ -1,3 +1,4 @@ +AUX ghostscript-gpl-10.02.1-c99-2.patch 1892 BLAKE2B 912ec6edaae2f25237190f559a96f746ab42fb484aefe1d3b74a84e624b737fe31585655ff9a8e66d65d0eaa9668e3db35d8eb1e4a745deaedf90af2bc8df02d SHA512 9b2545a76be50d8667c3bd5438ab87b7a11f0e2103372cb62bfeefff229daaba1e739538de083b91b99e34f24635797bc737d4924f474945f63bdfef41083080 AUX ghostscript-gpl-10.02.1-c99.patch 956 BLAKE2B 9b157eee6f49ae8ef696fc5fa548b5baa3839eb46e17025ccaa1b542d1a29abcca9a004fb297c0f8fd7a41653ee7f961130c8de2edfc4169ac95fce414c039cd SHA512 d5211435f39f76c25cd4f9d4743db789a1c4e7a72ca9aa389f4d83327f227effeeb74edd7938f845d06aa2034942670a5d31a26da8a1ea845439a0cc48c3f758 DIST ghostscript-10.01.1.tar.xz 67567268 BLAKE2B 26f14f11362c7cd6e129044b8e094ad421fc607a702e1f5d10ae03b8ebfb1e76fc094281df739d6ebfa815c6080f1b2223036268474c41d795e2a1e5fc66bab2 SHA512 d944be9e8aef68d1176d64c40db6fa86d55d0c9e30047f2147c02806ab61cfe9ac2cb00d4e5b218ff3c51cc6ed47ceffe1bac4dd9d4cc1760b7974f30c6c2735 DIST ghostscript-10.01.2.tar.xz 67571808 BLAKE2B d5bedfe058a9b982da3a5a9935617add8d963291f135e047369439eeb0b1587e697511fe4a2a9633cfb49594d3a36467d1df7904125f53c70d8161dc9825ff32 SHA512 ee20f0e12f553a3d04578e71a0d45defebc71117ce4dc2c14043985bfe7348ad7f8b2fe98fc9b4f5b935ecb32e50dc340be67d6ef58190542ec6d0f9da1de380 @@ -7,5 +8,6 @@ DIST ghostscript-gpl-10.0-patches.tar.xz 2980 BLAKE2B e2c20195b153bf45f374e84d91 EBUILD ghostscript-gpl-10.01.1.ebuild 5456 BLAKE2B bfd0846903bf34d6f7c9eae3a0717e00184534f9c0d55546eebc3fcd09c215a891269190b14c06af3d6e278d63005e894cc82a4b522dc026aec089e4861b8012 SHA512 af602edb537d8063bc731ade835c3917096040a399e9926637be853b59a79ded5f1e8342d0f5c1ce7739683ae832681bcacbede7263982f279f38a1181bf244a EBUILD ghostscript-gpl-10.01.2.ebuild 5456 BLAKE2B bfd0846903bf34d6f7c9eae3a0717e00184534f9c0d55546eebc3fcd09c215a891269190b14c06af3d6e278d63005e894cc82a4b522dc026aec089e4861b8012 SHA512 af602edb537d8063bc731ade835c3917096040a399e9926637be853b59a79ded5f1e8342d0f5c1ce7739683ae832681bcacbede7263982f279f38a1181bf244a EBUILD ghostscript-gpl-10.02.0.ebuild 5462 BLAKE2B 4ea2f45b3c93a6417aa98d5e4f45f178747a84fc25813ec680d3092965c4efe9130a3ecadbd5f27aef237acc99e98750eacb28aaf12eddd6a2185cf5b64b72c3 SHA512 37262026b68d01047f9548571c8ade0401842c2a08b4594d38eb2ee0cd0616aa6cfeb1feefba11e9418a2760b75174dc7fd5360961f7622eb6185ca389543ba1 +EBUILD ghostscript-gpl-10.02.1-r1.ebuild 5563 BLAKE2B e6fd8545f17bf87d10a82ea39e70e2a84cbd477c02cd505915176c6939dd2717bf481effc203e788392ee7adaf04f189ca3ecebd331f259604eeba9391811cb4 SHA512 5e602155880d64b95980cf60d77089ecc627f21d1636a0d6b4ea6d73f8909091b6aae9049291a4e88faba5f6e9265c06f70548521bb2471d14fc3e0b167c5008 EBUILD ghostscript-gpl-10.02.1.ebuild 5514 BLAKE2B b895b5d272942e3c94554e4e212de9755f3d0a2eaf3eaec1ed5e0e8da0690d0650e01d7286bd8cdc97644026d1590888b18c815453ef60ead482053826cb1e5f SHA512 acf696db220c37538286de745ac9cc4a901b3519535c14ce3db1f968c85e4f7e3c410ed4d55d7cb6ff54a5211b3569b05a2b609686ed030c06f00b0bd1c4edbf MISC metadata.xml 831 BLAKE2B e594fcc7ef78d3eb9f157a46c63f33fd35887fa82cdc304bc4b2db4e772473e8ba695b0ef932a69df0c8a5ac5269955ae600b436444782820475f44c6fc1d9f1 SHA512 2b067dfde63ffd8da3afb27c889884e51a3e1158cef153bc30ffb10a69cb0f7d409bc38a335651010d4e1dddad3bf09a9873445d77416da2bbd2ac7af5ab1598 diff --git a/app-text/ghostscript-gpl/files/ghostscript-gpl-10.02.1-c99-2.patch b/app-text/ghostscript-gpl/files/ghostscript-gpl-10.02.1-c99-2.patch new file mode 100644 index 000000000000..a9356f861c52 --- /dev/null +++ b/app-text/ghostscript-gpl/files/ghostscript-gpl-10.02.1-c99-2.patch @@ -0,0 +1,53 @@ +https://bugs.gentoo.org/922448 +https://bugs.ghostscript.com/show_bug.cgi?id=707502 +https://git.ghostscript.com/?p=ghostpdl.git;h=8f5c77af6c0b84bdea719010cf4f67877e857b2b + +From 8f5c77af6c0b84bdea719010cf4f67877e857b2b Mon Sep 17 00:00:00 2001 +From: Ken Sharp +Date: Fri, 19 Jan 2024 08:44:33 +0000 +Subject: [PATCH] X device - fix compiler 'warning' + +Bug #707502 "- -Wincompatible-pointer-types warning in devices/gdevxini.c" + +This is probably an oversight from when we changed a load of variables +to size_t. + +Seems odd that compilers (well gcc) should refuse to compile becuase of +a warning, but that's compilers. The pointer type is incorrect so let's +fix it. +--- a/devices/gdevx.h ++++ b/devices/gdevx.h +@@ -1,4 +1,4 @@ +-/* Copyright (C) 2001-2023 Artifex Software, Inc. ++/* Copyright (C) 2001-2024 Artifex Software, Inc. + All Rights Reserved. + + This software is provided AS-IS with no warranty, either express or +@@ -39,7 +39,7 @@ typedef struct gx_device_X_s { + bool is_buffered; + bool IsPageDevice; + byte *buffer; /* full-window image */ +- long buffer_size; ++ size_t buffer_size; + gx_device_color_info orig_color_info; + + /* An XImage object for writing bitmap images to the screen */ +--- a/devices/gdevxini.c ++++ b/devices/gdevxini.c +@@ -1,4 +1,4 @@ +-/* Copyright (C) 2001-2023 Artifex Software, Inc. ++/* Copyright (C) 2001-2024 Artifex Software, Inc. + All Rights Reserved. + + This software is provided AS-IS with no warranty, either express or +@@ -621,7 +621,7 @@ x_set_buffer(gx_device_X * xdev) + } + if (mdev->width != xdev->width || mdev->height != xdev->height) { + byte *buffer; +- ulong space; ++ size_t space; + + if (gdev_mem_data_size(mdev, xdev->width, xdev->height, &space) < 0 || + space > xdev->space_params.MaxBitmap) { +-- +2.34.1 diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-10.02.1-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-10.02.1-r1.ebuild new file mode 100644 index 000000000000..bd7de413886b --- /dev/null +++ b/app-text/ghostscript-gpl/ghostscript-gpl-10.02.1-r1.ebuild @@ -0,0 +1,199 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic toolchain-funcs + +MY_PN=${PN/-gpl} +MY_P="${MY_PN}-${PV/_}" +PVM=$(ver_cut 1-2) +PVM_S=$(ver_rs 1-2 "") + +# Use https://gitweb.gentoo.org/proj/codec/ghostscript-gpl-patches.git/ for patches +# See 'index' branch for README +MY_PATCHSET="ghostscript-gpl-10.0-patches.tar.xz" + +DESCRIPTION="Interpreter for the PostScript language and PDF" +HOMEPAGE="https://ghostscript.com/ https://git.ghostscript.com/?p=ghostpdl.git;a=summary" +SRC_URI="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PVM_S}/${MY_P}.tar.xz" +if [[ -n "${MY_PATCHSET}" ]] ; then + SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCHSET}" +fi + +LICENSE="AGPL-3 CPL-1.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="cups dbus gtk l10n_de static-libs unicode X" + +LANGS="ja ko zh-CN zh-TW" +for X in ${LANGS} ; do + IUSE="${IUSE} l10n_${X}" +done + +DEPEND=" + app-text/libpaper:= + media-libs/fontconfig + >=media-libs/freetype-2.4.9:2= + >=media-libs/jbig2dec-0.19:= + >=media-libs/lcms-2.6:2 + >=media-libs/libpng-1.6.2:= + media-libs/libjpeg-turbo:= + >=media-libs/openjpeg-2.1.0:2= + >=media-libs/tiff-4.0.1:= + >=sys-libs/zlib-1.2.7 + cups? ( >=net-print/cups-1.3.8 ) + dbus? ( sys-apps/dbus ) + gtk? ( x11-libs/gtk+:3 ) + unicode? ( net-dns/libidn:= ) + X? ( x11-libs/libXt x11-libs/libXext ) +" +BDEPEND="virtual/pkgconfig" +# bug #844115 for newer poppler-data dep +RDEPEND=" + ${DEPEND} + >=app-text/poppler-data-0.4.11-r2 + >=media-fonts/urw-fonts-2.4.9 + l10n_ja? ( media-fonts/kochi-substitute ) + l10n_ko? ( media-fonts/baekmuk-fonts ) + l10n_zh-CN? ( media-fonts/arphicfonts ) + l10n_zh-TW? ( media-fonts/arphicfonts ) +" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${FILESDIR}"/${PN}-10.02.1-c99.patch + "${FILESDIR}"/${PN}-10.02.1-c99-2.patch +) + +src_prepare() { + if [[ -n ${MY_PATCHSET} ]] ; then + # apply various patches, many borrowed from Fedora + # https://src.fedoraproject.org/rpms/ghostscript + # and Debian + # https://salsa.debian.org/printing-team/ghostscript/-/tree/debian/latest/debian/patches + eapply "${WORKDIR}"/${MY_PATCHSET%%.tar*} + fi + + default + + # Remove internal copies of various libraries + rm -r cups/libs || die + rm -r freetype || die + rm -r jbig2dec || die + rm -r jpeg || die + rm -r lcms2mt || die + rm -r libpng || die + rm -r tiff || die + rm -r zlib || die + rm -r openjpeg || die + # Remove internal CMaps (CMaps from poppler-data are used instead) + rm -r Resource/CMap || die + + if ! use gtk ; then + sed -e "s:\$(GSSOX)::" \ + -e "s:.*\$(GSSOX_XENAME)$::" \ + -i base/unix-dll.mak || die "sed failed" + fi + + # Force the include dirs to a neutral location. + sed -e "/^ZLIBDIR=/s:=.*:=${T}:" \ + -i configure.ac || die + # Some files depend on zlib.h directly. Redirect them. #573248 + # Also make sure to not define OPJ_STATIC to avoid linker errors due to + # hidden symbols (https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=203327#c1) + sed -e '/^zlib_h/s:=.*:=:' \ + -e 's|-DOPJ_STATIC ||' \ + -i base/lib.mak || die + + # Search path fix + # put LDFLAGS after BINDIR, bug #383447 + sed -e "s:\$\(gsdatadir\)/lib:@datarootdir@/ghostscript/${PV}/$(get_libdir):" \ + -e "s:exdir=.*:exdir=@datarootdir@/doc/${PF}/examples:" \ + -e "s:docdir=.*:docdir=@datarootdir@/doc/${PF}/html:" \ + -e "s:GS_DOCDIR=.*:GS_DOCDIR=@datarootdir@/doc/${PF}/html:" \ + -e 's:-L$(BINDIR):& $(LDFLAGS):g' \ + -i Makefile.in base/*.mak || die "sed failed" + + # Remove incorrect symlink, bug 590384 + rm ijs/ltmain.sh || die + eautoreconf + + cd ijs || die + eautoreconf +} + +src_configure() { + # Unsupported upstream, bug #884841 + filter-lto + + local FONTPATH + for path in \ + "${EPREFIX}"/usr/share/fonts/urw-fonts \ + "${EPREFIX}"/usr/share/fonts/Type1 \ + "${EPREFIX}"/usr/share/fonts + do + FONTPATH="${FONTPATH}${FONTPATH:+:}${EPREFIX}${path}" + done + + # Do not add --enable-dynamic here, it's not supported fully upstream + # https://bugs.ghostscript.com/show_bug.cgi?id=705895 + # bug #884707 + # + # leptonica and tesseract are bundled but modified upstream, like in + # mujs/mupdf. + PKGCONFIG=$(type -P $(tc-getPKG_CONFIG)) econf \ + --enable-freetype \ + --enable-fontconfig \ + --enable-openjpeg \ + --disable-compile-inits \ + --with-drivers=ALL \ + --with-fontpath="${FONTPATH}" \ + --with-ijs \ + --with-jbig2dec \ + --with-libpaper \ + --with-system-libtiff \ + $(use_enable cups) \ + $(use_enable dbus) \ + $(use_enable gtk) \ + $(use_with cups pdftoraster) \ + $(use_with unicode libidn) \ + $(use_with X x) \ + DARWIN_LDFLAGS_SO_PREFIX="${EPREFIX}/usr/lib/" + + cd "${S}/ijs" || die + econf \ + --enable-shared \ + $(use_enable static-libs static) +} + +src_compile() { + emake so all + + cd ijs || die + emake +} + +src_install() { + emake DESTDIR="${D}" install-so install + + # move gsc to gs, bug #343447 + # gsc collides with gambit, bug #253064 + mv -f "${ED}"/usr/bin/{gsc,gs} || die + + cd "${S}/ijs" || die + emake DESTDIR="${D}" install + + # Sometimes the upstream versioning deviates from the tarball(!) + # bug #844115#c32 + local my_gs_version=$(find "${ED}"/usr/share/ghostscript/ -maxdepth 1 -mindepth 1 -type d || die) + my_gs_version=${my_gs_version##*/} + + # Install the CMaps from poppler-data properly, bug #409361 + dosym -r /usr/share/poppler/cMaps /usr/share/ghostscript/${my_gs_version}/Resource/CMap + + if ! use static-libs; then + find "${ED}" -name '*.la' -delete || die + fi +} -- cgit v1.2.3