From f618b35503a8a958ea39de10ea53f18878c48a68 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Sun, 25 Nov 2018 09:25:22 -0800 Subject: [PATCH] gutenprint: update to 5.3.1. --- common/shlibs | 2 +- srcpkgs/gutenprint/patches/musl.patch | 19 +++++++++++++++++++ srcpkgs/gutenprint/template | 15 +++++++-------- 3 files changed, 27 insertions(+), 9 deletions(-) create mode 100644 srcpkgs/gutenprint/patches/musl.patch diff --git a/common/shlibs b/common/shlibs index 2dd5d29cc3..b3c7ce4ad9 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2902,7 +2902,7 @@ libtracker-sparql-2.0.so.0 libtracker-2.0.0_1 libdockapp.so.3 libdockapp-0.7.2_1 libkrdccore.so.5 krdc-17.04.3_1 libArcus.so.3 libArcus-3.1.0_1 -libgutenprint.so.2 gutenprint-5.2.12_1 +libgutenprint.so.8 gutenprint-5.3.1_1 libunbound.so.8 unbound-1.8.0_1 libmirage.so.11 libmirage-3.1.0_1 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1 diff --git a/srcpkgs/gutenprint/patches/musl.patch b/srcpkgs/gutenprint/patches/musl.patch new file mode 100644 index 0000000000..52edda6269 --- /dev/null +++ b/srcpkgs/gutenprint/patches/musl.patch @@ -0,0 +1,19 @@ +commit 6b8ae64056133e2b4775a201eb527fdc143d669c +Author: Cameron Nemo +Date: Sun Nov 25 10:09:21 2018 -0800 + + src/xml/printers: remove assignment to read-only variable + +diff --git src/xml/printers/check_duplicate_printers.test.c src/xml/printers/check_duplicate_printers.test.c +index 52c46e65..d5d2771c 100644 +--- src/xml/printers/check_duplicate_printers.c ++++ src/xml/printers/check_duplicate_printers.c +@@ -34,7 +34,7 @@ main(int argc, char **argv) + if (getenv("BUILD_VERBOSE")) + dup2(2, 3); + (void) snprintf(path, PATH_MAX, "%scheck_duplicate_printers_%d.log", getenv("STP_TEST_LOG_PREFIX"), getpid()); +- stdout = freopen(path, "w", stdout); ++ freopen(path, "w", stdout); + dup2(1, 2); + } + setenv("STP_CHECK_DUPLICATE_PRINTERS", "TRUE", 1); diff --git a/srcpkgs/gutenprint/template b/srcpkgs/gutenprint/template index 9cb0a379ea..1ae82e5b37 100644 --- a/srcpkgs/gutenprint/template +++ b/srcpkgs/gutenprint/template @@ -1,20 +1,19 @@ # Template file for 'gutenprint' pkgname=gutenprint -version=5.2.14 +version=5.3.1 revision=1 build_style=gnu-configure +configure_args="--disable-rpath --enable-samples --disable-static + --disable-static-genppd --enable-cups-ppds --enable-simplified-cups-ppds=only + --enable-translated-cups-ppds --enable-globalized-cups-ppds" hostmakedepends="ghostscript perl" makedepends="cups-devel" short_desc="Top quality printer drivers for POSIX systems" maintainer="Anachron " -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://gimp-print.sourceforge.net/" -distfiles="${SOURCEFORGE_SITE}/gimp-print/$pkgname-$version.tar.bz2" -checksum=45bf0766f196a764c113bfad7ab1ea748f1d5ff9ebb0d3a2206705fe52e82389 -configure_args="--disable-rpath \ - --enable-samples --disable-static --disable-static-genppd --enable-cups-ppds \ - --enable-simplified-cups-ppds=only --enable-translated-cups-ppds \ - --enable-globalized-cups-ppds" +distfiles="${SOURCEFORGE_SITE}/gimp-print/$pkgname-$version.tar.xz" +checksum=d80d8f5272d15bca5710f6ef4a2bb95e76d34e1155c5bcd5e83cb9f0a111d0d4 nocross="https://sourceforge.net/p/gimp-print/mailman/message/34782748/" post_install() {