diff options
Diffstat (limited to 'print/ghostscript7-x11')
-rw-r--r-- | print/ghostscript7-x11/files/patch-src_Makefile.in (renamed from print/ghostscript7-x11/files/patch-src-Makefile.in) | 30 | ||||
-rw-r--r-- | print/ghostscript7-x11/files/patch-src_configure.ac (renamed from print/ghostscript7-x11/files/patch-src-configure.ac) | 12 | ||||
-rw-r--r-- | print/ghostscript7-x11/files/patch-src_devs.mak (renamed from print/ghostscript7-x11/files/patch-src-devs.mak) | 12 | ||||
-rw-r--r-- | print/ghostscript7-x11/files/patch-src_gconf.c (renamed from print/ghostscript7-x11/files/patch-src-gconf.c) | 6 | ||||
-rw-r--r-- | print/ghostscript7-x11/files/patch-src_gdevhl12.c | 6 | ||||
-rw-r--r-- | print/ghostscript7-x11/files/patch-src_gdevijs.c (renamed from print/ghostscript7-x11/files/patch-src-gdevijs.c) | 48 | ||||
-rw-r--r-- | print/ghostscript7-x11/files/patch-src_gdevl256.c (renamed from print/ghostscript7-x11/files/patch-src-gdevl256.c) | 6 | ||||
-rw-r--r-- | print/ghostscript7-x11/files/patch-src_gdevlbp8.c (renamed from print/ghostscript7-x11/files/patch-src:gdevlbp8.c) | 17 | ||||
-rw-r--r-- | print/ghostscript7-x11/files/patch-src_gdevpdff.c (renamed from print/ghostscript7-x11/files/patch-src:gdevpdff.c) | 11 | ||||
-rw-r--r-- | print/ghostscript7-x11/files/patch-src_gdevpdff.h (renamed from print/ghostscript7-x11/files/patch-src:gdevpdff.h) | 11 | ||||
-rw-r--r-- | print/ghostscript7-x11/files/patch-src_gdevpdfs.c (renamed from print/ghostscript7-x11/files/patch-src:gdevpdfs.c) | 8 | ||||
-rw-r--r-- | print/ghostscript7-x11/files/patch-src_gdevpdfw.c (renamed from print/ghostscript7-x11/files/patch-src:gdevpdfw.c) | 11 | ||||
-rw-r--r-- | print/ghostscript7-x11/files/patch-src_gdevpng.c (renamed from print/ghostscript7-x11/files/patch-src-gdevpng.c) | 18 | ||||
-rw-r--r-- | print/ghostscript7-x11/files/patch-src_gdevvglb.c (renamed from print/ghostscript7-x11/files/patch-src-gdevvglb.c) | 6 | ||||
-rw-r--r-- | print/ghostscript7-x11/files/patch-src_gdevxalt.c (renamed from print/ghostscript7-x11/files/patch-src-gdevxalt.c) | 6 | ||||
-rw-r--r-- | print/ghostscript7-x11/files/patch-src_genarch.c (renamed from print/ghostscript7-x11/files/patch-src:genarch.c) | 12 | ||||
-rw-r--r-- | print/ghostscript7-x11/files/patch-src_gnudevs.mak (renamed from print/ghostscript7-x11/files/patch-src-gnudevs.mak) | 6 | ||||
-rw-r--r-- | print/ghostscript7-x11/files/patch-src_gp__unix.c (renamed from print/ghostscript7-x11/files/patch-src-gp_unix.c) | 10 | ||||
-rw-r--r-- | print/ghostscript7-x11/files/patch-src_gs.mak (renamed from print/ghostscript7-x11/files/patch-src-gs.mak) | 8 | ||||
-rw-r--r-- | print/ghostscript7-x11/files/patch-src_gsalloc.c (renamed from print/ghostscript7-x11/files/patch-src-gsalloc.c) | 6 | ||||
-rw-r--r-- | print/ghostscript7-x11/files/patch-src_gsmalloc.c (renamed from print/ghostscript7-x11/files/patch-src-gsmalloc.c) | 6 | ||||
-rw-r--r-- | print/ghostscript7-x11/files/patch-src_gxclrast.c (renamed from print/ghostscript7-x11/files/patch-src-gxclrast.c) | 6 | ||||
-rw-r--r-- | print/ghostscript7-x11/files/patch-src_gxfixed.h (renamed from print/ghostscript7-x11/files/patch-src-gxfixed.h) | 6 | ||||
-rw-r--r-- | print/ghostscript7-x11/files/patch-src_gxobj.h (renamed from print/ghostscript7-x11/files/patch-src:gxobj.h) | 6 | ||||
-rw-r--r-- | print/ghostscript7-x11/files/patch-src_ibnum.c (renamed from print/ghostscript7-x11/files/patch-src-ibnum.c) | 10 | ||||
-rw-r--r-- | print/ghostscript7-x11/files/patch-src_ibnum.h (renamed from print/ghostscript7-x11/files/patch-src-ibnum.h) | 6 | ||||
-rw-r--r-- | print/ghostscript7-x11/files/patch-src_icclib.mak (renamed from print/ghostscript7-x11/files/patch-src-icclib.mak) | 6 | ||||
-rw-r--r-- | print/ghostscript7-x11/files/patch-src_idebug.c (renamed from print/ghostscript7-x11/files/patch-src-idebug.c) | 6 | ||||
-rw-r--r-- | print/ghostscript7-x11/files/patch-src_idparam.c (renamed from print/ghostscript7-x11/files/patch-src-idparam.c) | 8 | ||||
-rw-r--r-- | print/ghostscript7-x11/files/patch-src_ijs.mak (renamed from print/ghostscript7-x11/files/patch-src-ijs.mak) | 8 | ||||
-rw-r--r-- | print/ghostscript7-x11/files/patch-src_int.mak (renamed from print/ghostscript7-x11/files/patch-src-int.mak) | 8 | ||||
-rw-r--r-- | print/ghostscript7-x11/files/patch-src_iparam.c (renamed from print/ghostscript7-x11/files/patch-src-iparam.c) | 10 | ||||
-rw-r--r-- | print/ghostscript7-x11/files/patch-src_iref.h (renamed from print/ghostscript7-x11/files/patch-src-iref.h) | 6 | ||||
-rw-r--r-- | print/ghostscript7-x11/files/patch-src_iscan.c (renamed from print/ghostscript7-x11/files/patch-src-iscan.c) | 6 | ||||
-rw-r--r-- | print/ghostscript7-x11/files/patch-src_iscanbin.c (renamed from print/ghostscript7-x11/files/patch-src-iscanbin.c) | 20 | ||||
-rw-r--r-- | print/ghostscript7-x11/files/patch-src_iscannum.c (renamed from print/ghostscript7-x11/files/patch-src-iscannum.c) | 24 | ||||
-rw-r--r-- | print/ghostscript7-x11/files/patch-src_iutil.c (renamed from print/ghostscript7-x11/files/patch-src-iutil.c) | 6 | ||||
-rw-r--r-- | print/ghostscript7-x11/files/patch-src_lib.mak (renamed from print/ghostscript7-x11/files/patch-src-lib.mak) | 10 | ||||
-rw-r--r-- | print/ghostscript7-x11/files/patch-src_unix-dll.mak (renamed from print/ghostscript7-x11/files/patch-src:unix-dll.mak) | 10 | ||||
-rw-r--r-- | print/ghostscript7-x11/files/patch-src_unixinst.mak (renamed from print/ghostscript7-x11/files/patch-src-unixinst.mak) | 14 | ||||
-rw-r--r-- | print/ghostscript7-x11/files/patch-src_zarith.c (renamed from print/ghostscript7-x11/files/patch-src-zarith.c) | 10 | ||||
-rw-r--r-- | print/ghostscript7-x11/files/patch-src_zcontrol.c (renamed from print/ghostscript7-x11/files/patch-src-zcontrol.c) | 8 | ||||
-rw-r--r-- | print/ghostscript7-x11/files/patch-src_zdict.c (renamed from print/ghostscript7-x11/files/patch-src-zdict.c) | 8 | ||||
-rw-r--r-- | print/ghostscript7-x11/files/patch-src_zdps.c (renamed from print/ghostscript7-x11/files/patch-src-zdps.c) | 6 | ||||
-rw-r--r-- | print/ghostscript7-x11/files/patch-src_zfunc4.c (renamed from print/ghostscript7-x11/files/patch-src-zfunc4.c) | 6 | ||||
-rw-r--r-- | print/ghostscript7-x11/files/patch-src_zgeneric.c (renamed from print/ghostscript7-x11/files/patch-src-zgeneric.c) | 8 | ||||
-rw-r--r-- | print/ghostscript7-x11/files/patch-src_ziodev.c (renamed from print/ghostscript7-x11/files/patch-src-ziodev.c) | 6 | ||||
-rw-r--r-- | print/ghostscript7-x11/files/patch-src_zmath.c (renamed from print/ghostscript7-x11/files/patch-src-zmath.c) | 6 | ||||
-rw-r--r-- | print/ghostscript7-x11/files/patch-src_zmedia2.c (renamed from print/ghostscript7-x11/files/patch-src:zmedia2.c) | 6 | ||||
-rw-r--r-- | print/ghostscript7-x11/files/patch-src_zstack.c (renamed from print/ghostscript7-x11/files/patch-src-zstack.c) | 6 | ||||
-rw-r--r-- | print/ghostscript7-x11/files/patch-src_ztype.c (renamed from print/ghostscript7-x11/files/patch-src-ztype.c) | 8 |
51 files changed, 253 insertions, 257 deletions
diff --git a/print/ghostscript7-x11/files/patch-src-Makefile.in b/print/ghostscript7-x11/files/patch-src_Makefile.in index c615c95a9e2a..75486c028035 100644 --- a/print/ghostscript7-x11/files/patch-src-Makefile.in +++ b/print/ghostscript7-x11/files/patch-src_Makefile.in @@ -1,6 +1,6 @@ ---- src/Makefile.in.orig 2003-04-30 03:33:31.000000000 +0900 -+++ src/Makefile.in 2015-08-22 02:16:40.606012000 +0900 -@@ -50,8 +50,10 @@ +--- src/Makefile.in.orig 2003-04-29 18:33:31 UTC ++++ src/Makefile.in +@@ -50,8 +50,10 @@ PSD=$(PSGENDIR)/ # initialization files (gs_*.ps) and the fonts. INSTALL = $(GLSRCDIR)/instcopy -c @@ -13,7 +13,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ -@@ -63,6 +65,8 @@ +@@ -63,6 +65,8 @@ man1ext = 1 datadir = @datadir@ gsdir = $(datadir)/ghostscript gsdatadir = $(gsdir)/$(GS_DOT_VERSION) @@ -22,7 +22,7 @@ docdir=$(gsdatadir)/doc exdir=$(gsdatadir)/examples -@@ -142,7 +146,7 @@ +@@ -142,7 +146,7 @@ JVERSION=6 # some older JPEG streams that violate the standard. If the JPEG # library built from local sources, the patch will be applied. @@ -31,7 +31,7 @@ JPEG_NAME=jpeg # Define the directory where the PNG library sources are stored, -@@ -150,14 +154,14 @@ +@@ -150,14 +154,14 @@ JPEG_NAME=jpeg # You may need to change this if the libpng version changes. # See libpng.mak for more information. @@ -48,7 +48,7 @@ ZSRCDIR=@ZLIBDIR@ #ZLIB_NAME=gz ZLIB_NAME=z -@@ -197,15 +201,15 @@ +@@ -197,15 +201,15 @@ CC=@CC@ CCLD=$(CC) # Define the general cc flags, warnings and such. @@ -67,7 +67,7 @@ # Define the other compilation flags. Add at most one of the following: # -DBSD4_2 for 4.2bsd systems. -@@ -218,7 +222,7 @@ +@@ -218,7 +222,7 @@ CFLAGS_SO=-fPIC # We don't include -ansi, because this gets in the way of the platform- # specific stuff that <math.h> typically needs; nevertheless, we expect # gcc to accept ANSI-style function prototypes and function definitions. @@ -76,7 +76,7 @@ # defines from autoconf; note that we don't use these at present. ACDEFS=@DEFS@ -@@ -232,9 +236,9 @@ +@@ -232,9 +236,9 @@ CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(X # -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. @@ -88,7 +88,7 @@ # Define any extra libraries to link into the executable. # ISC Unix 2.2 wants -linet. -@@ -243,7 +247,7 @@ +@@ -243,7 +247,7 @@ LDFLAGS=$(XLDFLAGS) # Solaris may need -lnsl -lsocket -lposix4. # (Libraries required by individual drivers are handled automatically.) @@ -97,7 +97,7 @@ # Define the standard libraries to search at the end of linking. # Most platforms require -lpthread for the POSIX threads library; -@@ -252,10 +256,7 @@ +@@ -252,10 +256,7 @@ EXTRALIBS= # All reasonable platforms require -lm, but Rhapsody and perhaps one or # two others fold libm into libc and don't require any additional library. @@ -109,7 +109,7 @@ # Define the include switch(es) for the X11 header files. # This can be null if handled in some other way (e.g., the files are -@@ -279,9 +280,10 @@ +@@ -279,9 +280,10 @@ XINCLUDE=@X_CFLAGS@ # should be slotted into XLIBS below and X_PRE_LIBS which should go # before -lX11. We do not handle these and should, but they are empty # on most modern platforms. @@ -122,7 +122,7 @@ # Define whether this platform has floating point hardware: # FPU_TYPE=2 means floating point is faster than fixed point. -@@ -301,15 +303,19 @@ +@@ -301,15 +303,19 @@ USE_ASM=0 # primitives for this platform. # If POSIX sync primitives are used, also change the STDLIBS to include @@ -146,7 +146,7 @@ # ------ Devices and features ------ # # Choose the language feature(s) to include. See gs.mak for details. -@@ -385,6 +391,9 @@ +@@ -385,6 +391,9 @@ DEVICE_DEVS18= DEVICE_DEVS19= DEVICE_DEVS20=$(DD)cljet5.dev $(DD)cljet5c.dev @@ -156,7 +156,7 @@ # ---------------------------- End of options --------------------------- # # Define the name of the partial makefile that specifies options -- -@@ -407,6 +416,7 @@ +@@ -407,6 +416,7 @@ CC_LEAF_PG=$(CC_) # These are the specific warnings we have to turn off to compile those # specific few files that need this. We may turn off others in the future. CC_NO_WARN=$(CC_) diff --git a/print/ghostscript7-x11/files/patch-src-configure.ac b/print/ghostscript7-x11/files/patch-src_configure.ac index f95ae6826b22..625d20219c70 100644 --- a/print/ghostscript7-x11/files/patch-src-configure.ac +++ b/print/ghostscript7-x11/files/patch-src_configure.ac @@ -1,6 +1,6 @@ ---- src/configure.ac.orig 2003-04-16 22:59:56.000000000 +0900 -+++ src/configure.ac 2015-08-22 02:25:42.002266000 +0900 -@@ -8,6 +8,46 @@ +--- src/configure.ac.orig 2003-04-16 13:59:56 UTC ++++ src/configure.ac +@@ -8,6 +8,46 @@ AC_INIT AC_PREREQ(2.52) AC_CONFIG_SRCDIR(src/gs.c) @@ -47,7 +47,7 @@ dnl -------------------------------------------------- dnl Check for programs dnl -------------------------------------------------- -@@ -94,33 +134,15 @@ +@@ -94,33 +134,15 @@ dnl Check for libraries dnl -------------------------------------------------- AC_CHECK_LIB(m, cos) @@ -89,7 +89,7 @@ AC_SUBST(SHARE_LIBJPEG) AC_SUBST(LIBJPEGDIR) -@@ -211,15 +233,68 @@ +@@ -211,15 +233,68 @@ fi AC_SUBST(STPLIB) AC_SUBST(STPDEVS) @@ -163,7 +163,7 @@ dnl executible name AC_ARG_WITH(gs, AC_HELP_STRING([--with-gs=NAME], -@@ -236,6 +311,33 @@ +@@ -236,6 +311,33 @@ AC_ARG_ENABLE(compile-inits, AC_HELP_STR fi]) AC_SUBST(COMPILE_INITS) diff --git a/print/ghostscript7-x11/files/patch-src-devs.mak b/print/ghostscript7-x11/files/patch-src_devs.mak index 707b393b70dd..4b6aa33bbf6b 100644 --- a/print/ghostscript7-x11/files/patch-src-devs.mak +++ b/print/ghostscript7-x11/files/patch-src_devs.mak @@ -1,6 +1,6 @@ ---- src/devs.mak.orig 2015-08-21 21:59:44.117097000 +0900 -+++ src/devs.mak 2015-08-21 22:02:19.960434000 +0900 -@@ -405,7 +405,7 @@ +--- src/devs.mak.orig 2003-03-11 11:59:10 UTC ++++ src/devs.mak +@@ -405,7 +405,7 @@ $(DD)lvga256.dev : $(DEVS_MAK) $(lvga256 $(ADDMOD) $(DD)lvga256 -lib vga vgagl $(GLOBJ)gdevl256.$(OBJ) : $(GLSRC)gdevl256.c $(GDEV) $(memory__h) @@ -9,7 +9,7 @@ vgalib_=$(GLOBJ)gdevvglb.$(OBJ) $(GLOBJ)gdevpccm.$(OBJ) $(DD)vgalib.dev : $(DEVS_MAK) $(vgalib_) -@@ -413,7 +413,7 @@ +@@ -413,7 +413,7 @@ $(DD)vgalib.dev : $(DEVS_MAK) $(vgalib_) $(ADDMOD) $(DD)vgalib -lib vga $(GLOBJ)gdevvglb.$(OBJ) : $(GLSRC)gdevvglb.c $(GDEV) $(gdevpccm_h) $(gsparam_h) @@ -18,7 +18,7 @@ ### -------------------------- The X11 device -------------------------- ### -@@ -443,24 +443,24 @@ +@@ -443,24 +443,24 @@ GDEVX=$(GDEV) $(x__h) $(gdevx_h) $(TOP_M $(GLOBJ)gdevx.$(OBJ) : $(GLSRC)gdevx.c $(GDEVX) $(math__h) $(memory__h)\ $(gscoord_h) $(gsdevice_h) $(gsiparm2_h) $(gsmatrix_h) $(gsparam_h)\ $(gxdevmem_h) $(gxgetbit_h) $(gxiparam_h) $(gxpath_h) @@ -48,7 +48,7 @@ # Alternate X11-based devices to help debug other drivers. # x11alpha pretends to have 4 bits of alpha channel. -@@ -510,7 +510,13 @@ +@@ -510,7 +510,13 @@ $(DD)x11rg32x.dev : $(DEVS_MAK) $(DD)x11 $(GLOBJ)gdevxalt.$(OBJ) : $(GLSRC)gdevxalt.c $(GDEVX) $(math__h) $(memory__h)\ $(gsdevice_h) $(gsparam_h) $(gsstruct_h) diff --git a/print/ghostscript7-x11/files/patch-src-gconf.c b/print/ghostscript7-x11/files/patch-src_gconf.c index 4afa18c6e024..4939f12942ab 100644 --- a/print/ghostscript7-x11/files/patch-src-gconf.c +++ b/print/ghostscript7-x11/files/patch-src_gconf.c @@ -1,5 +1,5 @@ ---- src/gconf.c.orig 2003-01-17 09:49:00.000000000 +0900 -+++ src/gconf.c 2015-08-22 01:52:10.741824000 +0900 +--- src/gconf.c.orig 2003-01-17 00:49:00 UTC ++++ src/gconf.c @@ -81,7 +81,8 @@ /* Set up the device table. */ #define device_(dev) (const gx_device *)&dev, @@ -10,7 +10,7 @@ #include "gconf.h" 0 }; -@@ -149,9 +150,29 @@ +@@ -149,9 +150,29 @@ int gs_lib_device_list(const gx_device * const **plist, gs_memory_struct_type_t ** pst) { diff --git a/print/ghostscript7-x11/files/patch-src_gdevhl12.c b/print/ghostscript7-x11/files/patch-src_gdevhl12.c index 2976befa7cbe..c6fde2f981cf 100644 --- a/print/ghostscript7-x11/files/patch-src_gdevhl12.c +++ b/print/ghostscript7-x11/files/patch-src_gdevhl12.c @@ -1,6 +1,6 @@ ---- src/gdevhl12.c.orig Sun Aug 1 13:39:19 2004 -+++ src/gdevhl12.c Sun Aug 1 13:40:07 2004 -@@ -640,7 +640,7 @@ +--- src/gdevhl12.c.orig 2002-09-22 23:15:05 UTC ++++ src/gdevhl12.c +@@ -640,7 +640,7 @@ hl1250_print_page_copies(gx_device_print case TRAY_MANUAL: tray_pcl = "\033&l2H"; break; diff --git a/print/ghostscript7-x11/files/patch-src-gdevijs.c b/print/ghostscript7-x11/files/patch-src_gdevijs.c index fed73ce2599f..1affce3e86d8 100644 --- a/print/ghostscript7-x11/files/patch-src-gdevijs.c +++ b/print/ghostscript7-x11/files/patch-src_gdevijs.c @@ -1,5 +1,5 @@ ---- src/gdevijs.c.orig Fri Jan 17 09:49:00 2003 -+++ src/gdevijs.c Thu May 26 01:00:57 2005 +--- src/gdevijs.c.orig 2003-01-17 00:49:00 UTC ++++ src/gdevijs.c @@ -29,15 +29,29 @@ * which is a security risk, since any program can be run. * You should use -dSAFER which sets .LockSafetyParams to true @@ -30,7 +30,7 @@ /* This should go into gdevprn.h, or, better yet, gdevprn should acquire an API for changing resolution. */ int gdev_prn_maybe_realloc_memory(gx_device_printer *pdev, -@@ -53,6 +67,14 @@ +@@ -53,6 +67,14 @@ private dev_proc_output_page(gsijs_outpu private dev_proc_get_params(gsijs_get_params); private dev_proc_put_params(gsijs_put_params); @@ -45,7 +45,7 @@ private const gx_device_procs gsijs_procs = prn_color_params_procs(gsijs_open, gsijs_output_page, gsijs_close, gx_default_rgb_map_rgb_color, gx_default_rgb_map_color_rgb, -@@ -85,6 +107,14 @@ +@@ -85,6 +107,14 @@ struct gx_device_ijs_s { IjsClientCtx *ctx; int ijs_version; @@ -60,7 +60,7 @@ }; #define DEFAULT_DPI 74 /* See gsijs_set_resolution() below. */ -@@ -112,7 +142,12 @@ +@@ -112,7 +142,12 @@ gx_device_ijs gs_ijs_device = FALSE, /* Tumble_set */ NULL, /* IjsClient *ctx */ @@ -74,13 +74,17 @@ }; -@@ -128,12 +163,254 @@ +@@ -128,12 +163,254 @@ private int gsijs_read_string(gs_param_l /**************************************************************************/ -/* ------ Private definitions ------ */ +/* ---------------- Low-level graphic procedures ---------------- */ -+ + +-/* Versions 1.0 through 1.0.2 of hpijs report IJS version 0.29, and +- require some workarounds. When more up-to-date hpijs versions +- become ubiquitous, all these workarounds should be removed. */ +-#define HPIJS_1_0_VERSION 29 +static unsigned char xmask[] = +{ + 0x80, /* x=0 */ @@ -241,11 +245,7 @@ + int code; + + ijsdev->k_path = 1; - --/* Versions 1.0 through 1.0.2 of hpijs report IJS version 0.29, and -- require some workarounds. When more up-to-date hpijs versions -- become ubiquitous, all these workarounds should be removed. */ --#define HPIJS_1_0_VERSION 29 ++ + code = (*ijsdev->prn_procs.stroke_path)(dev, pis, ppath, params, pdcolor, pcpath); + + ijsdev->k_path = 0; @@ -334,7 +334,7 @@ private int gsijs_parse_wxh (const char *val, int size, double *pw, double *ph) -@@ -171,34 +448,6 @@ +@@ -171,34 +448,6 @@ gsijs_parse_wxh (const char *val, int si } /** @@ -369,7 +369,7 @@ * gsijs_set_generic_params: Set generic IJS parameters. **/ private int -@@ -209,9 +458,6 @@ +@@ -209,9 +458,6 @@ gsijs_set_generic_params(gx_device_ijs * int i, j; char *value; @@ -379,7 +379,7 @@ /* Split IjsParams into separate parameters and send to ijs server */ value = NULL; for (i=0, j=0; (j < ijsdev->IjsParams_size) && (i < sizeof(buf)-1); j++) { -@@ -252,68 +498,6 @@ +@@ -252,68 +498,6 @@ gsijs_set_generic_params(gx_device_ijs * } /** @@ -448,7 +448,7 @@ * gsijs_set_margin_params: Do margin negotiation with IJS server. **/ private int -@@ -324,9 +508,6 @@ +@@ -324,9 +508,6 @@ gsijs_set_margin_params(gx_device_ijs *i int i, j; char *value; @@ -458,7 +458,7 @@ /* Split IjsParams into separate parameters and send to ijs server */ value = NULL; for (i=0, j=0; (j < ijsdev->IjsParams_size) && (i < sizeof(buf)-1); j++) { -@@ -493,12 +674,18 @@ +@@ -493,12 +674,18 @@ gsijs_open(gx_device *dev) char buf[256]; bool use_outputfd; int fd = -1; @@ -477,7 +477,7 @@ /* Decide whether to use OutputFile or OutputFD. Note: how to determine this is a tricky question, so we just allow the user to set it. -@@ -513,6 +700,8 @@ +@@ -513,6 +700,8 @@ gsijs_open(gx_device *dev) if (code < 0) return code; @@ -486,7 +486,7 @@ if (use_outputfd) { /* Note: dup() may not be portable to all interesting IJS platforms. In that case, this branch should be #ifdef'ed out. -@@ -572,6 +761,9 @@ +@@ -572,6 +761,9 @@ gsijs_open(gx_device *dev) if (code >= 0) code = gsijs_set_margin_params(ijsdev); @@ -496,7 +496,7 @@ return code; }; -@@ -631,21 +823,6 @@ +@@ -631,21 +823,6 @@ gsijs_raster_width(gx_device *pdev) return min(width, end); } @@ -518,7 +518,7 @@ /* Print a page. Don't use normal printer gdev_prn_output_page * because it opens the output file. */ -@@ -656,8 +833,9 @@ +@@ -656,8 +833,9 @@ gsijs_output_page(gx_device *dev, int nu gx_device_printer *pdev = (gx_device_printer *)dev; int raster = gdev_prn_raster(pdev); int ijs_width, ijs_height; @@ -529,7 +529,7 @@ unsigned char *data; char buf[256]; double xres = pdev->HWResolution[0]; -@@ -673,13 +851,23 @@ +@@ -673,13 +851,23 @@ gsijs_output_page(gx_device *dev, int nu /* Determine bitmap width and height */ ijs_height = gdev_prn_print_scan_lines(dev); @@ -557,7 +557,7 @@ /* Required page parameters */ sprintf(buf, "%d", n_chan); gsijs_client_set_param(ijsdev, "NumChan", buf); -@@ -688,44 +876,71 @@ +@@ -688,44 +876,71 @@ gsijs_output_page(gx_device *dev, int nu /* This needs to become more sophisticated for DeviceN. */ strcpy(buf, (n_chan == 4) ? "DeviceCMYK" : @@ -649,7 +649,7 @@ gs_free_object(pdev->memory, data, "gsijs_output_page"); endcode = (pdev->buffer_space && !pdev->is_async_renderer ? -@@ -1029,7 +1244,6 @@ +@@ -1029,7 +1244,6 @@ gsijs_client_set_param(gx_device_ijs *ij dprintf2("ijs: Can't set parameter %s=%s\n", key, value); return code; } diff --git a/print/ghostscript7-x11/files/patch-src-gdevl256.c b/print/ghostscript7-x11/files/patch-src_gdevl256.c index e11d19f8c2d6..c5cbb24a93bd 100644 --- a/print/ghostscript7-x11/files/patch-src-gdevl256.c +++ b/print/ghostscript7-x11/files/patch-src_gdevl256.c @@ -1,6 +1,6 @@ ---- src/gdevl256.c.orig 2015-08-22 01:40:41.895138000 +0900 -+++ src/gdevl256.c 2015-08-22 01:40:56.016022000 +0900 -@@ -307,3 +307,12 @@ +--- src/gdevl256.c.orig 2003-01-17 00:49:00 UTC ++++ src/gdevl256.c +@@ -307,3 +307,12 @@ lvga256_draw_line(gx_device * dev, int x gl_line(x0, y0, x1, y1, color); return 0; } diff --git a/print/ghostscript7-x11/files/patch-src:gdevlbp8.c b/print/ghostscript7-x11/files/patch-src_gdevlbp8.c index 052492c58f6a..190ba3a0ad10 100644 --- a/print/ghostscript7-x11/files/patch-src:gdevlbp8.c +++ b/print/ghostscript7-x11/files/patch-src_gdevlbp8.c @@ -1,5 +1,5 @@ ---- src/gdevlbp8.c.orig Wed Aug 1 09:48:23 2001 -+++ src/gdevlbp8.c Thu Mar 14 20:56:05 2002 +--- src/gdevlbp8.c.orig 2003-01-17 00:49:00 UTC ++++ src/gdevlbp8.c @@ -22,6 +22,8 @@ /* @@ -9,7 +9,7 @@ 2.2.97 Lauri Paatero Changed CSI command into ESC [. DCS commands may still need to be changed (to ESC P). -@@ -49,7 +51,6 @@ +@@ -49,7 +51,6 @@ problems /* The device descriptors */ private dev_proc_print_page(lbp8_print_page); @@ -17,7 +17,7 @@ const gx_device_printer far_data gs_lbp8_device = prn_device(prn_std_procs, "lbp8", -@@ -58,14 +59,6 @@ +@@ -58,14 +59,6 @@ const gx_device_printer far_data gs_lbp8 0.16, 0.2, 0.32, 0.21, /* margins: left, bottom, right, top */ 1, lbp8_print_page); @@ -32,7 +32,7 @@ /* ------ Internal routines ------ */ #define ESC 0x1b -@@ -84,23 +77,6 @@ +@@ -84,23 +77,6 @@ static const char lbp8_init[] = { static const char *lbp8_end = NULL; @@ -56,15 +56,14 @@ /* Send the page to the printer. */ private int can_print_page(gx_device_printer *pdev, FILE *prn_stream, -@@ -203,11 +179,4 @@ - lbp8_print_page(gx_device_printer *pdev, FILE *prn_stream) +@@ -204,10 +180,3 @@ lbp8_print_page(gx_device_printer *pdev, { return can_print_page(pdev, prn_stream, lbp8_init, sizeof(lbp8_init), lbp8_end, sizeof(lbp8_end)); --} + } - -/* Print a LIPS III page. */ -private int -lips3_print_page(gx_device_printer *pdev, FILE *prn_stream) -{ return can_print_page(pdev, prn_stream, lips3_init, sizeof(lips3_init), - lips3_end, sizeof(lips3_end)); - } +-} diff --git a/print/ghostscript7-x11/files/patch-src:gdevpdff.c b/print/ghostscript7-x11/files/patch-src_gdevpdff.c index 8a292bd4cdec..9f4c0569e929 100644 --- a/print/ghostscript7-x11/files/patch-src:gdevpdff.c +++ b/print/ghostscript7-x11/files/patch-src_gdevpdff.c @@ -1,6 +1,6 @@ ---- src/gdevpdff.c.org 2003-01-17 09:49:02.000000000 +0900 -+++ src/gdevpdff.c 2003-09-21 05:08:36.000000000 +0900 -@@ -276,6 +276,11 @@ +--- src/gdevpdff.c.orig 2003-01-17 00:49:01 UTC ++++ src/gdevpdff.c +@@ -276,6 +276,11 @@ pdf_font_embed_status(gx_device_pdf *pde const byte *chars = font->font_name.chars; uint size = font->font_name.size; @@ -12,7 +12,7 @@ /* * The behavior of Acrobat Distiller changed between 3.0 (PDF 1.2), * which will never embed the base 14 fonts, and 4.0 (PDF 1.3), which -@@ -720,19 +725,22 @@ +@@ -720,19 +725,22 @@ pdf_create_pdf_font(gx_device_pdf *pdev, same &= ~FONT_SAME_METRICS; break; case FONT_EMBED_NO: @@ -48,7 +48,7 @@ } code = pdf_compute_font_descriptor(pdev, &fdesc, font, NULL); if (code < 0) -@@ -888,6 +896,7 @@ +@@ -888,6 +896,7 @@ pdf_create_pdf_font(gx_device_pdf *pdev, memcpy(ppf->widths_known, ftemp_widths_known, sizeof(ftemp_widths_known)); } @@ -56,4 +56,3 @@ code = pdf_register_font(pdev, font, ppf); *pppf = ppf; - diff --git a/print/ghostscript7-x11/files/patch-src:gdevpdff.h b/print/ghostscript7-x11/files/patch-src_gdevpdff.h index f64a4e02f6b8..fe2a13e9e6bd 100644 --- a/print/ghostscript7-x11/files/patch-src:gdevpdff.h +++ b/print/ghostscript7-x11/files/patch-src_gdevpdff.h @@ -1,6 +1,6 @@ ---- src/gdevpdff.h.org 2003-01-17 09:49:02.000000000 +0900 -+++ src/gdevpdff.h 2003-09-18 23:42:38.000000000 +0900 -@@ -117,6 +117,12 @@ +--- src/gdevpdff.h.orig 2003-01-17 00:49:01 UTC ++++ src/gdevpdff.h +@@ -117,6 +117,12 @@ typedef enum { FONT_SUBSET_NO } pdf_font_do_subset_t; @@ -13,7 +13,7 @@ struct pdf_font_descriptor_s { pdf_resource_common(pdf_font_descriptor_t); pdf_font_name_t FontName; -@@ -198,6 +204,7 @@ +@@ -198,6 +204,7 @@ struct pdf_font_s { gs_font *font; /* non-0 iff font will notify us; */ /* should be a weak pointer */ int index; /* in pdf_standard_fonts, -1 if not base 14 */ @@ -21,7 +21,7 @@ gs_matrix orig_matrix; /* FontMatrix of unscaled font for embedding */ bool is_MM_instance; /* for Type 1/2 fonts, true iff the font */ /* is a Multiple Master instance */ -@@ -320,12 +327,6 @@ +@@ -320,12 +327,6 @@ int pdf_do_char_image(P3(gx_device_pdf * /* ---------------- Exported by gdevpdff.c ---------------- */ @@ -34,4 +34,3 @@ typedef struct pdf_standard_font_s { const char *fname; gs_encoding_index_t base_encoding; - diff --git a/print/ghostscript7-x11/files/patch-src:gdevpdfs.c b/print/ghostscript7-x11/files/patch-src_gdevpdfs.c index 0378f15c88ab..9eaa4cc4368b 100644 --- a/print/ghostscript7-x11/files/patch-src:gdevpdfs.c +++ b/print/ghostscript7-x11/files/patch-src_gdevpdfs.c @@ -1,6 +1,6 @@ ---- src/gdevpdfs.c.org 2003-09-20 00:11:16.000000000 +0900 -+++ src/gdevpdfs.c 2003-09-25 17:44:10.000000000 +0900 -@@ -481,15 +481,21 @@ +--- src/gdevpdfs.c.orig 2003-01-17 00:49:01 UTC ++++ src/gdevpdfs.c +@@ -481,15 +481,21 @@ scan_cmap_text(gs_text_enum_t *pte, gs_f if (cid < pfd->chars_count) { int index = cid >> 3, mask = 0x80 >> (cid & 7); @@ -26,7 +26,7 @@ if (gid >= 0) { psubf->CIDToGIDMap[cid] = gid; mark_glyphs_used(subfont, gid + gs_min_cid_glyph, -@@ -500,7 +506,11 @@ +@@ -500,7 +506,11 @@ scan_cmap_text(gs_text_enum_t *pte, gs_f if (!(psubf->widths_known[index] & mask)) { int width; diff --git a/print/ghostscript7-x11/files/patch-src:gdevpdfw.c b/print/ghostscript7-x11/files/patch-src_gdevpdfw.c index a08b87d42724..9250f98bad59 100644 --- a/print/ghostscript7-x11/files/patch-src:gdevpdfw.c +++ b/print/ghostscript7-x11/files/patch-src_gdevpdfw.c @@ -1,6 +1,6 @@ ---- src/gdevpdfw.c.org 2003-01-17 09:49:02.000000000 +0900 -+++ src/gdevpdfw.c 2003-09-25 17:50:54.000000000 +0900 -@@ -348,18 +348,19 @@ +--- src/gdevpdfw.c.orig 2003-01-17 00:49:01 UTC ++++ src/gdevpdfw.c +@@ -348,18 +348,19 @@ pdf_write_CIDFont_widths(gx_device_pdf * /* Use the most common width as DW. */ { @@ -25,7 +25,7 @@ if (dw != 0) pprintd1(s, "/DW %d\n", dw); } -@@ -496,14 +497,16 @@ +@@ -496,14 +497,16 @@ pdf_write_font_resource(gx_device_pdf *p if (pdf_has_subset_prefix(chars, size)) chars += SUBSET_PREFIX_SIZE, size -= SUBSET_PREFIX_SIZE; pdf_put_name(pdev, chars, size); @@ -44,7 +44,7 @@ pprintld1(s, "/DescendantFonts[%ld 0 R]", pdf_resource_id((const pdf_resource_t *)pef->DescendantFont)); write_Widths = 0; -@@ -563,8 +566,10 @@ +@@ -563,8 +566,10 @@ pdf_write_font_resource(gx_device_pdf *p break; case -1: pdf_write_CIDFont_widths(pdev, pef); @@ -57,4 +57,3 @@ break; } if (pef->Differences) { - diff --git a/print/ghostscript7-x11/files/patch-src-gdevpng.c b/print/ghostscript7-x11/files/patch-src_gdevpng.c index 0bb66e2f046d..21e900385c2f 100644 --- a/print/ghostscript7-x11/files/patch-src-gdevpng.c +++ b/print/ghostscript7-x11/files/patch-src_gdevpng.c @@ -1,5 +1,5 @@ ---- src/gdevpng.c.orig 2003-05-15 19:05:29.000000000 +0900 -+++ src/gdevpng.c 2015-02-19 01:59:24.000000000 +0900 +--- src/gdevpng.c.orig 2003-05-15 10:05:29 UTC ++++ src/gdevpng.c @@ -41,12 +41,6 @@ #include "gdevpccm.h" #include "gscdefs.h" @@ -13,7 +13,7 @@ /* * Earlier libpng versions require disabling FILE * I/O altogether. * This produces a compiler warning about no prototype for png_init_io. -@@ -258,7 +252,7 @@ +@@ -258,7 +252,7 @@ png_print_page(gx_device_printer * pdev, goto done; } /* set error handling */ @@ -22,7 +22,7 @@ /* If we get here, we had a problem reading the file */ code = gs_note_error(gs_error_VMerror); goto done; -@@ -268,19 +262,12 @@ +@@ -268,19 +262,12 @@ png_print_page(gx_device_printer * pdev, png_init_io(png_ptr, file); /* set the file information here */ @@ -46,7 +46,7 @@ png_set_invert_alpha(png_ptr); { gx_device_pngalpha *ppdev = (gx_device_pngalpha *)pdev; png_color_16 background; -@@ -292,51 +279,68 @@ +@@ -292,51 +279,68 @@ png_print_page(gx_device_printer * pdev, png_set_bKGD(png_ptr, info_ptr, &background); } break; @@ -139,7 +139,7 @@ } /* add comment */ strncpy(software_key, "Software", sizeof(software_key)); -@@ -346,15 +350,16 @@ +@@ -346,15 +350,16 @@ png_print_page(gx_device_printer * pdev, text_png.key = software_key; text_png.text = software_text; text_png.text_length = strlen(software_text); @@ -158,7 +158,7 @@ /* Write the contents of the image. */ for (y = 0; y < height; y++) { -@@ -365,8 +370,10 @@ +@@ -365,8 +370,10 @@ png_print_page(gx_device_printer * pdev, /* write the rest of the file */ png_write_end(png_ptr, info_ptr); @@ -169,7 +169,7 @@ done: /* free the structures */ -@@ -376,6 +383,7 @@ +@@ -376,6 +383,7 @@ png_print_page(gx_device_printer * pdev, return code; } @@ -177,7 +177,7 @@ /* * Patch around a static reference to a never-used procedure. * This could be avoided if we were willing to edit pngconf.h to -@@ -393,6 +401,7 @@ +@@ -393,6 +401,7 @@ png_push_fill_buffer(png_structp png_ptr { } #endif diff --git a/print/ghostscript7-x11/files/patch-src-gdevvglb.c b/print/ghostscript7-x11/files/patch-src_gdevvglb.c index bdacbfbbfca0..51d1a7f39c79 100644 --- a/print/ghostscript7-x11/files/patch-src-gdevvglb.c +++ b/print/ghostscript7-x11/files/patch-src_gdevvglb.c @@ -1,6 +1,6 @@ ---- src/gdevvglb.c.orig 2015-08-22 01:41:20.966252000 +0900 -+++ src/gdevvglb.c 2015-08-22 01:41:35.725091000 +0900 -@@ -373,3 +373,12 @@ +--- src/gdevvglb.c.orig 2003-01-17 00:49:02 UTC ++++ src/gdevvglb.c +@@ -373,3 +373,12 @@ vgalib_put_params(gx_device * dev, gs_pa } return 0; } diff --git a/print/ghostscript7-x11/files/patch-src-gdevxalt.c b/print/ghostscript7-x11/files/patch-src_gdevxalt.c index 4d9a88b43fb4..023fad7e2e89 100644 --- a/print/ghostscript7-x11/files/patch-src-gdevxalt.c +++ b/print/ghostscript7-x11/files/patch-src_gdevxalt.c @@ -1,5 +1,5 @@ ---- src/gdevxalt.c.orig 2015-08-22 01:42:12.291619000 +0900 -+++ src/gdevxalt.c 2015-08-22 01:42:53.871222000 +0900 +--- src/gdevxalt.c.orig 2003-01-17 00:49:02 UTC ++++ src/gdevxalt.c @@ -30,6 +30,7 @@ #include "gdevx.h" @@ -8,7 +8,7 @@ /* * Define a forwarding device with a cache for the first 16 colors, -@@ -957,3 +958,20 @@ +@@ -957,3 +958,20 @@ x_rg32x_alt_map_color(gx_device * dev, g rgb[2] = ((color >> 11) & 0x3ff) * gx_max_color_value / 0x3ff; return -1; } diff --git a/print/ghostscript7-x11/files/patch-src:genarch.c b/print/ghostscript7-x11/files/patch-src_genarch.c index a015e69e758a..e7a7d84acc52 100644 --- a/print/ghostscript7-x11/files/patch-src:genarch.c +++ b/print/ghostscript7-x11/files/patch-src_genarch.c @@ -1,6 +1,6 @@ ---- src/genarch.c.orig Tue Jun 5 15:38:57 2001 -+++ src/genarch.c Wed Jun 20 04:17:42 2001 -@@ -41,6 +41,7 @@ +--- src/genarch.c.orig 2003-01-17 00:49:02 UTC ++++ src/genarch.c +@@ -40,6 +40,7 @@ section(FILE * f, const char *str) fprintf(f, "\n\t /* ---------------- %s ---------------- */\n\n", str); } @@ -8,7 +8,7 @@ private clock_t time_clear(char *buf, int bsize, int nreps) { -@@ -51,6 +52,7 @@ +@@ -50,6 +51,7 @@ time_clear(char *buf, int bsize, int nre memset(buf, 0, bsize); return clock() - t; } @@ -16,7 +16,7 @@ private void define(FILE *f, const char *str) -@@ -181,6 +183,7 @@ +@@ -180,6 +182,7 @@ main(int argc, char *argv[]) fprintf(f, "((unsigned long)~0L + (unsigned long)0)\n"); #undef PRINT_MAX @@ -24,7 +24,7 @@ section(f, "Cache sizes"); /* -@@ -241,6 +244,7 @@ +@@ -240,6 +243,7 @@ main(int argc, char *argv[]) } define_int(f, "ARCH_CACHE2_SIZE", bsize >> 1); } diff --git a/print/ghostscript7-x11/files/patch-src-gnudevs.mak b/print/ghostscript7-x11/files/patch-src_gnudevs.mak index d6e15432bf52..3b9eddcaf4b8 100644 --- a/print/ghostscript7-x11/files/patch-src-gnudevs.mak +++ b/print/ghostscript7-x11/files/patch-src_gnudevs.mak @@ -1,6 +1,6 @@ ---- src/gnudevs.mak.orig 2003-02-10 03:12:48.000000000 +0900 -+++ src/gnudevs.mak 2015-08-22 00:20:45.754922000 +0900 -@@ -66,64 +66,6 @@ +--- src/gnudevs.mak.orig 2003-02-09 18:12:48 UTC ++++ src/gnudevs.mak +@@ -66,64 +66,6 @@ sxlcrt_=$(GLOBJ)gdevln03.$(OBJ) $(DD)sxlcrt.dev : $(sxlcrt_) $(DD)page.dev $(SETPDEV) $(DD)sxlcrt $(sxlcrt_) diff --git a/print/ghostscript7-x11/files/patch-src-gp_unix.c b/print/ghostscript7-x11/files/patch-src_gp__unix.c index 85f56e3cc021..b346bdcce4d2 100644 --- a/print/ghostscript7-x11/files/patch-src-gp_unix.c +++ b/print/ghostscript7-x11/files/patch-src_gp__unix.c @@ -1,6 +1,6 @@ ---- src/gp_unix.c.orig 2003-01-17 09:49:02.000000000 +0900 -+++ src/gp_unix.c 2015-08-22 01:54:32.507486000 +0900 -@@ -41,11 +41,60 @@ +--- src/gp_unix.c.orig 2003-01-17 00:49:02 UTC ++++ src/gp_unix.c +@@ -41,11 +41,60 @@ extern char *getenv(P1(const char *)); #endif @@ -61,7 +61,7 @@ /* Do platform-dependent cleanup. */ void -@@ -57,6 +106,7 @@ +@@ -57,6 +106,7 @@ gp_exit(int exit_status, int code) void gp_do_exit(int exit_status) { @@ -69,7 +69,7 @@ } /* ------ Miscellaneous ------ */ -@@ -67,7 +117,11 @@ +@@ -67,7 +117,11 @@ gp_do_exit(int exit_status) const char * gp_strerror(int errnum) { diff --git a/print/ghostscript7-x11/files/patch-src-gs.mak b/print/ghostscript7-x11/files/patch-src_gs.mak index a9ee54700595..3f5654dd8710 100644 --- a/print/ghostscript7-x11/files/patch-src-gs.mak +++ b/print/ghostscript7-x11/files/patch-src_gs.mak @@ -1,6 +1,6 @@ ---- src/gs.mak.orig 2015-08-21 22:03:26.487964000 +0900 -+++ src/gs.mak 2015-08-21 22:04:09.624656000 +0900 -@@ -235,7 +235,7 @@ +--- src/gs.mak.orig 2003-01-28 12:02:09 UTC ++++ src/gs.mak +@@ -235,7 +235,7 @@ GENINIT_XE=$(AUXGEN)geninit$(XEAUX) gconfig_h=$(GLGENDIR)$(D)gconfxx.h gconfigf_h=$(GLGENDIR)$(D)gconfxc.h @@ -9,7 +9,7 @@ $(NO_OP) # the distclean and maintainer-clean targets (if any) -@@ -248,6 +248,7 @@ +@@ -248,6 +248,7 @@ realclean : clean clean : mostlyclean $(RM_) $(GSGEN)arch.h $(RM_) $(GS_XE) diff --git a/print/ghostscript7-x11/files/patch-src-gsalloc.c b/print/ghostscript7-x11/files/patch-src_gsalloc.c index 7c29a14eeada..3741352e2409 100644 --- a/print/ghostscript7-x11/files/patch-src-gsalloc.c +++ b/print/ghostscript7-x11/files/patch-src_gsalloc.c @@ -1,6 +1,6 @@ ---- src/gsalloc.c.orig 2013-04-30 11:14:17.000000000 +0900 -+++ src/gsalloc.c 2013-04-30 11:14:34.000000000 +0900 -@@ -195,7 +195,7 @@ +--- src/gsalloc.c.orig 2003-01-17 00:49:02 UTC ++++ src/gsalloc.c +@@ -195,7 +195,7 @@ ialloc_alloc_state(gs_raw_memory_t * par iimem->large_size = ((chunk_size / 4) & -obj_align_mod) + 1; iimem->is_controlled = false; iimem->gc_status.vm_threshold = chunk_size * 3L; diff --git a/print/ghostscript7-x11/files/patch-src-gsmalloc.c b/print/ghostscript7-x11/files/patch-src_gsmalloc.c index 9b4d97da3844..687d68768d0d 100644 --- a/print/ghostscript7-x11/files/patch-src-gsmalloc.c +++ b/print/ghostscript7-x11/files/patch-src_gsmalloc.c @@ -1,6 +1,6 @@ ---- src/gsmalloc.c.orig 2015-07-24 09:55:54.032137000 +0900 -+++ src/gsmalloc.c 2015-07-24 09:57:15.070246000 +0900 -@@ -170,7 +170,7 @@ +--- src/gsmalloc.c.orig 2003-01-17 00:49:03 UTC ++++ src/gsmalloc.c +@@ -170,7 +170,7 @@ gs_heap_alloc_bytes(gs_memory_t * mem, u } else { uint added = size + sizeof(gs_malloc_block_t); diff --git a/print/ghostscript7-x11/files/patch-src-gxclrast.c b/print/ghostscript7-x11/files/patch-src_gxclrast.c index 59d5053ad305..8acf4ca384e5 100644 --- a/print/ghostscript7-x11/files/patch-src-gxclrast.c +++ b/print/ghostscript7-x11/files/patch-src_gxclrast.c @@ -1,6 +1,6 @@ ---- src/gxclrast.c.orig 2013-04-30 09:13:13.000000000 +0900 -+++ src/gxclrast.c 2013-04-30 09:13:41.000000000 +0900 -@@ -87,10 +87,10 @@ +--- src/gxclrast.c.orig 2003-01-17 00:49:03 UTC ++++ src/gxclrast.c +@@ -87,10 +87,10 @@ cmd_print_bits(const byte * data, int wi private long cmd_get_w(const byte * p, const byte ** rp) { diff --git a/print/ghostscript7-x11/files/patch-src-gxfixed.h b/print/ghostscript7-x11/files/patch-src_gxfixed.h index 0988ca612c9b..991ab095762e 100644 --- a/print/ghostscript7-x11/files/patch-src-gxfixed.h +++ b/print/ghostscript7-x11/files/patch-src_gxfixed.h @@ -1,5 +1,5 @@ ---- src/gxfixed.h.orig 2013-04-30 11:29:39.000000000 +0900 -+++ src/gxfixed.h 2013-04-30 11:31:03.000000000 +0900 +--- src/gxfixed.h.orig 2003-01-17 00:49:03 UTC ++++ src/gxfixed.h @@ -27,12 +27,22 @@ * quantities: integers lose accuracy in crucial places, * and floating point arithmetic is slow. @@ -28,7 +28,7 @@ #define fixed_0 0L #define fixed_epsilon 1L /* -@@ -120,13 +130,8 @@ +@@ -120,13 +130,8 @@ typedef ulong ufixed; /* only used in a #define fixed_truncated(x) ((x) < 0 ? fixed_ceiling(x) : fixed_floor(x)) /* Define the largest and smallest integer values that fit in a fixed. */ diff --git a/print/ghostscript7-x11/files/patch-src:gxobj.h b/print/ghostscript7-x11/files/patch-src_gxobj.h index f0df8565100c..c2ff485ac101 100644 --- a/print/ghostscript7-x11/files/patch-src:gxobj.h +++ b/print/ghostscript7-x11/files/patch-src_gxobj.h @@ -1,6 +1,6 @@ ---- src/gxobj.h.orig Fri Feb 22 19:45:59 2002 -+++ src/gxobj.h Thu Dec 19 00:16:57 2002 -@@ -99,10 +99,14 @@ +--- src/gxobj.h.orig 2003-01-17 00:49:04 UTC ++++ src/gxobj.h +@@ -101,10 +101,14 @@ typedef struct obj_header_data_s { * The final | is because back pointer values are divided by obj_back_scale, * so objects must be aligned at least 0 mod obj_back_scale. */ diff --git a/print/ghostscript7-x11/files/patch-src-ibnum.c b/print/ghostscript7-x11/files/patch-src_ibnum.c index 2df0a7d138c7..a847a45a6174 100644 --- a/print/ghostscript7-x11/files/patch-src-ibnum.c +++ b/print/ghostscript7-x11/files/patch-src_ibnum.c @@ -1,6 +1,6 @@ ---- src/ibnum.c.orig 2003-01-17 09:49:04.000000000 +0900 -+++ src/ibnum.c 2013-04-30 11:18:27.000000000 +0900 -@@ -124,11 +124,11 @@ +--- src/ibnum.c.orig 2003-01-17 00:49:04 UTC ++++ src/ibnum.c +@@ -124,11 +124,11 @@ sdecode_number(const byte * str, int for case num_int32: case num_int32 + 16: if ((format & 31) == 0) { @@ -14,7 +14,7 @@ binary_scale[format & 31]; return t_real; } -@@ -171,18 +171,14 @@ +@@ -171,18 +171,14 @@ sdecodeshort(const byte * p, int format) } /* Decode a (32-bit, signed) long. */ @@ -38,7 +38,7 @@ return v; } -@@ -190,7 +186,7 @@ +@@ -190,7 +186,7 @@ sdecodelong(const byte * p, int format) float sdecodefloat(const byte * p, int format) { diff --git a/print/ghostscript7-x11/files/patch-src-ibnum.h b/print/ghostscript7-x11/files/patch-src_ibnum.h index ffec70cac2ae..4f4aaa6496c0 100644 --- a/print/ghostscript7-x11/files/patch-src-ibnum.h +++ b/print/ghostscript7-x11/files/patch-src_ibnum.h @@ -1,6 +1,6 @@ ---- src/ibnum.h.orig 2013-04-30 10:50:12.000000000 +0900 -+++ src/ibnum.h 2013-04-30 10:50:29.000000000 +0900 -@@ -60,7 +60,7 @@ +--- src/ibnum.h.orig 2003-01-17 00:49:04 UTC ++++ src/ibnum.h +@@ -60,7 +60,7 @@ int num_array_get(P4(const ref *, int, u int sdecode_number(P3(const byte *, int, ref *)); int sdecodeshort(P2(const byte *, int)); uint sdecodeushort(P2(const byte *, int)); diff --git a/print/ghostscript7-x11/files/patch-src-icclib.mak b/print/ghostscript7-x11/files/patch-src_icclib.mak index a60ef670dfa2..799053e840ce 100644 --- a/print/ghostscript7-x11/files/patch-src-icclib.mak +++ b/print/ghostscript7-x11/files/patch-src_icclib.mak @@ -1,6 +1,6 @@ ---- src/icclib.mak.orig 2013-04-30 02:10:16.000000000 +0900 -+++ src/icclib.mak 2013-04-30 02:10:26.000000000 +0900 -@@ -73,7 +73,7 @@ +--- src/icclib.mak.orig 2003-01-17 00:49:04 UTC ++++ src/icclib.mak +@@ -73,7 +73,7 @@ $(ICCGEN)icclib.dev : $(ICCLIB_MAK) $(EC icc_h=$(ICCSRC)$(D)icc.h $(ICCSRC)$(D)icc$(ICCPROFVER).h diff --git a/print/ghostscript7-x11/files/patch-src-idebug.c b/print/ghostscript7-x11/files/patch-src_idebug.c index 142926b4474b..fd571d6f3ffe 100644 --- a/print/ghostscript7-x11/files/patch-src-idebug.c +++ b/print/ghostscript7-x11/files/patch-src_idebug.c @@ -1,6 +1,6 @@ ---- src/idebug.c.orig 2013-04-30 11:06:57.000000000 +0900 -+++ src/idebug.c 2013-04-30 11:07:09.000000000 +0900 -@@ -90,7 +90,7 @@ +--- src/idebug.c.orig 2003-01-17 00:49:04 UTC ++++ src/idebug.c +@@ -90,7 +90,7 @@ debug_print_full_ref(const ref * pref) case t_fontID: goto strct; case t_integer: diff --git a/print/ghostscript7-x11/files/patch-src-idparam.c b/print/ghostscript7-x11/files/patch-src_idparam.c index 636d7c16b510..21035471f01e 100644 --- a/print/ghostscript7-x11/files/patch-src-idparam.c +++ b/print/ghostscript7-x11/files/patch-src_idparam.c @@ -1,6 +1,6 @@ ---- src/idparam.c.orig 2013-04-30 10:54:55.000000000 +0900 -+++ src/idparam.c 2013-04-30 10:55:23.000000000 +0900 -@@ -61,8 +61,7 @@ +--- src/idparam.c.orig 2003-01-17 00:49:04 UTC ++++ src/idparam.c +@@ -61,8 +61,7 @@ dict_int_null_param(const ref * pdict, c int maxval, int defaultval, int *pvalue) { ref *pdval; @@ -10,7 +10,7 @@ if (pdict == 0 || dict_find_string(pdict, kstr, &pdval) <= 0) { ival = defaultval; -@@ -349,7 +348,7 @@ +@@ -349,7 +348,7 @@ dict_uid_param(const ref * pdict, gs_uid } else { if (!r_has_type(puniqueid, t_integer) || puniqueid->value.intval < 0 || diff --git a/print/ghostscript7-x11/files/patch-src-ijs.mak b/print/ghostscript7-x11/files/patch-src_ijs.mak index be8ee7807ac5..0f85a8ca35fe 100644 --- a/print/ghostscript7-x11/files/patch-src-ijs.mak +++ b/print/ghostscript7-x11/files/patch-src_ijs.mak @@ -1,6 +1,6 @@ ---- src/ijs.mak.orig 2003-01-17 09:49:04.000000000 +0900 -+++ src/ijs.mak 2013-04-30 02:24:08.000000000 +0900 -@@ -66,7 +66,7 @@ +--- src/ijs.mak.orig 2003-01-17 00:49:04 UTC ++++ src/ijs.mak +@@ -66,7 +66,7 @@ ijs_h=$(IJSSRC)ijs.h ijs_client_h=$(IJSSRC)$(D)ijs_client.h ijs_server_h=$(IJSSRC)$(D)ijs_server.h @@ -9,7 +9,7 @@ # echo $(IJS_CCFLAGS) $(EXP)$(ECHOGS_XE) $(IJS_CCFLAGS) $(IJS_CC) $(IJSO_)ijs.$(OBJ) $(C_) $(IJSSRC)ijs.c -@@ -79,7 +79,7 @@ +@@ -79,7 +79,7 @@ $(IJSOBJ)ijs_server.$(OBJ) : $(IJSSRC)ij $(IJSDEP) $(ijs_h) $(ijs_server_h) $(IJS_CC) $(IJSO_)ijs_server.$(OBJ) $(C_) $(IJSSRC)ijs_server.c diff --git a/print/ghostscript7-x11/files/patch-src-int.mak b/print/ghostscript7-x11/files/patch-src_int.mak index 9e4c5a2c7663..01b748aeba23 100644 --- a/print/ghostscript7-x11/files/patch-src-int.mak +++ b/print/ghostscript7-x11/files/patch-src_int.mak @@ -1,6 +1,6 @@ ---- src/int.mak.orig 2013-04-30 02:55:45.000000000 +0900 -+++ src/int.mak 2013-04-30 02:56:06.000000000 +0900 -@@ -953,10 +953,10 @@ +--- src/int.mak.orig 2003-01-17 00:49:04 UTC ++++ src/int.mak +@@ -953,10 +953,10 @@ $(PSOBJ)iccfont.$(OBJ) : $(PSSRC)iccfont # We select either iccinit0 or iccinit1 depending on COMPILE_INITS. @@ -13,7 +13,7 @@ $(CP_) $(PSOBJ)gs_init.$(OBJ) $(PSOBJ)iccinit1.$(OBJ) # All the gs_*.ps files should be prerequisites of gs_init.c, -@@ -964,7 +964,7 @@ +@@ -964,7 +964,7 @@ $(PSOBJ)iccinit1.$(OBJ) : $(PSOBJ)gs_ini $(PSGEN)gs_init.c : $(PSLIB)$(GS_INIT) $(GENINIT_XE) $(gconfig_h) $(EXP)$(GENINIT_XE) -I $(PSLIB) $(GS_INIT) $(gconfig_h) -c $(PSGEN)gs_init.c diff --git a/print/ghostscript7-x11/files/patch-src-iparam.c b/print/ghostscript7-x11/files/patch-src_iparam.c index b0bb91a4d3ef..7407e2e98968 100644 --- a/print/ghostscript7-x11/files/patch-src-iparam.c +++ b/print/ghostscript7-x11/files/patch-src_iparam.c @@ -1,6 +1,6 @@ ---- src/iparam.c.orig 2013-04-30 11:12:36.000000000 +0900 -+++ src/iparam.c 2013-04-30 11:13:07.000000000 +0900 -@@ -67,7 +67,7 @@ +--- src/iparam.c.orig 2003-01-17 00:49:04 UTC ++++ src/iparam.c +@@ -67,7 +67,7 @@ ref_to_key(const ref * pref, gs_param_ke int len; byte *buf; @@ -9,7 +9,7 @@ len = strlen(istr); /* GC will take care of freeing this: */ buf = gs_alloc_string(plist->memory, len, "ref_to_key"); -@@ -394,7 +394,7 @@ +@@ -394,7 +394,7 @@ stack_param_enumerate(iparam_list * plis { int code; stack_param_list *const splist = (stack_param_list *) plist; @@ -18,7 +18,7 @@ ref *stack_element; do { -@@ -563,12 +563,6 @@ +@@ -563,12 +563,6 @@ ref_param_read_int_array(gs_param_list * code = gs_note_error(e_typecheck); break; } diff --git a/print/ghostscript7-x11/files/patch-src-iref.h b/print/ghostscript7-x11/files/patch-src_iref.h index 33313d38047b..a2d9d77e775d 100644 --- a/print/ghostscript7-x11/files/patch-src-iref.h +++ b/print/ghostscript7-x11/files/patch-src_iref.h @@ -1,6 +1,6 @@ ---- src/iref.h.orig 2013-04-30 11:13:29.000000000 +0900 -+++ src/iref.h 2013-04-30 11:13:41.000000000 +0900 -@@ -441,7 +441,7 @@ +--- src/iref.h.orig 2003-01-17 00:49:04 UTC ++++ src/iref.h +@@ -441,7 +441,7 @@ struct ref_s { #define r_set_ptr(rp,ptr) ((rp)->value.pstruct = (obj_header_t *)(ptr)) union v { /* name the union to keep gdb happy */ diff --git a/print/ghostscript7-x11/files/patch-src-iscan.c b/print/ghostscript7-x11/files/patch-src_iscan.c index cd8b03f6ab56..696ab0d60de8 100644 --- a/print/ghostscript7-x11/files/patch-src-iscan.c +++ b/print/ghostscript7-x11/files/patch-src_iscan.c @@ -1,6 +1,6 @@ ---- src/iscan.c.orig 2013-04-30 10:47:49.000000000 +0900 -+++ src/iscan.c 2013-04-30 10:48:19.000000000 +0900 -@@ -635,7 +635,7 @@ +--- src/iscan.c.orig 2003-01-17 00:49:04 UTC ++++ src/iscan.c +@@ -635,7 +635,7 @@ scan_token(i_ctx_t *i_ctx_p, stream * s, uint size = ref_stack_count_inline(&o_stack) - pstack; ref arr; diff --git a/print/ghostscript7-x11/files/patch-src-iscanbin.c b/print/ghostscript7-x11/files/patch-src_iscanbin.c index 1f39c88b7209..f256e453c5b4 100644 --- a/print/ghostscript7-x11/files/patch-src-iscanbin.c +++ b/print/ghostscript7-x11/files/patch-src_iscanbin.c @@ -1,6 +1,6 @@ ---- src/iscanbin.c.orig 2013-04-30 10:51:53.000000000 +0900 -+++ src/iscanbin.c 2013-04-30 10:53:42.000000000 +0900 -@@ -173,7 +173,7 @@ +--- src/iscanbin.c.orig 2003-01-17 00:49:04 UTC ++++ src/iscanbin.c +@@ -173,7 +173,7 @@ scan_binary_token(i_ctx_t *i_ctx_p, stre pbs->num_format = num_format; if (top_size == 0) { /* Extended header (2-byte array size, 4-byte length) */ @@ -9,7 +9,7 @@ if (rcnt < 7) { s_end_inline(s, p - 1, rlimit); -@@ -183,7 +183,7 @@ +@@ -183,7 +183,7 @@ scan_binary_token(i_ctx_t *i_ctx_p, stre if (p[1] != 0) /* reserved, must be 0 */ return_error(e_syntaxerror); top_size = sdecodeushort(p + 2, num_format); @@ -18,7 +18,7 @@ if ((size = lsize) != lsize) return_error(e_limitcheck); hsize = 8; -@@ -445,8 +445,7 @@ +@@ -445,8 +445,7 @@ scan_bos_continue(i_ctx_t *i_ctx_p, regi for (; index < max_array_index; p += SIZEOF_BIN_SEQ_OBJ, index++) { ref *op = abase + index; uint osize; @@ -28,7 +28,7 @@ s_end_inline(s, p, rlimit); /* in case of error */ if (rlimit - p < SIZEOF_BIN_SEQ_OBJ) { -@@ -464,14 +463,14 @@ +@@ -464,14 +463,14 @@ scan_bos_continue(i_ctx_t *i_ctx_p, regi make_null(op); break; case BS_TYPE_INTEGER: @@ -45,7 +45,7 @@ vreal = (float)ldexp((double)value, -osize); } else { vreal = sdecodefloat(p + 5, num_format); -@@ -480,7 +479,7 @@ +@@ -480,7 +479,7 @@ scan_bos_continue(i_ctx_t *i_ctx_p, regi break; } case BS_TYPE_BOOLEAN: @@ -54,7 +54,7 @@ break; case BS_TYPE_STRING: osize = sdecodeushort(p + 3, num_format); -@@ -492,7 +491,7 @@ +@@ -492,7 +491,7 @@ scan_bos_continue(i_ctx_t *i_ctx_p, regi make_empty_string(op, attrs); break; } @@ -63,7 +63,7 @@ if (value < max_array_index * SIZEOF_BIN_SEQ_OBJ || value + osize > size ) -@@ -524,7 +523,7 @@ +@@ -524,7 +523,7 @@ scan_bos_continue(i_ctx_t *i_ctx_p, regi /* falls through */ case BS_TYPE_NAME: osize = sdecodeushort(p + 3, num_format); @@ -72,7 +72,7 @@ switch (osize) { case 0: code = array_get(user_names_p, value, op); -@@ -546,7 +545,7 @@ +@@ -546,7 +545,7 @@ scan_bos_continue(i_ctx_t *i_ctx_p, regi osize = sdecodeushort(p + 3, num_format); atype = t_array; arr: diff --git a/print/ghostscript7-x11/files/patch-src-iscannum.c b/print/ghostscript7-x11/files/patch-src_iscannum.c index 4a69664074a6..592dbbece941 100644 --- a/print/ghostscript7-x11/files/patch-src-iscannum.c +++ b/print/ghostscript7-x11/files/patch-src_iscannum.c @@ -1,6 +1,6 @@ ---- src/iscannum.c.orig 2003-01-17 09:49:04.000000000 +0900 -+++ src/iscannum.c 2013-04-30 11:17:14.000000000 +0900 -@@ -57,7 +57,6 @@ +--- src/iscannum.c.orig 2003-01-17 00:49:04 UTC ++++ src/iscannum.c +@@ -57,7 +57,6 @@ scan_number(const byte * str, const byte }; int ival; @@ -8,7 +8,7 @@ double dval; int exp10; int code = 0; -@@ -104,8 +103,26 @@ +@@ -104,8 +103,26 @@ scan_number(const byte * str, const byte GET_NEXT(c, sp, goto iret); if (!IS_DIGIT(d, c)) break; @@ -37,7 +37,7 @@ } ind: /* We saw a non-digit while accumulating an integer in ival. */ switch (c) { -@@ -116,6 +133,8 @@ +@@ -116,6 +133,8 @@ scan_number(const byte * str, const byte *psp = sp; code = 1; break; @@ -46,7 +46,7 @@ case 'e': case 'E': if (sign < 0) -@@ -125,8 +144,8 @@ +@@ -125,8 +144,8 @@ scan_number(const byte * str, const byte goto fe; case '#': { @@ -57,7 +57,7 @@ if (sign || radix < min_radix || radix > max_radix) return_error(e_syntaxerror); -@@ -136,19 +155,19 @@ +@@ -136,19 +155,19 @@ scan_number(const byte * str, const byte switch (radix) { case 2: @@ -82,7 +82,7 @@ break; default: /* can't happen */ return_error(e_rangecheck); -@@ -161,13 +180,13 @@ +@@ -161,13 +180,13 @@ scan_number(const byte * str, const byte code = 1; break; } @@ -99,7 +99,7 @@ for (;; uval = uval * radix + d) { GET_NEXT(c, sp, break); d = decoder[c]; -@@ -176,8 +195,8 @@ +@@ -176,8 +195,8 @@ scan_number(const byte * str, const byte code = 1; break; } @@ -110,7 +110,7 @@ ) return_error(e_limitcheck); } -@@ -190,55 +209,6 @@ +@@ -190,55 +209,6 @@ iret: make_int(pref, (sign < 0 ? -ival : ival)); return code; @@ -166,7 +166,7 @@ /* Accumulate a double in dval. */ l2d: exp10 = 0; -@@ -274,8 +244,8 @@ +@@ -274,8 +244,8 @@ i2r: exp10 = 0; while (IS_DIGIT(d, c)) { if (WOULD_OVERFLOW(ival, d, max_int)) { @@ -177,7 +177,7 @@ } ival = ival * 10 + d; exp10--; -@@ -293,23 +263,6 @@ +@@ -293,23 +263,6 @@ i2r: dval = ival; goto fe; diff --git a/print/ghostscript7-x11/files/patch-src-iutil.c b/print/ghostscript7-x11/files/patch-src_iutil.c index c77cb19ddd84..7e754463bd42 100644 --- a/print/ghostscript7-x11/files/patch-src-iutil.c +++ b/print/ghostscript7-x11/files/patch-src_iutil.c @@ -1,6 +1,6 @@ ---- src/iutil.c.orig 2013-04-30 10:51:05.000000000 +0900 -+++ src/iutil.c 2013-04-30 10:51:20.000000000 +0900 -@@ -428,7 +428,7 @@ +--- src/iutil.c.orig 2003-01-17 00:49:04 UTC ++++ src/iutil.c +@@ -428,7 +428,7 @@ other: data = (const byte *)(op->value.boolval ? "true" : "false"); break; case t_integer: diff --git a/print/ghostscript7-x11/files/patch-src-lib.mak b/print/ghostscript7-x11/files/patch-src_lib.mak index 6208eb8034a3..2656c5831d92 100644 --- a/print/ghostscript7-x11/files/patch-src-lib.mak +++ b/print/ghostscript7-x11/files/patch-src_lib.mak @@ -1,6 +1,6 @@ ---- src/lib.mak.orig 2003-01-17 09:49:05.000000000 +0900 -+++ src/lib.mak 2015-08-22 02:23:05.682462000 +0900 -@@ -35,6 +35,7 @@ +--- src/lib.mak.orig 2003-01-17 00:49:05 UTC ++++ src/lib.mak +@@ -35,6 +35,7 @@ GLICCCC=$(CC_) $(I_)$(GLI_) $(II)$(ICCI_ GLJCC=$(CC_) $(I_)$(GLI_) $(II)$(JI_)$(_I) $(JCF_) $(GLF_) GLZCC=$(CC_) $(I_)$(GLI_) $(II)$(ZI_)$(_I) $(ZCF_) $(GLF_) GLCCLEAF=$(CC_LEAF) $(I_)$(GLI_)$(_I) $(GLF_) @@ -8,7 +8,7 @@ # All top-level makefiles define GLD. #GLD=$(GLGEN) -@@ -187,22 +188,22 @@ +@@ -187,22 +188,22 @@ gsnogc_=$(GLOBJ)gsnogc.$(OBJ) $(GLD)gsnogc.dev : $(LIB_MAK) $(ECHOGS_XE) $(gsnogc_) $(SETMOD) $(GLD)gsnogc $(gsnogc_) @@ -35,7 +35,7 @@ $(GLCC) $(GLO_)gsbittab.$(OBJ) $(C_) $(GLSRC)gsbittab.c # gsflip is not part of the standard configuration: it's rather large, -@@ -765,7 +766,7 @@ +@@ -765,7 +766,7 @@ $(GLOBJ)gsparam.$(OBJ) : $(GLSRC)gsparam $(GLOBJ)gsparamx.$(OBJ) : $(GLSRC)gsparamx.c $(string__h)\ $(gserror_h) $(gserrors_h) $(gsmemory_h) $(gsparam_h) $(gsparamx_h)\ $(gstypes_h) diff --git a/print/ghostscript7-x11/files/patch-src:unix-dll.mak b/print/ghostscript7-x11/files/patch-src_unix-dll.mak index f6032f9f08ac..3762f90eda3a 100644 --- a/print/ghostscript7-x11/files/patch-src:unix-dll.mak +++ b/print/ghostscript7-x11/files/patch-src_unix-dll.mak @@ -1,6 +1,6 @@ ---- src/unix-dll.mak.orig 2003-01-17 09:49:05.000000000 +0900 -+++ src/unix-dll.mak 2015-08-22 01:13:03.452736000 +0900 -@@ -47,12 +47,17 @@ +--- src/unix-dll.mak.orig 2003-01-17 00:49:05 UTC ++++ src/unix-dll.mak +@@ -47,12 +47,17 @@ GSSOX_XE=$(BINDIR)/$(GSSOX_XENAME) GSSOX=$(BINDIR)/$(SOBINRELDIR)/$(GSSOX_XENAME) # shared library @@ -22,7 +22,7 @@ # Shared object is built by redefining GS_XE in a recursive make. -@@ -68,15 +73,16 @@ +@@ -68,15 +73,16 @@ $(GS_SO_MAJOR): $(GS_SO_MAJOR_MINOR) # Build the small Ghostscript loaders, with Gtk+ and without @@ -44,7 +44,7 @@ GS_XE=$(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR)\ STDIO_IMPLEMENTATION=c\ DISPLAY_DEV=$(DD)$(SOOBJRELDIR)/display.dev\ -@@ -98,21 +104,26 @@ +@@ -98,21 +104,26 @@ sodebug: SODIRS $(MAKE) $(SODEFS) GENOPT='-DDEBUG' CFLAGS='$(CFLAGS_DEBUG) $(CFLAGS_SO) $(GCFLAGS) $(XCFLAGS)' $(GSSOC) $(GSSOX) install-so: so diff --git a/print/ghostscript7-x11/files/patch-src-unixinst.mak b/print/ghostscript7-x11/files/patch-src_unixinst.mak index 1a8041d74861..4236b575f6af 100644 --- a/print/ghostscript7-x11/files/patch-src-unixinst.mak +++ b/print/ghostscript7-x11/files/patch-src_unixinst.mak @@ -1,6 +1,6 @@ ---- src/unixinst.mak.orig 2003-01-17 09:49:05.000000000 +0900 -+++ src/unixinst.mak 2015-08-22 00:31:09.540215000 +0900 -@@ -30,24 +30,24 @@ +--- src/unixinst.mak.orig 2003-01-17 00:49:05 UTC ++++ src/unixinst.mak +@@ -30,24 +30,24 @@ install: install-exec install-scripts in # rules, just in case bindir or scriptdir is a subdirectory of any of these. install-exec: $(GS_XE) @@ -35,7 +35,7 @@ done' PSDOCDIR=$(PSLIBDIR)/../doc -@@ -60,10 +60,10 @@ +@@ -60,10 +60,10 @@ install-data: install-libdata install-do # one file from each subdirectory just as a sanity check. install-libdata: @@ -50,7 +50,7 @@ $(SH) -c 'for f in \ Fontmap Fontmap.GS \ CIDFnmap CIDFnmap.Ore CIDFnmap.ARP CIDFnmap.Bae CIDFnmap.Koc \ -@@ -83,13 +83,13 @@ +@@ -83,13 +83,13 @@ viewcmyk.ps viewgif.ps viewjpeg.ps viewm viewpcx.ps viewpbm.ps viewps2a.ps \ winmaps.ps wftopfa.ps wrfont.ps zeroline.ps \ pdf2dsc.ps pdfopt.ps ;\ @@ -67,7 +67,7 @@ done' # install html documentation -@@ -106,20 +106,20 @@ +@@ -106,20 +106,20 @@ DOC_PAGES=PUBLIC README index.html gs.cs Psfiles.htm Public.htm Readme.htm Release.htm \ Source.htm Tester.htm Unix-lpr.htm Use.htm Xfonts.htm install-doc: $(PSDOCDIR)/News.htm @@ -93,7 +93,7 @@ ( test -d $$man1dir || mkdir -p $$man1dir ) ;\ for f in $(PSMANDIR)/$$d/*.1 ;\ do $(INSTALL_DATA) $$f $$man1dir ;\ -@@ -146,17 +146,22 @@ +@@ -146,17 +146,22 @@ install-man: $(PSMANDIR)/gs.1 # install the example files install-examples: diff --git a/print/ghostscript7-x11/files/patch-src-zarith.c b/print/ghostscript7-x11/files/patch-src_zarith.c index 582f61e8f144..371179a786fc 100644 --- a/print/ghostscript7-x11/files/patch-src-zarith.c +++ b/print/ghostscript7-x11/files/patch-src_zarith.c @@ -1,5 +1,5 @@ ---- src/zarith.c.orig 2013-04-30 11:07:41.000000000 +0900 -+++ src/zarith.c 2013-04-30 11:08:43.000000000 +0900 +--- src/zarith.c.orig 2003-01-17 00:49:05 UTC ++++ src/zarith.c @@ -32,9 +32,9 @@ */ @@ -13,7 +13,7 @@ /* <num1> <num2> add <sum> */ /* We make this into a separate procedure because */ -@@ -64,7 +64,7 @@ +@@ -64,7 +64,7 @@ zop_add(register os_ptr op) op[-1].value.realval += (double)op->value.intval; break; case t_integer: { @@ -22,7 +22,7 @@ if (((op[-1].value.intval += int2) ^ int2) < 0 && ((op[-1].value.intval - int2) ^ int2) >= 0 -@@ -158,10 +158,10 @@ +@@ -158,10 +158,10 @@ zmul(i_ctx_t *i_ctx_p) op[-1].value.realval *= (double)op->value.intval; break; case t_integer: { @@ -37,7 +37,7 @@ float fprod; if ((abs1 > MAX_HALF_INTVAL || abs2 > MAX_HALF_INTVAL) && -@@ -212,7 +212,7 @@ +@@ -212,7 +212,7 @@ zop_sub(register os_ptr op) op[-1].value.realval -= (double)op->value.intval; break; case t_integer: { diff --git a/print/ghostscript7-x11/files/patch-src-zcontrol.c b/print/ghostscript7-x11/files/patch-src_zcontrol.c index d00a600c19ec..ca23edd3f421 100644 --- a/print/ghostscript7-x11/files/patch-src-zcontrol.c +++ b/print/ghostscript7-x11/files/patch-src_zcontrol.c @@ -1,6 +1,6 @@ ---- src/zcontrol.c.orig 2013-04-30 11:09:59.000000000 +0900 -+++ src/zcontrol.c 2013-04-30 11:11:03.000000000 +0900 -@@ -356,7 +356,7 @@ +--- src/zcontrol.c.orig 2003-01-17 00:49:05 UTC ++++ src/zcontrol.c +@@ -356,7 +356,7 @@ for_pos_int_continue(i_ctx_t *i_ctx_p) { os_ptr op = osp; register es_ptr ep = esp; @@ -9,7 +9,7 @@ if (var > ep[-1].value.intval) { esp -= 5; /* pop everything */ -@@ -375,7 +375,7 @@ +@@ -375,7 +375,7 @@ for_neg_int_continue(i_ctx_t *i_ctx_p) { os_ptr op = osp; register es_ptr ep = esp; diff --git a/print/ghostscript7-x11/files/patch-src-zdict.c b/print/ghostscript7-x11/files/patch-src_zdict.c index 050ecc841717..7c806e3c0810 100644 --- a/print/ghostscript7-x11/files/patch-src-zdict.c +++ b/print/ghostscript7-x11/files/patch-src_zdict.c @@ -1,6 +1,6 @@ ---- src/zdict.c.orig 2013-04-30 11:04:05.000000000 +0900 -+++ src/zdict.c 2013-04-30 11:04:34.000000000 +0900 -@@ -35,12 +35,9 @@ +--- src/zdict.c.orig 2003-01-17 00:49:05 UTC ++++ src/zdict.c +@@ -35,12 +35,9 @@ zdict(i_ctx_t *i_ctx_p) os_ptr op = osp; check_type(*op, t_integer); @@ -14,7 +14,7 @@ return dict_create((uint) op->value.intval, op); } -@@ -458,12 +455,8 @@ +@@ -458,12 +455,8 @@ zsetmaxlength(i_ctx_t *i_ctx_p) check_type(*op1, t_dictionary); check_dict_write(*op1); check_type(*op, t_integer); diff --git a/print/ghostscript7-x11/files/patch-src-zdps.c b/print/ghostscript7-x11/files/patch-src_zdps.c index 414a296cd4ea..e520715fbfdc 100644 --- a/print/ghostscript7-x11/files/patch-src-zdps.c +++ b/print/ghostscript7-x11/files/patch-src_zdps.c @@ -1,6 +1,6 @@ ---- src/zdps.c.orig 2013-04-30 11:05:10.000000000 +0900 -+++ src/zdps.c 2013-04-30 11:05:50.000000000 +0900 -@@ -46,19 +46,18 @@ +--- src/zdps.c.orig 2003-01-17 00:49:05 UTC ++++ src/zdps.c +@@ -46,19 +46,18 @@ zsetscreenphase(i_ctx_t *i_ctx_p) { os_ptr op = osp; int code; diff --git a/print/ghostscript7-x11/files/patch-src-zfunc4.c b/print/ghostscript7-x11/files/patch-src_zfunc4.c index 0d8610978652..a1d67a42e6ab 100644 --- a/print/ghostscript7-x11/files/patch-src-zfunc4.c +++ b/print/ghostscript7-x11/files/patch-src_zfunc4.c @@ -1,6 +1,6 @@ ---- src/zfunc4.c.orig 2013-04-30 10:45:00.000000000 +0900 -+++ src/zfunc4.c 2013-04-30 10:45:23.000000000 +0900 -@@ -150,10 +150,6 @@ +--- src/zfunc4.c.orig 2003-01-17 00:49:06 UTC ++++ src/zfunc4.c +@@ -150,10 +150,6 @@ check_psc_function(i_ctx_t *i_ctx_p, con case t_integer: { int i = elt.value.intval; diff --git a/print/ghostscript7-x11/files/patch-src-zgeneric.c b/print/ghostscript7-x11/files/patch-src_zgeneric.c index d99189a5e16a..8f4415d717e8 100644 --- a/print/ghostscript7-x11/files/patch-src-zgeneric.c +++ b/print/ghostscript7-x11/files/patch-src_zgeneric.c @@ -1,6 +1,6 @@ ---- src/zgeneric.c.orig 2013-04-30 10:55:48.000000000 +0900 -+++ src/zgeneric.c 2013-04-30 10:56:40.000000000 +0900 -@@ -76,7 +76,7 @@ +--- src/zgeneric.c.orig 2003-01-17 00:49:06 UTC ++++ src/zgeneric.c +@@ -76,7 +76,7 @@ zcopy_integer(i_ctx_t *i_ctx_p) int count, i; int code; @@ -9,7 +9,7 @@ /* There might be enough elements in other blocks. */ check_int_ltu(*op, ref_stack_count(&o_stack)); count = op->value.intval; -@@ -471,7 +471,7 @@ +@@ -471,7 +471,7 @@ dict_continue(i_ctx_t *i_ctx_p) { os_ptr op = osp; es_ptr obj = esp - 2; diff --git a/print/ghostscript7-x11/files/patch-src-ziodev.c b/print/ghostscript7-x11/files/patch-src_ziodev.c index 2cd6f0add7a9..8dd578526301 100644 --- a/print/ghostscript7-x11/files/patch-src-ziodev.c +++ b/print/ghostscript7-x11/files/patch-src_ziodev.c @@ -1,6 +1,6 @@ ---- src/ziodev.c.orig 2013-04-30 11:06:19.000000000 +0900 -+++ src/ziodev.c 2013-04-30 11:06:30.000000000 +0900 -@@ -79,8 +79,6 @@ +--- src/ziodev.c.orig 2003-01-17 00:49:06 UTC ++++ src/ziodev.c +@@ -79,8 +79,6 @@ zgetiodevice(i_ctx_t *i_ctx_p) const byte *dname; check_type(*op, t_integer); diff --git a/print/ghostscript7-x11/files/patch-src-zmath.c b/print/ghostscript7-x11/files/patch-src_zmath.c index 94576da80fdf..40b47b967330 100644 --- a/print/ghostscript7-x11/files/patch-src-zmath.c +++ b/print/ghostscript7-x11/files/patch-src_zmath.c @@ -1,6 +1,6 @@ ---- src/zmath.c.orig 2013-04-30 10:43:55.000000000 +0900 -+++ src/zmath.c 2013-04-30 10:44:23.000000000 +0900 -@@ -229,14 +229,10 @@ +--- src/zmath.c.orig 2003-01-17 00:49:06 UTC ++++ src/zmath.c +@@ -229,14 +229,10 @@ private int zsrand(i_ctx_t *i_ctx_p) { os_ptr op = osp; diff --git a/print/ghostscript7-x11/files/patch-src:zmedia2.c b/print/ghostscript7-x11/files/patch-src_zmedia2.c index 9033a4388085..73e050c2aeaa 100644 --- a/print/ghostscript7-x11/files/patch-src:zmedia2.c +++ b/print/ghostscript7-x11/files/patch-src_zmedia2.c @@ -1,6 +1,6 @@ ---- 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 @@ +--- src/zmedia2.c.orig 2003-01-17 00:49:06 UTC ++++ src/zmedia2.c +@@ -429,11 +429,17 @@ make_adjustment_matrix(const gs_point * rx = ry, ry = temp; } diff --git a/print/ghostscript7-x11/files/patch-src-zstack.c b/print/ghostscript7-x11/files/patch-src_zstack.c index f1359936e410..3959aac5d4ae 100644 --- a/print/ghostscript7-x11/files/patch-src-zstack.c +++ b/print/ghostscript7-x11/files/patch-src_zstack.c @@ -1,6 +1,6 @@ ---- src/zstack.c.orig 2013-04-30 10:54:14.000000000 +0900 -+++ src/zstack.c 2013-04-30 10:54:26.000000000 +0900 -@@ -70,7 +70,7 @@ +--- src/zstack.c.orig 2003-01-17 00:49:06 UTC ++++ src/zstack.c +@@ -70,7 +70,7 @@ zindex(i_ctx_t *i_ctx_p) register os_ptr opn; check_type(*op, t_integer); diff --git a/print/ghostscript7-x11/files/patch-src-ztype.c b/print/ghostscript7-x11/files/patch-src_ztype.c index 98be203c6abe..c9828301667f 100644 --- a/print/ghostscript7-x11/files/patch-src-ztype.c +++ b/print/ghostscript7-x11/files/patch-src_ztype.c @@ -1,6 +1,6 @@ ---- src/ztype.c.orig 2013-04-30 10:46:12.000000000 +0900 -+++ src/ztype.c 2013-04-30 10:46:55.000000000 +0900 -@@ -53,10 +53,10 @@ +--- src/ztype.c.orig 2003-01-17 00:49:06 UTC ++++ src/ztype.c +@@ -53,10 +53,10 @@ private int convert_to_string(P2(os_ptr, * constant expressions, so we can't use min_long and max_long. * What a nuisance! */ @@ -15,7 +15,7 @@ #define REAL_CAN_BE_INT(v)\ ((v) > min_int_real && (v) < max_int_real) -@@ -356,14 +356,14 @@ +@@ -356,14 +356,14 @@ zcvrs(i_ctx_t *i_ctx_p) return_op_typecheck(op - 2); } } else { |