Date: Mon, 6 Jun 2005 23:43:25 +0200 From: Simon Barner <barner@FreeBSD.org> To: ports@FreeBSD.org Subject: Please test: Prepare print/ghostscript-gpl for seamless integration with cups-pstoraster Message-ID: <20050606214325.GA2198@zi025.glhnet.mhn.de>
next in thread | raw e-mail | index | archive | help
--1ccMZA6j1vT5UqiK
Content-Type: multipart/mixed; boundary="dc+cDN39EJAMEtIO"
Content-Disposition: inline
--dc+cDN39EJAMEtIO
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
Hi,
I am about to commit the following patch to print/ghostscript-gpl in
order to implement another piece of ports/76731.
I would ask you to
- Update your ports collection in order to get the recent changes of
the port (pcl3 support).
=20
- Apply the attached patch and see whether there are any regressions.
Thanks in advance,
Simon
--dc+cDN39EJAMEtIO
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="gs-gpl-cups-pstoraster.diff"
Content-Transfer-Encoding: quoted-printable
Index: ghostscript-gpl/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/print/ghostscript-gpl/Makefile,v
retrieving revision 1.138
diff -u -r1.138 Makefile
--- ghostscript-gpl/Makefile 6 Jun 2005 15:00:36 -0000 1.138
+++ ghostscript-gpl/Makefile 6 Jun 2005 16:58:16 -0000
@@ -119,6 +119,9 @@
GS_SRCS=3D ${DISTNAME}${EXTRACT_SUFX}
CIDFONTDIR=3D ${PREFIX}/share/ghostscript/${GS_VERSION}/Resource
=20
+# normalize WRKSRC so things like cups-pstoraster may work
+WRKSRC=3D ${WRKDIR}/ghostscript
+
# Additional Drivers:
=20
# HP8XX - additional driver for HP DeskJet 812C/815C/832C/880C/882C/895C
@@ -241,6 +244,8 @@
=20
post-extract:
${ECHO_MSG} ">>> in post-extract ..."
+# normazile WRKSRC so things like cups-pstoraster may work
+ ${LN} -sf ${WRKDIR}/${DISTNAME} ${WRKDIR}/${PORTNAME}
# ** 3rd party driver **
# Note: don't forget to add those devices in scripts/configure,
# which update unix-gcc.mak to build gs with these new devices!
Index: ghostscript-gpl/Makefile.inc
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/print/ghostscript-gpl/Makefile.inc,v
retrieving revision 1.13
diff -u -r1.13 Makefile.inc
--- ghostscript-gpl/Makefile.inc 16 Oct 2004 07:28:33 -0000 1.13
+++ ghostscript-gpl/Makefile.inc 6 Jun 2005 16:58:16 -0000
@@ -1,5 +1,5 @@
# $FreeBSD: ports/print/ghostscript-gpl/Makefile.inc,v 1.13 2004/10/16 07:=
28:33 krion Exp $
=20
GS_VERSION=3D 8.15
-GS_REVISION=3D 0
+GS_REVISION=3D 1
GS_EPOCH=3D 0
Index: ghostscript-gpl/files/patch-lib:gs_init.ps
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/ports/print/ghostscript-gpl/files/patch-lib:gs_init.ps=
,v
retrieving revision 1.2
diff -u -r1.2 patch-lib:gs_init.ps
--- ghostscript-gpl/files/patch-lib:gs_init.ps 3 Apr 2002 02:59:13 -0000 1.2
+++ ghostscript-gpl/files/patch-lib:gs_init.ps 6 Jun 2005 16:58:16 -0000
@@ -1,6 +1,14 @@
---- lib/gs_init.ps.orig Fri Feb 1 12:25:45 2002
-+++ lib/gs_init.ps Sat Feb 9 01:42:10 2002
-@@ -1274,7 +1274,7 @@
+--- lib/gs_init.ps.orig Wed Jan 26 20:32:16 2005
++++ lib/gs_init.ps Wed Jan 26 20:31:34 2005
+@@ -140,6 +140,7 @@
+ currentdict /NOFONTPATH known /NOFONTPATH exch def
+ currentdict /NOGC known /NOGC exch def
+ currentdict /NOINTERPOLATE .knownget { /INTERPOLATE exch not def } if
++currentdict /NOMEDIAATTRS known /NOMEDIAATTRS exch def
+ currentdict /NOOUTERSAVE known /NOOUTERSAVE exch def
+ currentdict /NOPAGEPROMPT known /NOPAGEPROMPT exch def
+ currentdict /NOPAUSE known /NOPAUSE exch def
+@@ -1420,7 +1421,7 @@
% Set the default screen and BG/UCR.
/.setdefaultbgucr {
systemdict /setblackgeneration known {
@@ -9,11 +17,14 @@
} if
} bind def
/.useloresscreen { % - .useloresscreen <bool>
-@@ -1874,3 +1874,7 @@
- userdict /AGM_preserve_spots false put
+@@ -2018,6 +2019,10 @@
+ % Set up GridFitTT :
=20
- % The interpreter will run the initial procedure (start).
+ /GridFitTT where {
+
+% unofficial patch:
+% make it possible to print from within acroread pdf viewer
+/Default currenthalftone /Halftone defineresource pop
+ mark /GridFitTT 2 index /GridFitTT get .dicttomark setuserparams
+ /GridFitTT undef
+ } if
Index: ghostscript-gpl/files/patch-lib:gs_setpd.ps
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: ghostscript-gpl/files/patch-lib:gs_setpd.ps
diff -N ghostscript-gpl/files/patch-lib:gs_setpd.ps
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ ghostscript-gpl/files/patch-lib:gs_setpd.ps 6 Jun 2005 16:58:16 -0000
@@ -0,0 +1,98 @@
+--- lib/gs_setpd.ps.orig Tue Sep 14 00:32:19 2004
++++ lib/gs_setpd.ps Wed Jan 26 20:31:34 2005
+@@ -377,21 +377,42 @@
+ /MediaPosition { dup //null ne { pop //null } if } bind
+ .dicttomark readonly def
+=20
+-% Define the keys used in input attribute matching.
+-/.inputattrkeys [
+- /PageSize /MediaColor /MediaWeight /MediaType /InsertSheet
+- % The following are documented in Adobe's supplement for v2017.
+- /LeadingEdge /MediaClass
+-] readonly def
+-% Define other keys used in media selection.
+-/.inputselectionkeys [
+- /MediaPosition /Orientation
+-] readonly def
+-
+-% Define the keys used in output attribute matching.
+-/.outputattrkeys [
+- /OutputType
+-] readonly def
++% M. Sweet, Easy Software Products:
++%
++% Define NOMEDIAATTRS to turn off the default (but unimplementable) media
++% selection policies for setpagedevice. This is used by CUPS to support
++% the standard Adobe media attributes.
++NOMEDIAATTRS {
++ % Define only PageSize for input attribute matching.
++ /.inputattrkeys [
++ /PageSize
++ ] readonly def
++ % Define no other keys used in media selection.
++ /.inputselectionkeys [
++ /noInputSelectionsKeys
++ ] readonly def
++
++ % Define no keys used in output attribute matching.
++ /.outputattrkeys [
++ /noOutputAttrKeys
++ ] readonly def
++} {
++ % Define the keys used in input attribute matching.
++ /.inputattrkeys [
++ /PageSize /MediaColor /MediaWeight /MediaType /InsertSheet
++ % The following are documented in Adobe's supplement for v2017.
++ /LeadingEdge /MediaClass
++ ] readonly def
++ % Define other keys used in media selection.
++ /.inputselectionkeys [
++ /MediaPosition /Orientation
++ ] readonly def
++
++ % Define the keys used in output attribute matching.
++ /.outputattrkeys [
++ /OutputType
++ ] readonly def
++} ifelse
+=20
+ % Define all the parameters that should always be copied to the merged
+ % dictionary.
+@@ -420,7 +441,13 @@
+ /PageSize //false % obsolete alias for .MediaSize
+ /InputAttributes //false
+ .inputattrkeys
+- { dup /PageSize eq
++ % M. Sweet, Easy Software Products:
++ %
++ % Treat LeadingEdge like PageSize so that a common Ghostscript driver
++ % doesn't need the NOMEDIAATTRS definition.
++ %
++ % { dup /PageSize eq
++ { dup dup /PageSize eq exch /LeadingEdge eq or
+ { pop }
+ { { 2 index /InputAttributes .knownget { //null eq } { //true } if=
else } }
+ ifelse
+@@ -501,11 +528,22 @@
+ % They are expected to consume the top 2 operands.
+ % NOTE: we currently treat all values other than 0, 1, or 7 (for PageSize)
+ % the same as 0, i.e., we signal an error.
++%
++% M. Sweet, Easy Software Products:
++%
++% Define NOMEDIAATTRS to turn off the default (but unimplementable) media
++% selection policies for setpagedevice. This is used by CUPS to support
++% the standard Adobe media attributes.
+ 0 { % Set errorinfo and signal a configurationerror.
++ NOMEDIAATTRS {
++ % NOMEDIAATTRS means that the default policy is 7...
++ pop 2 index exch 7 put
++ } {
+ pop dup 4 index exch get 2 array astore
+ $error /errorinfo 3 -1 roll put
+ cleartomark
+ /setpagedevice load /configurationerror signalerror
++ } ifelse
+ } bind
+ 1 { % Roll back the failed request to its previous status.
+ SETPDDEBUG { (Rolling back.) =3D pstack flush } if
--dc+cDN39EJAMEtIO--
--1ccMZA6j1vT5UqiK
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (FreeBSD)
iD8DBQFCpMN9Ckn+/eutqCoRAgBXAJ9O8SLVnZbDPQn5ntzgeSv117camQCgwZyN
CI+hDf46sfxiDvoTWIb4Gsc=
=1Rqz
-----END PGP SIGNATURE-----
--1ccMZA6j1vT5UqiK--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050606214325.GA2198>