From 11891a10e8fbbf06ab717f11ee6a54d6786c069c Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Sun, 22 Jan 2023 14:36:30 +0000 Subject: [PATCH 1/4] ghostscript: update to 10.0.0. --- common/shlibs | 2 +- srcpkgs/ghostscript/patches/fix-cross.patch | 37 +++++++++++++++++++ .../fix_gscms_transform_color_typo.patch | 11 ------ srcpkgs/ghostscript/template | 8 ++-- 4 files changed, 43 insertions(+), 15 deletions(-) create mode 100644 srcpkgs/ghostscript/patches/fix-cross.patch delete mode 100644 srcpkgs/ghostscript/patches/fix_gscms_transform_color_typo.patch diff --git a/common/shlibs b/common/shlibs index edb8a2c5dd73..cedb9c629f35 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1059,7 +1059,7 @@ libcupscgi.so.1 libcups-1.5.3_1 libcups.so.2 libcups-1.5.3_1 libcupsimage.so.2 libcups-1.5.3_1 libijs-0.35.so libijs-0.8_1 -libgs.so.9 libgs-0.8_1 +libgs.so.10 libgs-10.0.0_1 libssh2.so.1 libssh2-1.9.0_3 libvirt-glib-1.0.so.0 libvirt-glib-0.0.8_1 libsnmp.so.40 libnet-snmp-5.9_2 diff --git a/srcpkgs/ghostscript/patches/fix-cross.patch b/srcpkgs/ghostscript/patches/fix-cross.patch new file mode 100644 index 000000000000..d3f70b435bb3 --- /dev/null +++ b/srcpkgs/ghostscript/patches/fix-cross.patch @@ -0,0 +1,37 @@ +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/patches/fix_gscms_transform_color_typo.patch b/srcpkgs/ghostscript/patches/fix_gscms_transform_color_typo.patch deleted file mode 100644 index 9ffa2e09ba66..000000000000 --- a/srcpkgs/ghostscript/patches/fix_gscms_transform_color_typo.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./base/gsicc_lcms2.c.jlg 2021-09-27 03:44:02.000000000 -0400 -+++ ./base/gsicc_lcms2.c 2021-10-05 10:50:03.428000000 -0400 -@@ -462,7 +462,7 @@ - gscms_transform_color(gx_device *dev, gsicc_link_t *icclink, void *inputcolor, - void *outputcolor, int num_bytes) - { -- return gscms_transformm_color_const(dev, icclink, inputcolor, outputcolor, num_bytes); -+ return gscms_transform_color_const(dev, icclink, inputcolor, outputcolor, num_bytes); - } - - int diff --git a/srcpkgs/ghostscript/template b/srcpkgs/ghostscript/template index 8bce83846ad8..dce91a71ae0e 100644 --- a/srcpkgs/ghostscript/template +++ b/srcpkgs/ghostscript/template @@ -1,6 +1,6 @@ # Template file for 'ghostscript' pkgname=ghostscript -version=9.55.0 +version=10.0.0 revision=1 hostmakedepends="automake libtool pkg-config" makedepends="$(vopt_if cups cups-devel) dbus-devel fontconfig-devel jasper-devel jbig2dec-devel @@ -10,9 +10,9 @@ short_desc="Interpreter for the PostScript language" maintainer="Orphaned " license="AGPL-3.0-or-later, CPL-1.0" homepage="https://www.ghostscript.com/" -changelog="https://www.ghostscript.com/doc/${version}/News.htm" +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=6ee3057773646d6a2c6d117eb53a17d6752feadc513828e4322f68b7b7789ff6 +checksum=f1fa585f7c7d32adfa81ab389388100ac9df83444eb64db1fb92737141ef9f61 build_options="cups" build_options_default="cups" @@ -28,6 +28,8 @@ pre_configure() { # add missing LDFLAGS sed -i 's/-L$(BINDIR)/& $(LDFLAGS)/g' base/unix-dll.mak + autoreconf -fi + cd ijs autoreconf -fi } From 7a2205f1427a6639b4c72c125819c620ec1c1811 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Sun, 22 Jan 2023 14:41:25 +0000 Subject: [PATCH 2/4] gimp: revbump for libgs-10.0.0. --- srcpkgs/gimp/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template index fb6cb95ff96c..98fe2d367bd3 100644 --- a/srcpkgs/gimp/template +++ b/srcpkgs/gimp/template @@ -1,7 +1,7 @@ # Template file for 'gimp' pkgname=gimp version=2.10.32 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-check-update --datadir=/usr/share" hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool From 5bb91efa7f3f83dd4719b178ede27e068f75ed88 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Sun, 22 Jan 2023 14:41:25 +0000 Subject: [PATCH 3/4] ImageMagick: revbump for libgs-10.0.0. --- srcpkgs/ImageMagick/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template index 14ddd0784ed3..b3f00eddc3eb 100644 --- a/srcpkgs/ImageMagick/template +++ b/srcpkgs/ImageMagick/template @@ -1,7 +1,7 @@ # Template file for 'ImageMagick' pkgname=ImageMagick version=7.1.0.58 -revision=1 +revision=2 _upstream_version="${version/.${version##*.}/-${version##*.}}" build_style=gnu-configure configure_args="--disable-static --enable-opencl --with-modules --with-gslib From d42a2b808955265c915a4f36511432eebcc5a249 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Sun, 22 Jan 2023 14:41:26 +0000 Subject: [PATCH 4/4] libspectre: revbump for libgs-10.0.0. --- srcpkgs/libspectre/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libspectre/template b/srcpkgs/libspectre/template index b8afe7840c9b..64fdd6e8ec3a 100644 --- a/srcpkgs/libspectre/template +++ b/srcpkgs/libspectre/template @@ -1,7 +1,7 @@ # Template file for 'libspectre' pkgname=libspectre version=0.2.11 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static" makedepends="ghostscript-devel"