Thu Dec 10 12:03:41 2015 UTC ()
gs 9.18 renamed error namespace, but provides no good way of testing the
version number so allow for both old and new names by testing the guard
define of the gserrors.h that appeared at the same point.


(markd)
diff -r1.24 -r1.25 pkgsrc/print/libspectre/Makefile
diff -r1.8 -r1.9 pkgsrc/print/libspectre/distinfo
diff -r0 -r1.1 pkgsrc/print/libspectre/patches/patch-libspectre_spectre-gs.c
cvs diff -r1.24 -r1.25 pkgsrc/print/libspectre/Makefile (expand / switch to unified diff)

--- pkgsrc/print/libspectre/Makefile 2015/04/21 22:28:36 1.24
+++ pkgsrc/print/libspectre/Makefile 2015/12/10 12:03:41 1.25
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.24 2015/04/21 22:28:36 rodent Exp $ 1# $NetBSD: Makefile,v 1.25 2015/12/10 12:03:41 markd Exp $
2 2
3DISTNAME= libspectre-0.2.7 3DISTNAME= libspectre-0.2.7
4PKGREVISION= 8 4PKGREVISION= 9
5CATEGORIES= print 5CATEGORIES= print
6MASTER_SITES= http://libspectre.freedesktop.org/releases/ 6MASTER_SITES= http://libspectre.freedesktop.org/releases/
7 7
8MAINTAINER= markd@NetBSD.org 8MAINTAINER= markd@NetBSD.org
9HOMEPAGE= http://www.freedesktop.org/wiki/Software/libspectre/ 9HOMEPAGE= http://www.freedesktop.org/wiki/Software/libspectre/
10COMMENT= Small library for rendering Postscript documents 10COMMENT= Small library for rendering Postscript documents
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13GNU_CONFIGURE= yes 13GNU_CONFIGURE= yes
14USE_LIBTOOL= yes 14USE_LIBTOOL= yes
15 15
16PKGCONFIG_OVERRIDE+= libspectre.pc.in 16PKGCONFIG_OVERRIDE+= libspectre.pc.in
17 17
cvs diff -r1.8 -r1.9 pkgsrc/print/libspectre/distinfo (expand / switch to unified diff)

--- pkgsrc/print/libspectre/distinfo 2015/11/04 01:01:35 1.8
+++ pkgsrc/print/libspectre/distinfo 2015/12/10 12:03:41 1.9
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.8 2015/11/04 01:01:35 agc Exp $ 1$NetBSD: distinfo,v 1.9 2015/12/10 12:03:41 markd Exp $
2 2
3SHA1 (libspectre-0.2.7.tar.gz) = a7efd97b82b84ff1bb7a0d88c7e35ad10cc84ea8 3SHA1 (libspectre-0.2.7.tar.gz) = a7efd97b82b84ff1bb7a0d88c7e35ad10cc84ea8
4RMD160 (libspectre-0.2.7.tar.gz) = 66d8b82f2c1dd9eea57f1b3f80bae72e6b529861 4RMD160 (libspectre-0.2.7.tar.gz) = 66d8b82f2c1dd9eea57f1b3f80bae72e6b529861
5SHA512 (libspectre-0.2.7.tar.gz) = 2e60905f7eeed9ac6ec3b5f8b47a7dad85178c8c35a63ba097ef6088dd334f7fde5797ecb05cf67532b759d07a65006427914d2cd6b09107ecc90620c9541794 5SHA512 (libspectre-0.2.7.tar.gz) = 2e60905f7eeed9ac6ec3b5f8b47a7dad85178c8c35a63ba097ef6088dd334f7fde5797ecb05cf67532b759d07a65006427914d2cd6b09107ecc90620c9541794
6Size (libspectre-0.2.7.tar.gz) = 387947 bytes 6Size (libspectre-0.2.7.tar.gz) = 387947 bytes
 7SHA1 (patch-libspectre_spectre-gs.c) = c47dfaeac12da68315efa9b7b675c7d8c3a4635f
File Added: pkgsrc/print/libspectre/patches/Attic/patch-libspectre_spectre-gs.c
$NetBSD: patch-libspectre_spectre-gs.c,v 1.1 2015/12/10 12:03:41 markd Exp $

gs 9.18 renamed error namespace, but provides no good way of testing the
version number so allow for both old and new names by testing the guard
define of the gserrors.h that appeared at the same point.

--- libspectre/spectre-gs.c.orig	2010-04-18 16:01:05.000000000 +0000
+++ libspectre/spectre-gs.c
@@ -29,6 +29,12 @@
 #include <ghostscript/iapi.h>
 #include <ghostscript/ierrors.h>
 
+#ifdef gserrors_INCLUDED
+# define e_Fatal gs_error_Fatal
+# define e_ExecStackUnderflow gs_error_ExecStackUnderflow
+# define e_NeedInput gs_error_NeedInput
+#endif
+
 #define BUFFER_SIZE 32768
 
 struct SpectreGS {