X-Original-To: alpine-aports@lists.alpinelinux.org Received: from mailauth4.nine.ch (mailauth4.nine.ch [94.230.211.190]) by lists.alpinelinux.org (Postfix) with ESMTP id 91AC55C4AA6 for ; Sun, 29 Jan 2017 15:58:30 +0000 (GMT) Received: from localhost (localhost [127.0.0.1]) by mailauth4.nine.ch (Postfix) with ESMTP id 22801BFB8B; Sun, 29 Jan 2017 16:58:30 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mailauth4.nine.ch X-Spam-Flag: NO X-Spam-Score: -0.999 X-Spam-Level: X-Spam-Status: No, score=-0.999 tagged_above=-999 required=5.6 tests=[ALL_TRUSTED=-1, HEADER_FROM_DIFFERENT_DOMAINS=0.001] autolearn=disabled Received: from mailauth4.nine.ch ([127.0.0.1]) by localhost (mailauth4.nine.ch [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id iUqgqbj1wyP7; Sun, 29 Jan 2017 16:58:29 +0100 (CET) Received: from vimes (174.180.4.85.dynamic.wline.res.cust.swisscom.ch [85.4.180.174]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: pf@1042.ch) by mailauth4.nine.ch (Postfix) with ESMTPSA; Sun, 29 Jan 2017 16:58:29 +0100 (CET) Received: by vimes (Postfix, from userid 1000) id D721782684; Sun, 29 Jan 2017 16:58:28 +0100 (CET) From: Jean-Louis Fuchs To: alpine-aports@lists.alpinelinux.org Cc: Jean-Louis Fuchs Subject: [alpine-aports] [PATCH 4/5] testing/libspectre: move from unmaintained, update Date: Sun, 29 Jan 2017 16:57:30 +0100 Message-Id: <20170129155731.13183-5-ganwell@fangorn.ch> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170129155731.13183-1-ganwell@fangorn.ch> References: <20170129155731.13183-1-ganwell@fangorn.ch> X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: --- {unmaintained => testing}/libspectre/APKBUILD | 20 +++++++---- testing/libspectre/ghostscript-api.patch | 52 +++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 7 deletions(-) rename {unmaintained => testing}/libspectre/APKBUILD (67%) create mode 100644 testing/libspectre/ghostscript-api.patch diff --git a/unmaintained/libspectre/APKBUILD b/testing/libspectre/APKBUILD similarity index 67% rename from unmaintained/libspectre/APKBUILD rename to testing/libspectre/APKBUILD index 715062c817..c00d08d50b 100644 --- a/unmaintained/libspectre/APKBUILD +++ b/testing/libspectre/APKBUILD @@ -1,5 +1,6 @@ # Contributor: Andrew Hills -# Maintainer: Andrew Hills +# Contributor: Jean-Louis Fuchs +# Maintainer: Jean-Louis Fuchs pkgname=libspectre pkgver=0.2.7 pkgrel=0 @@ -12,11 +13,14 @@ depends_dev="" makedepends="$depends_dev ghostscript-dev doxygen" install="" subpackages="$pkgname-dev $pkgname-doc" -source="http://libspectre.freedesktop.org/releases/libspectre-$pkgver.tar.gz" +source="http://libspectre.freedesktop.org/releases/libspectre-$pkgver.tar.gz + ghostscript-api.patch" _builddir="$srcdir"/libspectre-$pkgver + prepare() { - update_config_sub + update_config_sub || return 1 + default_prepare || return 1 } build() { @@ -40,11 +44,13 @@ package() { } doc() { - arch="noarch" mkdir -m 0755 -p "$subpkgdir"/usr/share/doc/libspectre || return 1 install -m 0644 "$_builddir"/doc/html/* "$subpkgdir"/usr/share/doc/libspectre/ } -md5sums="8f759c0e6cd88d68fc8149130fcbc3d3 libspectre-0.2.7.tar.gz" -sha256sums="e81b822a106beed14cf0fec70f1b890c690c2ffa150fa2eee41dc26518a6c3ec libspectre-0.2.7.tar.gz" -sha512sums="2e60905f7eeed9ac6ec3b5f8b47a7dad85178c8c35a63ba097ef6088dd334f7fde5797ecb05cf67532b759d07a65006427914d2cd6b09107ecc90620c9541794 libspectre-0.2.7.tar.gz" +md5sums="8f759c0e6cd88d68fc8149130fcbc3d3 libspectre-0.2.7.tar.gz +43c860e4f8ca8690759440115570b738 ghostscript-api.patch" +sha256sums="e81b822a106beed14cf0fec70f1b890c690c2ffa150fa2eee41dc26518a6c3ec libspectre-0.2.7.tar.gz +1b5ad9d94ddd6cd3febfc6d559cbf329b4c57a841821df024cccf93ae3cb8159 ghostscript-api.patch" +sha512sums="2e60905f7eeed9ac6ec3b5f8b47a7dad85178c8c35a63ba097ef6088dd334f7fde5797ecb05cf67532b759d07a65006427914d2cd6b09107ecc90620c9541794 libspectre-0.2.7.tar.gz +d54a2dd2b03de9bcdf012e3cb429d7f882f38dc0c66c5253271fbec0e0917f41fce06e33a383fdd6989ad8e83d6ff2d85cce194b7aa97212564ae56ebbda7c4c ghostscript-api.patch" diff --git a/testing/libspectre/ghostscript-api.patch b/testing/libspectre/ghostscript-api.patch new file mode 100644 index 0000000000..d7f907828e --- /dev/null +++ b/testing/libspectre/ghostscript-api.patch @@ -0,0 +1,52 @@ +diff -ru a/libspectre/spectre-gs.c b/libspectre/spectre-gs.c +--- a/libspectre/spectre-gs.c 2010-04-18 18:01:05.000000000 +0200 ++++ b/libspectre/spectre-gs.c 2017-01-29 15:49:14.428958824 +0100 +@@ -29,6 +29,12 @@ + #include + #include + ++/* Fix ghostscript API till a new release of libspectre ++ * e_ExecStackUnderflow -> gs_error_ExecStackUnderflow ++ * e_Fatal -> gs_error_Fatal ++ * e_NeedInput -> gs_error_NeedInput ++ */ ++ + #define BUFFER_SIZE 32768 + + struct SpectreGS { +@@ -43,12 +49,12 @@ + + if (code <= -100) { + switch (code) { +- case e_Fatal: ++ case gs_error_Fatal: + fprintf (stderr, "fatal internal error %d", code); + return TRUE; + break; + +- case e_ExecStackUnderflow: ++ case gs_error_ExecStackUnderflow: + fprintf (stderr, "stack overflow %d", code); + return TRUE; + break; +@@ -109,9 +115,9 @@ + set = _spectre_strdup_printf ("%d %d translate\n", -x, -y); + error = gsapi_run_string_continue (ghostscript_instance, set, strlen (set), + 0, &exit_code); +- error = error == e_NeedInput ? 0 : error; ++ error = error == gs_error_NeedInput ? 0 : error; + free (set); +- if (error != e_NeedInput && critic_error_code (error)) { ++ if (error != gs_error_NeedInput && critic_error_code (error)) { + fclose (fd); + return FALSE; + } +@@ -126,7 +132,7 @@ + read = fread (buf, sizeof (char), to_read, fd); + error = gsapi_run_string_continue (ghostscript_instance, + buf, read, 0, &exit_code); +- error = error == e_NeedInput ? 0 : error; ++ error = error == gs_error_NeedInput ? 0 : error; + left -= read; + } + -- 2.11.0 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---