From b07eaaba7a8a3069e4af96b953fd5a2419905182 Mon Sep 17 00:00:00 2001 From: Ying-Chieh Liao Date: Sat, 27 Apr 2002 18:27:56 +0000 Subject: upgrade to 7.05 PR: 37501 Submitted by: Ports Fury --- print/ghostscript7/files/patch-eplaser:gdevescv.c | 18 ++++- print/ghostscript7/files/patch-eplaser:gdevesmv.c | 18 ++++- print/ghostscript7/files/patch-lib:gs_init.ps | 10 +-- print/ghostscript7/files/patch-lib:ps2epsi | 11 --- print/ghostscript7/files/patch-lib:ps2epsi.ps | 11 --- print/ghostscript7/files/patch-src:dviprlib.c | 20 ++--- print/ghostscript7/files/patch-src:gdevlbp8.c | 8 +- print/ghostscript7/files/patch-src:unix-dll.mak | 59 ++++++++++++++ print/ghostscript7/files/patch-src:unix-gcc.mak | 94 +++++++---------------- print/ghostscript7/files/patch-src:zmedia2.c | 26 +++---- 10 files changed, 142 insertions(+), 133 deletions(-) delete mode 100644 print/ghostscript7/files/patch-lib:ps2epsi delete mode 100644 print/ghostscript7/files/patch-lib:ps2epsi.ps create mode 100644 print/ghostscript7/files/patch-src:unix-dll.mak (limited to 'print/ghostscript7/files') diff --git a/print/ghostscript7/files/patch-eplaser:gdevescv.c b/print/ghostscript7/files/patch-eplaser:gdevescv.c index b1b6fc57f0c0..dbc3f4a109a9 100644 --- a/print/ghostscript7/files/patch-eplaser:gdevescv.c +++ b/print/ghostscript7/files/patch-eplaser:gdevescv.c @@ -1,6 +1,16 @@ --- eplaser/gdevescv.c.orig Fri Dec 21 15:50:22 2001 -+++ eplaser/gdevescv.c Fri Mar 15 04:27:39 2002 -@@ -1760,13 +1760,13 @@ ++++ eplaser/gdevescv.c Sat Apr 27 13:45:53 2002 +@@ -37,8 +37,7 @@ + + */ + +-#include +-#include ++#include + + #include "math_.h" + #include "gx.h" +@@ -1760,13 +1759,13 @@ /* Process the next piece of an image. */ private int @@ -16,7 +26,7 @@ gx_device *dev = info->dev; #endif gx_device_vector *const vdev = (gx_device_vector *) dev; -@@ -1784,7 +1784,7 @@ +@@ -1784,7 +1783,7 @@ { @@ -25,7 +35,7 @@ if (height == 260) height = 1; #endif -@@ -1922,13 +1922,13 @@ +@@ -1922,13 +1921,13 @@ private int diff --git a/print/ghostscript7/files/patch-eplaser:gdevesmv.c b/print/ghostscript7/files/patch-eplaser:gdevesmv.c index 8764eb63292f..bce92ff8358c 100644 --- a/print/ghostscript7/files/patch-eplaser:gdevesmv.c +++ b/print/ghostscript7/files/patch-eplaser:gdevesmv.c @@ -1,6 +1,16 @@ --- eplaser/gdevesmv.c.orig Fri Dec 14 10:50:14 2001 -+++ eplaser/gdevesmv.c Fri Mar 15 04:28:41 2002 -@@ -1799,13 +1799,13 @@ ++++ eplaser/gdevesmv.c Sat Apr 27 13:46:31 2002 +@@ -34,8 +34,7 @@ + + */ + +-#include +-#include ++#include + + #include "math_.h" + #include "gx.h" +@@ -1799,13 +1798,13 @@ /* Process the next piece of an image. */ private int @@ -16,7 +26,7 @@ gx_device *dev = info->dev; #endif gx_device_vector *const vdev = (gx_device_vector *) dev; -@@ -1823,7 +1823,7 @@ +@@ -1823,7 +1822,7 @@ { @@ -25,7 +35,7 @@ if (height == 260) height = 1; #endif -@@ -1980,13 +1980,13 @@ +@@ -1980,13 +1979,13 @@ private int diff --git a/print/ghostscript7/files/patch-lib:gs_init.ps b/print/ghostscript7/files/patch-lib:gs_init.ps index dd14a517967b..70de88245ddc 100644 --- a/print/ghostscript7/files/patch-lib:gs_init.ps +++ b/print/ghostscript7/files/patch-lib:gs_init.ps @@ -1,6 +1,6 @@ ---- lib/gs_init.ps.orig Tue Jun 5 16:42:40 2001 -+++ lib/gs_init.ps Wed Jun 20 04:16:46 2001 -@@ -1247,7 +1247,7 @@ +--- 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 @@ % Set the default screen and BG/UCR. /.setdefaultbgucr { systemdict /setblackgeneration known { @@ -9,8 +9,8 @@ } if } bind def /.useloresscreen { % - .useloresscreen -@@ -1799,3 +1799,7 @@ - (END GC) VMDEBUG +@@ -1874,3 +1874,7 @@ + userdict /AGM_preserve_spots false put % The interpreter will run the initial procedure (start). + diff --git a/print/ghostscript7/files/patch-lib:ps2epsi b/print/ghostscript7/files/patch-lib:ps2epsi deleted file mode 100644 index e2abdfc2574b..000000000000 --- a/print/ghostscript7/files/patch-lib:ps2epsi +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/ps2epsi.orig Wed Jan 30 01:05:36 2002 -+++ lib/ps2epsi Wed Jan 30 01:05:58 2002 -@@ -63,7 +63,7 @@ - - cat ${infile} | - sed -e '/^%%BeginPreview:/,/^%%EndPreview[^!-~]*$/d' -e '/^%!PS-Adobe/d'\ ---e '/^%%[A-Za-z][A-Za-z]*[^!-~]*$/d' -e '/^%%[A-Za-z][A-Za-z]*: /d' -+ -e '/^%%[A-Za-z][A-Za-z]*[^!-~]*$/d' -e '/^%%[A-Za-z][A-Za-z]*: /d' - - cat << ENDEPS - %%Trailer diff --git a/print/ghostscript7/files/patch-lib:ps2epsi.ps b/print/ghostscript7/files/patch-lib:ps2epsi.ps deleted file mode 100644 index 8e150354428c..000000000000 --- a/print/ghostscript7/files/patch-lib:ps2epsi.ps +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/ps2epsi.ps.orig Tue Jun 5 15:31:41 2001 -+++ lib/ps2epsi.ps Sat Apr 20 15:57:44 2002 -@@ -52,7 +52,7 @@ - /ps2epsi - { % Open the file - outfile (w) file /epsifile exch def -- //systemdict /.setsafe known { .setsafe } if -+% //systemdict /.setsafe known { .setsafe } if - % Get the device parameters - currentdevice getdeviceprops .dicttomark - /HWSize get aload pop diff --git a/print/ghostscript7/files/patch-src:dviprlib.c b/print/ghostscript7/files/patch-src:dviprlib.c index 1fc25e484764..67662665f273 100644 --- a/print/ghostscript7/files/patch-src:dviprlib.c +++ b/print/ghostscript7/files/patch-src:dviprlib.c @@ -1,23 +1,13 @@ ---- src/dviprlib.c.orig Tue May 13 00:14:09 1997 -+++ src/dviprlib.c Thu Apr 4 03:18:57 2002 -@@ -1433,7 +1433,8 @@ +--- src/dviprlib.c.orig Tue May 13 16:14:09 1997 ++++ src/dviprlib.c Mon Apr 22 23:02:58 2002 +@@ -1433,7 +1433,9 @@ char *dviprt_prtcodename[] = { CFG_PRTCODE_NAME, NULL }; char *dviprt_encodename[] = { CFG_ENCODE_NAME, NULL }; -private FILE *dviprt_messagestream = stderr; +private FILE *dviprt_messagestream; -+private int dviprt_messagestream_init; ++private void dviprt_messagestream_construct (void) __attribute__((constructor)); ++private void dviprt_messagestream_construct (void) { dviprt_messagestream = stderr; } /*--- library functions ---*/ int -@@ -1505,6 +1506,10 @@ - liblocal int - dviprt_printmessage(char *str,int len) - { -+ if (!dviprt_messagestream_init) { -+ dviprt_messagestream = stderr; -+ dviprt_messagestream_init = 1; -+ } - if (dviprt_messagestream && str) { - if (len >= 0) fwrite(str,len,1,dviprt_messagestream); - else fputs(str,dviprt_messagestream); diff --git a/print/ghostscript7/files/patch-src:gdevlbp8.c b/print/ghostscript7/files/patch-src:gdevlbp8.c index 6e5b29da5734..052492c58f6a 100644 --- a/print/ghostscript7/files/patch-src:gdevlbp8.c +++ b/print/ghostscript7/files/patch-src:gdevlbp8.c @@ -1,5 +1,5 @@ ---- src/gdevlbp8.c.orig Thu Mar 9 03:40:41 2000 -+++ src/gdevlbp8.c +--- src/gdevlbp8.c.orig Wed Aug 1 09:48:23 2001 ++++ src/gdevlbp8.c Thu Mar 14 20:56:05 2002 @@ -22,6 +22,8 @@ /* @@ -15,13 +15,13 @@ private dev_proc_print_page(lbp8_print_page); -private dev_proc_print_page(lips3_print_page); - gx_device_printer far_data gs_lbp8_device = + const gx_device_printer far_data gs_lbp8_device = prn_device(prn_std_procs, "lbp8", @@ -58,14 +59,6 @@ 0.16, 0.2, 0.32, 0.21, /* margins: left, bottom, right, top */ 1, lbp8_print_page); --gx_device_printer far_data gs_lips3_device = +-const gx_device_printer far_data gs_lips3_device = - prn_device(prn_std_procs, "lips3", - 82, /* width_10ths, 8.3" */ - 117, /* height_10ths, 11.7" */ diff --git a/print/ghostscript7/files/patch-src:unix-dll.mak b/print/ghostscript7/files/patch-src:unix-dll.mak new file mode 100644 index 000000000000..2ee0a5c3a0d1 --- /dev/null +++ b/print/ghostscript7/files/patch-src:unix-dll.mak @@ -0,0 +1,59 @@ +--- src/unix-dll.mak.orig Wed Oct 17 19:11:23 2001 ++++ src/unix-dll.mak Sat Feb 9 04:53:18 2002 +@@ -48,11 +48,9 @@ + + # shared library + GS_SONAME=lib$(GS).so +-GS_SONAME_MAJOR=$(GS_SONAME).$(GS_VERSION_MAJOR) +-GS_SONAME_MAJOR_MINOR= $(GS_SONAME).$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR) ++GS_SONAME_MAJOR=$(GS_SONAME).$(GS_SHLIB_VER) + GS_SO=$(BINDIR)/$(GS_SONAME) +-GS_SO_MAJOR=$(GS_SO).$(GS_VERSION_MAJOR) +-GS_SO_MAJOR_MINOR=$(GS_SO_MAJOR).$(GS_VERSION_MINOR) ++GS_SO_MAJOR=$(GS_SO).$(GS_SHLIB_VER) + + # Shared object is built by redefining GS_XE in a recursive make. + +@@ -60,24 +58,20 @@ + + $(GS_SO): $(GS_SO_MAJOR) + $(RM_) $(GS_SO) +- ln -s $(GS_SONAME_MAJOR_MINOR) $(GS_SO) +- +-$(GS_SO_MAJOR): $(GS_SO_MAJOR_MINOR) +- $(RM_) $(GS_SO_MAJOR) +- ln -s $(GS_SONAME_MAJOR_MINOR) $(GS_SO_MAJOR) ++ ln -s $(GS_SONAME_MAJOR) $(GS_SO) + + # Build the small Ghostscript loaders, with Gtk+ and without + + $(GSSOX_XE): $(GS_SO) $(GLSRC)dxmain.c +- $(GLCC) -g `gtk-config --cflags` -o $(GSSOX_XE) $(GLSRC)dxmain.c -L$(BINDIR) -l$(GS) `gtk-config --libs` ++ $(GLCC) `$(GTK_CONFIG) --cflags` -o $(GSSOX_XE) $(GLSRC)dxmain.c -L$(BINDIR) -l$(GS) `$(GTK_CONFIG) --libs` + + $(GSSOC_XE): $(GS_SO) $(GLSRC)dxmainc.c +- $(GLCC) -g -o $(GSSOC_XE) $(GLSRC)dxmainc.c -L$(BINDIR) -l$(GS) ++ $(GLCC) -o $(GSSOC_XE) $(GLSRC)dxmainc.c -L$(BINDIR) -l$(GS) + + # ------------------------- Recursive make targets ------------------------- # + + SODEFS=LDFLAGS='$(LDFLAGS) $(CFLAGS_SO) -shared -Wl,-soname,$(GS_SONAME_MAJOR)'\ +- GS_XE=$(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR)\ ++ GS_XE=$(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR)\ + STDIO_IMPLEMENTATION=c\ + DISPLAY_DEV=$(DD)$(SOOBJRELDIR)/display.dev\ + BINDIR=$(BINDIR)/$(SOBINRELDIR)\ +@@ -106,11 +100,9 @@ + -mkdir $(libdir) + $(INSTALL_PROGRAM) $(GSSOC) $(bindir)/$(GSSOC_XENAME) + $(INSTALL_PROGRAM) $(GSSOX) $(bindir)/$(GSSOX_XENAME) +- $(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME_MAJOR_MINOR) ++ $(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR) $(libdir)/$(GS_SONAME_MAJOR) + $(RM_) $(libdir)/$(GS_SONAME) +- ln -s $(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME) +- $(RM_) $(libdir)/$(GS_SONAME_MAJOR) +- ln -s $(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME_MAJOR) ++ ln -s $(GS_SONAME_MAJOR) $(libdir)/$(GS_SONAME) + + soinstall: install-so install-scripts install-data + diff --git a/print/ghostscript7/files/patch-src:unix-gcc.mak b/print/ghostscript7/files/patch-src:unix-gcc.mak index 626241a4d32e..2887ad8ef2e5 100644 --- a/print/ghostscript7/files/patch-src:unix-gcc.mak +++ b/print/ghostscript7/files/patch-src:unix-gcc.mak @@ -1,6 +1,6 @@ ---- src/unix-gcc.mak.orig Tue Feb 5 09:20:42 2002 -+++ src/unix-gcc.mak Fri Feb 8 05:16:49 2002 -@@ -27,14 +27,15 @@ +--- src/unix-gcc.mak.orig Sat Apr 20 07:23:09 2002 ++++ src/unix-gcc.mak Sat Apr 27 02:05:12 2002 +@@ -24,14 +24,15 @@ # source, generated intermediate file, and object directories # for the graphics library (GL) and the PostScript/PDF interpreter (PS). @@ -24,69 +24,31 @@ # Do not edit the next group of lines. -@@ -53,17 +54,17 @@ +@@ -50,11 +51,10 @@ # the directories also define the default search path for the # initialization files (gs_*.ps) and the fonts. -INSTALL = $(GLSRCDIR)/instcopy -c -INSTALL_PROGRAM = $(INSTALL) -m 755 -INSTALL_DATA = $(INSTALL) -m 644 -+INSTALL_PROGRAM = $(BSD_INSTALL_SCRIPT) -+INSTALL_DATA = $(BSD_INSTALL_DATA) ++INSTALL_PROGRAM = ${BSD_INSTALL_SCRIPT} ++INSTALL_DATA = ${BSD_INSTALL_DATA} -prefix = /usr/local -+prefix = $(PREFIX) ++prefix = ${PREFIX} exec_prefix = $(prefix) bindir = $(exec_prefix)/bin scriptdir = $(bindir) - libdir = $(exec_prefix)/lib - mandir = $(prefix)/man - man1ext = 1 -+man1dir = $(mandir)/man$(man1ext) - datadir = $(prefix)/share - gsdir = $(datadir)/ghostscript - gsdatadir = $(gsdir)/$(GS_DOT_VERSION) -@@ -103,14 +104,6 @@ - # No execution time or space penalty. - - GENOPT= --# Choose capability options. -- --# -DHAVE_MKSTEMP --# uses mkstemp instead of mktemp --# This gets rid of several security warnings that look --# ominous. Enable this if you wish to get rid of them. -- --CAPOPT= -DHAVE_MKSTEMP - - # Choose capability options. - -@@ -121,7 +114,6 @@ - - CAPOPT= -DHAVE_MKSTEMP - -- - # Define the name of the executable file. - - GS=gs -@@ -147,7 +139,7 @@ - # You may need to change this if the IJG library version changes. - # See jpeg.mak for more information. - --JSRCDIR=jpeg -+JSRCDIR=${.CURDIR}/jpeg - JVERSION=6 - - # Choose whether to use a shared version of the IJG JPEG library (-ljpeg). -@@ -167,14 +159,14 @@ - # You may need to change this if the libpng version changes. - # See libpng.mak for more information. - --PSRCDIR=libpng -+PSRCDIR=${LOCALBASE}/include - PVERSION=10012 - - # Choose whether to use a shared version of the PNG library, and if so, +@@ -142,7 +142,7 @@ + # D_MAX_BLOCKS_IN_MCU patch, and thus may not be able to read + # some older JPEG streams that violate the standard. If the JPEG + # library built from local sources, the patch will be applied. +-SHARE_JPEG=0 ++SHARE_JPEG=1 + JPEG_NAME=jpeg + + # Define the directory where the PNG library sources are stored, +@@ -157,7 +157,7 @@ # what its name is. # See gs.mak and Make.htm for more information. @@ -95,7 +57,7 @@ LIBPNG_NAME=png # Define the directory where the zlib sources are stored. -@@ -186,7 +178,7 @@ +@@ -169,7 +169,7 @@ # what its name is (usually libz, but sometimes libgz). # See gs.mak and Make.htm for more information. @@ -104,7 +66,7 @@ #ZLIB_NAME=gz ZLIB_NAME=z -@@ -197,6 +189,8 @@ +@@ -185,6 +185,8 @@ IJSSRCDIR=ijs IJSEXECTYPE=unix @@ -113,7 +75,7 @@ # Define how to build the library archives. (These are not used in any # standard configuration.) -@@ -208,7 +202,7 @@ +@@ -196,7 +198,7 @@ # Define the name of the C compiler. @@ -122,7 +84,7 @@ # Define the name of the linker for the final link step. # Normally this is the same as the C compiler. -@@ -225,9 +219,9 @@ +@@ -213,9 +215,9 @@ # Define the added flags for standard, debugging, profiling # and shared object builds. @@ -135,34 +97,34 @@ CFLAGS_SO=-fPIC # Define the other compilation flags. Add at most one of the following: -@@ -241,7 +235,7 @@ +@@ -229,7 +231,7 @@ # We don't include -ansi, because this gets in the way of the platform- # specific stuff that typically needs; nevertheless, we expect # gcc to accept ANSI-style function prototypes and function definitions. -XCFLAGS= -+XCFLAGS+=-I${.CURDIR}/gimp-print ++XCFLAGS+=-I${.CURDIR}/gimp-print -I${LOCALBASE}/include CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS) -@@ -252,7 +246,7 @@ +@@ -240,7 +242,7 @@ # -R /usr/local/xxx/lib:/usr/local/lib # giving the full path names of the shared library directories. # XLDFLAGS can be set from the command line. -XLDFLAGS= +XLDFLAGS=-L${.CURDIR}/gimp-print -L${LOCALBASE}/lib - LDFLAGS=$(XLDFLAGS) -fno-common + LDFLAGS=$(XLDFLAGS) -@@ -285,7 +279,7 @@ +@@ -273,7 +275,7 @@ # Note that x_.h expects to find the header files in $(XINCLUDE)/X11, # not in $(XINCLUDE). --XINCLUDE=-I/X11R6/include +-XINCLUDE=-I/usr/X11R6/include +XINCLUDE=-I${X11BASE}/include # Define the directory/ies and library names for the X11 library files. # XLIBDIRS is for ld and should include -L; XLIBDIR is for LD_RUN_PATH -@@ -297,12 +291,12 @@ +@@ -285,12 +287,12 @@ # Solaris and other SVR4 systems with dynamic linking probably want #XLIBDIRS=-L/usr/openwin/lib -R/usr/openwin/lib # X11R6 (on any platform) may need diff --git a/print/ghostscript7/files/patch-src:zmedia2.c b/print/ghostscript7/files/patch-src:zmedia2.c index 6e19c2ddfd8e..9033a4388085 100644 --- a/print/ghostscript7/files/patch-src:zmedia2.c +++ b/print/ghostscript7/files/patch-src:zmedia2.c @@ -1,6 +1,6 @@ ---- src/zmedia2.c.orig Tue Jun 5 15:39:08 2001 -+++ src/zmedia2.c Wed Jun 20 04:18:27 2001 -@@ -430,11 +430,17 @@ +--- src/zmedia2.c.orig Fri Apr 27 02:57:41 2001 ++++ src/zmedia2.c Fri Nov 2 04:08:16 2001 +@@ -429,11 +429,17 @@ rx = ry, ry = temp; } @@ -10,16 +10,16 @@ - if (medium->p.y < MIN_MEDIA_SIZE && my > ry) - my = ry; + /* If 'medium' is flexible, adjust 'mx' and 'my' towards 'rx' and 'ry', -+ respectively. Note that 'mx' and 'my' have just acquired the largest -+ permissible value, medium->q. */ -+ if (medium->p.x < mx) /* non-empty width range */ -+ if (rx < medium->p.x) mx = medium->p.x; /* minimum */ -+ else if (mx > rx) mx = rx; /* fits */ -+ /* else use medium->q.x, i.e., the maximum */ -+ if (medium->p.y < my) /* non-empty height range */ -+ if (ry < medium->p.y) my = medium->p.y; /* minimum */ -+ else if (my > ry) my = ry; /* fits */ -+ /* else use medium->q.y, i.e., the maximum */ ++ respectively. Note that 'mx' and 'my' have just acquired the largest ++ permissible value, medium->q. */ ++ if (medium->p.x < mx) /* non-empty width range */ ++ if (rx < medium->p.x) mx = medium->p.x; /* minimum */ ++ else if (mx > rx) mx = rx; /* fits */ ++ /* else use medium->q.x, i.e., the maximum */ ++ if (medium->p.y < my) /* non-empty height range */ ++ if (ry < medium->p.y) my = medium->p.y; /* minimum */ ++ else if (my > ry) my = ry; /* fits */ ++ /* else use medium->q.y, i.e., the maximum */ /* Translate to align the centers. */ gs_make_translation(mx / 2, my / 2, pmat); -- cgit v1.2.3