commit: c767d1fb89a97b88071f851959ce696c12cb7fff Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Sep 20 22:22:31 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Sep 20 22:23:56 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c767d1fb
app-text/ghostscript-gpl: add 10.06.0 Closes: https://bugs.gentoo.org/955980 Bug: https://bugs.gentoo.org/962685 Signed-off-by: Sam James <sam <AT> gentoo.org> app-text/ghostscript-gpl/Manifest | 1 + .../files/ghostscript-gpl-10.06.0-32-bit.patch | 62 ++++++ .../ghostscript-gpl-10.06.0-tesseract-fPIC.patch | 25 +++ .../ghostscript-gpl/ghostscript-gpl-10.06.0.ebuild | 209 +++++++++++++++++++++ 4 files changed, 297 insertions(+) diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest index 51d9b0280101..63b718c11304 100644 --- a/app-text/ghostscript-gpl/Manifest +++ b/app-text/ghostscript-gpl/Manifest @@ -1,2 +1,3 @@ DIST ghostscript-10.05.1.tar.xz 68043644 BLAKE2B 85cc8176b29318b107b71436df844c613be72519e5011d7798564e534000ad476469ed47f7fc6dcc82b8848343d32c10fd30c2949bea356683dff2a16dbbc422 SHA512 1a3f2b0f53db9a00a245df19ce8fdce0fbccc6fad47b64d14fc9058b494ab07c77e21bb073df8d4a2522b3ccb0df26735f8224a9e36c07367031ed2262fb26af +DIST ghostscript-10.06.0.tar.xz 68955484 BLAKE2B fa885e4eb4c744526ae6aeadce54ec1e656fe93ad22d65ef514cd52c7e959650d05ad30ac34d310bf37b7d81a8b343c46e18af8c20c505fb0168c28e2cb30bc4 SHA512 e9efa6a334cf34703f565f5043dd794452270415b34c2bea260e9dac6c72ebbcbedfa2e4cb9029841f8f582bbce91be8160e135a190081f3262bcf04417f80f1 DIST ghostscript-gpl-10.04.0-patches.tar.xz 3088 BLAKE2B 4bac1ebfc5f4be7e5174add2439ce4f4cf02f6c91929df9b03dc46c78b150d05cb5cade553303fc8b6795fe3b62ebc37dc5805da438c2f23578784e520a4c4a0 SHA512 f6973b4a9fc5722c49e9c088516accd6e91a3627eb554c58b37113392f8ed0cd1d27e2c65a8d0cce3bb2da5aa6beec726d4605fcb393162fd24256b92aa0ae67 diff --git a/app-text/ghostscript-gpl/files/ghostscript-gpl-10.06.0-32-bit.patch b/app-text/ghostscript-gpl/files/ghostscript-gpl-10.06.0-32-bit.patch new file mode 100644 index 000000000000..ce66c4019cf5 --- /dev/null +++ b/app-text/ghostscript-gpl/files/ghostscript-gpl-10.06.0-32-bit.patch @@ -0,0 +1,62 @@ +https://github.com/ArtifexSoftware/ghostpdl/commit/3c0be6e4fcffa63e4a5a1b0aec057cebc4d2562f + +From 3c0be6e4fcffa63e4a5a1b0aec057cebc4d2562f Mon Sep 17 00:00:00 2001 +From: Ken Sharp <[email protected]> +Date: Wed, 10 Sep 2025 08:55:30 +0100 +Subject: [PATCH] Fix 32-bit build + +Bug #708824 "ghostscript 10.06.0 compilation failure on 32-bit archs" + +nbytes shiouldn't be an intptr_t, it doesn't get used for pointer +arithmetic. Previously it was a uint, should be a int64_t, to fit with +all the other devices. + +Checked other warnings, and found a (very minor) one in gdevdbit.c, fix +that while we're here (signed/unsigned mismatch, we don't really care). +--- + base/gdevdbit.c | 2 +- + base/gdevmpla.c | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/base/gdevdbit.c b/base/gdevdbit.c +index e07cc3f3b8..1b5c69325b 100644 +--- a/base/gdevdbit.c ++++ b/base/gdevdbit.c +@@ -191,7 +191,7 @@ gx_default_copy_alpha_hl_color(gx_device * dev, const byte * data, int data_x, + fit_copy(dev, data, data_x, raster, id, x, y, width, height); + row_alpha = data; + out_raster = bitmap_raster(width * (size_t)byte_depth); +- if (check_64bit_multiply(out_raster, ncomps, &product) != 0) ++ if (check_64bit_multiply(out_raster, ncomps, (int64_t *) &product) != 0) + return gs_note_error(gs_error_undefinedresult); + gb_buff = gs_alloc_bytes(mem, product, "copy_alpha_hl_color(gb_buff)"); + if (gb_buff == 0) { +diff --git a/base/gdevmpla.c b/base/gdevmpla.c +index 2f0d522561..ffc5ff42e6 100644 +--- a/base/gdevmpla.c ++++ b/base/gdevmpla.c +@@ -1954,12 +1954,12 @@ mem_planar_strip_copy_rop2(gx_device * dev, + int i; + int j; + intptr_t chunky_sraster; +- intptr_t nbytes; ++ int64_t nbytes; + byte **line_ptrs; + byte *sbuf, *buf; + + chunky_sraster = sraster * (intptr_t)mdev->num_planar_planes; +- if (check_64bit_multiply(height, chunky_sraster, (size_t *)&nbytes) != 0) ++ if (check_64bit_multiply(height, chunky_sraster, &nbytes) != 0) + return gs_note_error(gs_error_undefinedresult); + buf = gs_alloc_bytes(mdev->memory, nbytes, "mem_planar_strip_copy_rop(buf)"); + if (buf == NULL) { +@@ -2003,7 +2003,7 @@ mem_planar_strip_copy_rop2(gx_device * dev, + intptr_t i; + intptr_t chunky_t_raster; + int chunky_t_height; +- intptr_t nbytes; ++ int64_t nbytes; + byte **line_ptrs; + byte *tbuf, *buf; + gx_strip_bitmap newtex; + diff --git a/app-text/ghostscript-gpl/files/ghostscript-gpl-10.06.0-tesseract-fPIC.patch b/app-text/ghostscript-gpl/files/ghostscript-gpl-10.06.0-tesseract-fPIC.patch new file mode 100644 index 000000000000..17f0420387fe --- /dev/null +++ b/app-text/ghostscript-gpl/files/ghostscript-gpl-10.06.0-tesseract-fPIC.patch @@ -0,0 +1,25 @@ +ld: ./soobj/tesseract_api_pagerenderer.o: warning: relocation against `_ZTINSt8__detail11_AnyMatcherINSt7__cxx1112regex_traitsIcEELb1ELb0ELb0EEE' in read-only section `.text._ZNSt17_Function_handlerIFbcENSt8__detail11_AnyMatcherINSt7__cxx1112regex_traitsIcEELb1ELb0ELb0EEEE10_M_managerERSt9_Any_dataRKS8_St18_Manager_operation[_ZNSt17_Function_handlerIFbcENSt8__detail11_AnyMatcherINSt7__cxx1112regex_traitsIcEELb1ELb0ELb0EEEE10_M_managerERSt9_Any_dataRKS8_St18_Manager_operation]' +ld: ./soobj/tessocr.o: relocation R_X86_64_PC32 against symbol `leptonica_free' can not be used when making a shared object; recompile with -fPIC +ld: final link failed: bad value +--- a/base/ocr.mak ++++ b/base/ocr.mak +@@ -20,7 +20,7 @@ + + # Define the name of this makefile. + LIBOCR_MAK=$(GLSRC)ocr.mak $(TOP_MAKEFILES) +-OCRCXX = $(CXX) $(TESSINCLUDES) $(TESSCXXFLAGS) $(CCXXFLAGS) -DTESSERACT_IMAGEDATA_AS_PIX -DTESSERACT_DISABLE_DEBUG_FONTS -DGRAPHICS_DISABLED -UCLUSTER ++OCRCXX = $(CXX) $(TESSINCLUDES) $(TESSCXXFLAGS) $(CCXXFLAGS) -DTESSERACT_IMAGEDATA_AS_PIX -DTESSERACT_DISABLE_DEBUG_FONTS -DGRAPHICS_DISABLED -UCLUSTER -fPIC + + # Tesseract veneer. + $(GLGEN)tessocr.$(OBJ) : $(GLSRC)tessocr.cpp $(GLSRC)tessocr.h $(LIBOCR_MAK) \ +--- a/base/tesseract.mak ++++ b/base/tesseract.mak +@@ -42,7 +42,7 @@ TESSINCLUDES=\ + # this conflicts with Tesseract's use of a CLUSTER type. We work around this + # here by undefining CLUSTER for the tesseract portion of the build. + +-TESSCXX = $(CXX) $(TESSINCLUDES) $(TESSCXXFLAGS) $(CCXXFLAGS) -DTESSERACT_IMAGEDATA_AS_PIX -DTESSERACT_DISABLE_DEBUG_FONTS -DGRAPHICS_DISABLED -UCLUSTER -DDISABLED_LEGACY_ENGINE ++TESSCXX = $(CXX) $(TESSINCLUDES) $(TESSCXXFLAGS) $(CCXXFLAGS) -DTESSERACT_IMAGEDATA_AS_PIX -DTESSERACT_DISABLE_DEBUG_FONTS -DGRAPHICS_DISABLED -UCLUSTER -DDISABLED_LEGACY_ENGINE -fPIC + TESSOBJ = $(GLOBJDIR)$(D)tesseract_ + TESSO_ = $(O_)$(TESSOBJ) + diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-10.06.0.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-10.06.0.ebuild new file mode 100644 index 000000000000..36ba2238a9af --- /dev/null +++ b/app-text/ghostscript-gpl/ghostscript-gpl-10.06.0.ebuild @@ -0,0 +1,209 @@ +# Copyright 1999-2025 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.04.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 +S="${WORKDIR}/${MY_P}" + +LICENSE="AGPL-3 CPL-1.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="cups cpu_flags_arm_neon 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 ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-10.03.1-arm64-neon-tesseract.patch + "${FILESDIR}"/${PN}-10.06.0-tesseract-fPIC.patch + "${FILESDIR}"/${PN}-10.06.0-32-bit.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 + + # bug #943857 + # Build system passes CFLAGS to C++ compiler (bug #945826) + tc-export CC + CC+=" -std=gnu17" + + # bug #899952 + append-lfs-flags + + 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. + # + # There is --without-local-brotli but it wants a non-existent -lbrotli + # and it's not clear what that corresponds do, as we have split libs. + 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_enable cpu_flags_arm_neon neon) \ + $(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 + emake -C ijs +} + +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 +}
