From 433d70a55d6a2cda8b2e75bfcc764698b7dd0a4e Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Fri, 24 Mar 2023 21:41:50 +0000 Subject: [PATCH] ghostscript: update to 10.01.1. --- srcpkgs/ghostscript/patches/fix-cross.patch | 37 --------------------- srcpkgs/ghostscript/template | 18 +++++----- 2 files changed, 8 insertions(+), 47 deletions(-) delete mode 100644 srcpkgs/ghostscript/patches/fix-cross.patch diff --git a/srcpkgs/ghostscript/patches/fix-cross.patch b/srcpkgs/ghostscript/patches/fix-cross.patch deleted file mode 100644 index d3f70b435bb3..000000000000 --- a/srcpkgs/ghostscript/patches/fix-cross.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 4c3575346b9c7d394ebc73b4e5fabebadd8877ec Mon Sep 17 00:00:00 2001 -From: Chris Liddell -Date: Thu, 24 Nov 2022 16:33:47 +0000 -Subject: [PATCH] Fix a little bitrot in the cross-compiling logic - -Removing the option to disable FAPI meant configuring for cross compiling would -fail because the option being passed to the sub-call to configure would include -an unknown command line option. ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index d5c68c4b3..738eb10a9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -138,7 +138,7 @@ if test x"$host" != x"$build" ; then - echo $AUXFLAGS_MAK_LINE07 >> $AUXFLAGS_MAK.in - - AC_MSG_NOTICE([Begin recursive call to configure script (for auxiliary tools)]) -- "$absolute_source_path/configure" CC="$CCAUX" CFLAGS="$CFLAGSAUX" CPPFLAGS="$CPPFLAGSAUX" LDFLAGS="$LDFLAGSAUX" CCAUX= CFLAGSAUX= CFLAGSAUX= MAKEFILE=$AUXFLAGS_MAK --host=$build --build=$build --enable-auxtools_only --disable-hidden-visibility --with-local-zlib --without-libtiff --disable-contrib --disable-fontconfig --disable-dbus --disable-freetype --disable-fapi --disable-cups --disable-openjpeg --disable-gtk --with-libiconv=no --without-libidn --without-libpaper --without-pdftoraster --without-ijs --without-jbig2dec --without-x --with-drivers="" -+ "$absolute_source_path/configure" CC="$CCAUX" CFLAGS="$CFLAGSAUX" CPPFLAGS="$CPPFLAGSAUX" LDFLAGS="$LDFLAGSAUX" CCAUX= CFLAGSAUX= CFLAGSAUX= MAKEFILE=$AUXFLAGS_MAK --host=$build --build=$build --enable-auxtools_only --disable-hidden-visibility --with-local-zlib --without-libtiff --disable-contrib --disable-fontconfig --disable-dbus --disable-freetype --disable-cups --disable-openjpeg --disable-gtk --with-libiconv=no --without-libidn --without-libpaper --without-pdftoraster --without-ijs --without-jbig2dec --without-x --with-drivers="" - status=$? - cp config.log "$olddir/configaux.log" - if test $status -eq 0 ; then -@@ -2530,7 +2530,7 @@ PDF= - PDF_MAK="\$(GLSRCDIR)\$(D)stub.mak" - PDFROMFS_MAK="\$(GLSRCDIR)\$(D)stub.mak" - --if test x"$with_pdf" != x"no" ; then -+if test x"$with_pdf" != x"no" -a x"$enable_auxtools_only" != x"yes" ; then - - if test x"$JBIG2_DECODER" = x""; then - AC_MSG_ERROR([No JBIG2 decoder available, required for PDF support]) --- -2.25.1 - diff --git a/srcpkgs/ghostscript/template b/srcpkgs/ghostscript/template index c169af7c4e7d..51fef8519ffd 100644 --- a/srcpkgs/ghostscript/template +++ b/srcpkgs/ghostscript/template @@ -1,7 +1,7 @@ # Template file for 'ghostscript' pkgname=ghostscript -version=10.0.0 -revision=2 +version=10.01.1 +revision=1 hostmakedepends="automake libtool pkg-config" makedepends="$(vopt_if cups cups-devel) dbus-devel fontconfig-devel jasper-devel jbig2dec-devel lcms2-devel libXext-devel libXt-devel libopenjpeg2-devel libpaper-devel" @@ -12,7 +12,7 @@ license="AGPL-3.0-or-later, CPL-1.0" homepage="https://www.ghostscript.com/" changelog="https://ghostscript.readthedocs.io/en/latest/News.html" distfiles="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${version//./}/ghostscript-${version}.tar.xz" -checksum=f1fa585f7c7d32adfa81ab389388100ac9df83444eb64db1fb92737141ef9f61 +checksum=c91193635aa2578f9508b8ba846106c1e3705fbd3fed5fd9a015f21b55f15d68 build_options="cups" build_options_default="cups" @@ -26,9 +26,7 @@ pre_configure() { rm -rf $(vopt_if cups cups/libs) freetype jbig2dec jpeg lcms2mt libpng openjpeg tiff zlib # add missing LDFLAGS - sed -i 's/-L$(BINDIR)/& $(LDFLAGS)/g' base/unix-dll.mak - - autoreconf -fi + vsed -i 's/-L$(BINDIR)/& $(LDFLAGS)/g' base/unix-dll.mak cd ijs autoreconf -fi @@ -41,12 +39,12 @@ do_configure() { export CCAUX=cc CFLAGSAUX=${XBPS_CFLAGS} export CUPSCONFIG=/usr/bin/cups-config fi - ./configure ${configure_args} --enable-dynamic --with-ijs \ - --with-jbig2dec --with-omni --with-x --with-drivers=ALL \ + ./configure ${configure_args} --with-ijs --with-jbig2dec --with-x \ + --with-drivers=ALL \ --with-fontpath=/usr/share/fonts/Type1:/usr/share/fonts \ --enable-fontconfig --enable-freetype --enable-openjpeg \ - --with-libpaper --without-luratech --without-omni \ - --with-system-libtiff --disable-compile-inits $(vopt_enable cups) + --with-libpaper --with-system-libtiff --disable-compile-inits \ + $(vopt_enable cups) # configure libijs cd ijs