diff options
Diffstat (limited to 'print/ghostscript9-agpl-base/files')
| -rw-r--r-- | print/ghostscript9-agpl-base/files/patch-Makefile.in | 24 | ||||
| -rw-r--r-- | print/ghostscript9-agpl-base/files/patch-Resource_Init_FAPIcidfmap (renamed from print/ghostscript9-agpl-base/files/patch-Resource-Init-FAPIcidfmap) | 4 | ||||
| -rw-r--r-- | print/ghostscript9-agpl-base/files/patch-Resource_Init_FAPIconfig (renamed from print/ghostscript9-agpl-base/files/patch-Resource-Init-FAPIconfig) | 10 | ||||
| -rw-r--r-- | print/ghostscript9-agpl-base/files/patch-Resource_Init_cidfmap (renamed from print/ghostscript9-agpl-base/files/patch-Resource-Init-cidfmap) | 11 | ||||
| -rw-r--r-- | print/ghostscript9-agpl-base/files/patch-Resource_Init_gs__statd.ps (renamed from print/ghostscript9-agpl-base/files/patch-Resource-Init-gs_statd.ps) | 6 | ||||
| -rw-r--r-- | print/ghostscript9-agpl-base/files/patch-Resource_Init_gs__ttf.ps (renamed from print/ghostscript9-agpl-base/files/patch-Resource-Init-gs_ttf.ps) | 8 | ||||
| -rw-r--r-- | print/ghostscript9-agpl-base/files/patch-Resource_Init_pdf__font.ps (renamed from print/ghostscript9-agpl-base/files/patch-Resource-Init-pdf_font.ps) | 6 | ||||
| -rw-r--r-- | print/ghostscript9-agpl-base/files/patch-base_gp__unix.c (renamed from print/ghostscript9-agpl-base/files/patch-base-gp_unix.c) | 8 | ||||
| -rw-r--r-- | print/ghostscript9-agpl-base/files/patch-base_gs.mak (renamed from print/ghostscript9-agpl-base/files/patch-base-gs.mak) | 6 | ||||
| -rw-r--r-- | print/ghostscript9-agpl-base/files/patch-base_gsicc__create.c (renamed from print/ghostscript9-agpl-base/files/patch-base-gsicc_create.c) | 6 | ||||
| -rw-r--r-- | print/ghostscript9-agpl-base/files/patch-base_gsmalloc.c (renamed from print/ghostscript9-agpl-base/files/patch-base-gsmalloc.c) | 6 | ||||
| -rw-r--r-- | print/ghostscript9-agpl-base/files/patch-base_gxobj.h (renamed from print/ghostscript9-agpl-base/files/patch-base-gxobj.h) | 6 | ||||
| -rw-r--r-- | print/ghostscript9-agpl-base/files/patch-base_openjpeg.mak (renamed from print/ghostscript9-agpl-base/files/patch-base-openjpeg.mak) | 8 | ||||
| -rw-r--r-- | print/ghostscript9-agpl-base/files/patch-base_unix-gcc.mak (renamed from print/ghostscript9-agpl-base/files/patch-base-unix-gcc.mak) | 30 | ||||
| -rw-r--r-- | print/ghostscript9-agpl-base/files/patch-base_unixinst.mak (renamed from print/ghostscript9-agpl-base/files/patch-base-unixinst.mak) | 8 | ||||
| -rw-r--r-- | print/ghostscript9-agpl-base/files/patch-configure.ac | 10 | ||||
| -rw-r--r-- | print/ghostscript9-agpl-base/files/patch-contrib_contrib.mak (renamed from print/ghostscript9-agpl-base/files/patch-contrib-contrib.mak) | 8 | ||||
| -rw-r--r-- | print/ghostscript9-agpl-base/files/patch-contrib_gomni.c (renamed from print/ghostscript9-agpl-base/files/patch-contrib__gomni.c) | 44 | ||||
| -rw-r--r-- | print/ghostscript9-agpl-base/files/patch-contrib_japanese_dmp__site.ps (renamed from print/ghostscript9-agpl-base/files/patch-contrib__japanese__dmp_site.ps) | 4 | ||||
| -rw-r--r-- | print/ghostscript9-agpl-base/files/patch-contrib_japanese_gdevdmpr.c (renamed from print/ghostscript9-agpl-base/files/patch-contrib__japanese__gdevdmpr.c) | 10 | ||||
| -rw-r--r-- | print/ghostscript9-agpl-base/files/patch-contrib_lips4_gdevlips.c (renamed from print/ghostscript9-agpl-base/files/patch-lips:gdevlips.c) | 6 | ||||
| -rw-r--r-- | print/ghostscript9-agpl-base/files/patch-contrib_lips4_gdevlips.h (renamed from print/ghostscript9-agpl-base/files/patch-lips:gdevlips.h) | 8 | ||||
| -rw-r--r-- | print/ghostscript9-agpl-base/files/patch-devices_devs.mak (renamed from print/ghostscript9-agpl-base/files/patch-devices-devs.mak) | 6 | ||||
| -rw-r--r-- | print/ghostscript9-agpl-base/files/patch-devices_gdevl256.c (renamed from print/ghostscript9-agpl-base/files/patch-devices-gdevl256.c) | 6 | ||||
| -rw-r--r-- | print/ghostscript9-agpl-base/files/patch-devices_gdevperm.c (renamed from print/ghostscript9-agpl-base/files/patch-devices-gdevperm.c) | 8 | ||||
| -rw-r--r-- | print/ghostscript9-agpl-base/files/patch-devices_gdevplib.c (renamed from print/ghostscript9-agpl-base/files/patch-devices-gdevplib.c) | 6 | ||||
| -rw-r--r-- | print/ghostscript9-agpl-base/files/patch-devices_gdevvglb.c (renamed from print/ghostscript9-agpl-base/files/patch-devices-gdevvglb.c) | 6 | ||||
| -rw-r--r-- | print/ghostscript9-agpl-base/files/patch-epag-3.09_ert.c (renamed from print/ghostscript9-agpl-base/files/patch-epag-ert.c) | 4 | ||||
| -rw-r--r-- | print/ghostscript9-agpl-base/files/patch-epag-3.09_gdevepag.c (renamed from print/ghostscript9-agpl-base/files/patch-epag__gdevepag.c) | 36 | ||||
| -rw-r--r-- | print/ghostscript9-agpl-base/files/patch-openjpeg_src_lib_openjp2_opj__includes.h (renamed from print/ghostscript9-agpl-base/files/patch-openjpeg-src-lib-openjp2-opj_includes.h) | 8 | ||||
| -rw-r--r-- | print/ghostscript9-agpl-base/files/patch-psi-zicc.c | 12 | ||||
| -rw-r--r-- | print/ghostscript9-agpl-base/files/patch-psi_zicc.c | 12 | ||||
| -rw-r--r-- | print/ghostscript9-agpl-base/files/patch-trio_triodef.h (renamed from print/ghostscript9-agpl-base/files/patch-trio-triodef.h) | 4 | ||||
| -rw-r--r-- | print/ghostscript9-agpl-base/files/patch-trio_triop.h (renamed from print/ghostscript9-agpl-base/files/patch-trio-triop.h) | 6 |
34 files changed, 177 insertions, 174 deletions
diff --git a/print/ghostscript9-agpl-base/files/patch-Makefile.in b/print/ghostscript9-agpl-base/files/patch-Makefile.in index 0f905cb84fa6..383975f6f4fa 100644 --- a/print/ghostscript9-agpl-base/files/patch-Makefile.in +++ b/print/ghostscript9-agpl-base/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2014-03-26 21:53:48.000000000 +0900 -+++ Makefile.in 2014-11-23 17:01:12.000000000 +0900 -@@ -52,9 +52,9 @@ +--- Makefile.in.orig 2015-03-30 08:21:24 UTC ++++ Makefile.in +@@ -52,9 +52,9 @@ PSD=$(PSGENDIR)/ # the directories also define the default search path for the # initialization files (gs_*.ps) and the fonts. @@ -13,7 +13,7 @@ INSTALL_SHARED = @INSTALL_SHARED@ prefix = @prefix@ -@@ -199,7 +199,7 @@ +@@ -199,7 +199,7 @@ JSRCDIR=@LIBJPEGDIR@ # some older JPEG streams that violate the standard. If the JPEG # library built from local sources, the patch will be applied. @@ -22,7 +22,7 @@ JPEG_NAME=jpeg # Define the directory where the PNG library sources are stored, -@@ -207,12 +207,12 @@ +@@ -207,12 +207,12 @@ JPEG_NAME=jpeg # You may need to change this if the libpng version changes. # See png.mak for more information. @@ -37,7 +37,7 @@ TIFFSRCDIR=@LIBTIFFDIR@ TIFFCONFDIR=@LIBTIFFCONFDIR@ TIFFPLATFORM=unix -@@ -222,7 +222,7 @@ +@@ -222,7 +222,7 @@ LIBTIFF_NAME=tiff # Define the directory where the zlib sources are stored. # See zlib.mak for more information. @@ -46,7 +46,7 @@ ZSRCDIR=@ZLIBDIR@ #ZLIB_NAME=gz ZLIB_NAME=z -@@ -249,7 +249,7 @@ +@@ -249,7 +249,7 @@ JBIG2_CFLAGS=@JBIG2_AUTOCONF_CFLAGS@ JPX_LIB=@JPX_DECODER@ SHARE_JPX=@SHARE_JPX@ JPXSRCDIR=@JPXDIR@ @@ -55,7 +55,7 @@ # uncomment the following three lines and one of the last two to # compile in the Luratech lwf_jp2 codec -@@ -336,7 +336,7 @@ +@@ -335,7 +335,7 @@ GCFLAGS=@CPPFLAGS@ @GCFLAGS@ @CFLAGS@ # Define the added flags for standard, debugging, profiling # and shared object builds. @@ -64,7 +64,7 @@ CFLAGS_DEBUG=@DBG_CFLAGS@ CFLAGS_PROFILE=-pg @OPT_CFLAGS@ CFLAGS_SO=@DYNAMIC_CFLAGS@ -@@ -389,8 +389,8 @@ +@@ -388,8 +388,8 @@ LDFLAGS_SO=@DYNAMIC_LDFLAGS@ # Solaris may need -lnsl -lsocket -lposix4. # (Libraries required by individual drivers are handled automatically.) @@ -75,7 +75,7 @@ # Define the standard libraries to search at the end of linking. # Most platforms require -lpthread for the POSIX threads library; -@@ -434,7 +434,7 @@ +@@ -433,7 +433,7 @@ XLIBS=@X_LIBS@ # the pthread library. Otherwise use SYNC=nosync #SYNC=posync #SYNC=nosync @@ -84,7 +84,7 @@ # programs we use RM=rm -f -@@ -528,28 +528,27 @@ +@@ -527,28 +527,27 @@ DISPLAY_DEV=$(DD)bbox.dev #DEVICE_DEVS20=$(DD)cljet5.dev $(DD)cljet5c.dev #DEVICE_DEVS21=$(DD)spotcmyk.dev $(DD)devicen.dev $(DD)xcf.dev $(DD)psdcmyk.dev $(DD)psdrgb.dev $(DD)psdcmykog.dev $(DD)fpng.dev DEVICE_DEVS=$(DISPLAY_DEV) @X11_DEVS@ @@ -134,7 +134,7 @@ # Shared library target to build. GS_SHARED_OBJS=@DYNAMIC_DEVS@ -@@ -592,6 +591,7 @@ +@@ -591,6 +590,7 @@ MAKEDIRSTOP= # ---------------- End of platform-specific section ---------------- # INSTALL_CONTRIB=@INSTALL_CONTRIB@ diff --git a/print/ghostscript9-agpl-base/files/patch-Resource-Init-FAPIcidfmap b/print/ghostscript9-agpl-base/files/patch-Resource_Init_FAPIcidfmap index 2c6bf45839b2..21249a697dde 100644 --- a/print/ghostscript9-agpl-base/files/patch-Resource-Init-FAPIcidfmap +++ b/print/ghostscript9-agpl-base/files/patch-Resource_Init_FAPIcidfmap @@ -1,5 +1,5 @@ ---- Resource/Init/FAPIcidfmap.orig 2006-06-01 00:29:52.000000000 +0900 -+++ Resource/Init/FAPIcidfmap 2009-05-15 03:27:31.000000000 +0900 +--- Resource/Init/FAPIcidfmap.orig 2015-03-30 08:21:24 UTC ++++ Resource/Init/FAPIcidfmap @@ -29,4 +29,59 @@ % % /Ryumin-Medium << /Path (msgothic.ttc) /CIDFontType 0 /FAPI /UFST /CSI [(Japan1) 2] >> ; diff --git a/print/ghostscript9-agpl-base/files/patch-Resource-Init-FAPIconfig b/print/ghostscript9-agpl-base/files/patch-Resource_Init_FAPIconfig index e2ff81b58276..1b15ceeff3ce 100644 --- a/print/ghostscript9-agpl-base/files/patch-Resource-Init-FAPIconfig +++ b/print/ghostscript9-agpl-base/files/patch-Resource_Init_FAPIconfig @@ -1,9 +1,9 @@ ---- Resource/Init/FAPIconfig.orig 2010-04-13 21:50:40.000000000 +0900 -+++ Resource/Init/FAPIconfig 2011-05-17 18:25:59.000000000 +0900 +--- Resource/Init/FAPIconfig.orig 2015-03-30 08:21:24 UTC ++++ Resource/Init/FAPIconfig @@ -12,3 +12,7 @@ - % and CID font resource files.
- % "Embedded fonts" are fonts and CID fonts being embedded into a document.
-
+ % and CID font resource files. + % "Embedded fonts" are fonts and CID fonts being embedded into a document. + +/FontPath () % A default directory for FAPI-handled font files path in FAPIfontmap. +/CIDFontPath () % A default directory for FAPI-handled CID font files path in FAPIcidfmap. +/HookDiskFonts [] % FontType values for disk PS fonts to be redirected to FAPI. diff --git a/print/ghostscript9-agpl-base/files/patch-Resource-Init-cidfmap b/print/ghostscript9-agpl-base/files/patch-Resource_Init_cidfmap index 8ed71789f4fe..8745e073270b 100644 --- a/print/ghostscript9-agpl-base/files/patch-Resource-Init-cidfmap +++ b/print/ghostscript9-agpl-base/files/patch-Resource_Init_cidfmap @@ -1,9 +1,9 @@ ---- Resource/Init/cidfmap.orig 2008-08-08 13:22:38.000000000 +0900 -+++ Resource/Init/cidfmap 2009-12-20 03:03:17.000000000 +0900 -@@ -26,3 +26,64 @@ +--- Resource/Init/cidfmap.orig 2015-03-30 08:21:24 UTC ++++ Resource/Init/cidfmap +@@ -29,6 +29,67 @@ % /ShinGo-Bold /HeiseiKakuGo-W5 ; % /Ryumin-Medium << /FileType /TrueType /Path (H:/AuxFiles/Fonts/BATANG.TTC) /SubfontID 3 /CSI [(Japan1) 2] >> ; - % + % /Ryumin-Medium << /FileType /TrueType /Path (windir) getenv not {(c:/windows)}if (/Fonts/BATANG.TTC)concatstrings /SubfontID 3 /CSI [(Japan1) 2] >> ; +/Ryumin-Light << /FileType /TrueType /Path (Ryumin-Light) /SubfontID 0 /CSI [(Japan1) 6] >> ; +/GothicBBB-Medium << /FileType /TrueType /Path (GothicBBB-Medium) /SubfontID 0 /CSI [(Japan1) 6] >> ; + @@ -65,3 +65,6 @@ +/STSong-Light << /FileType /TrueType /Path (STSong-Light) /SubfontID 0 /CSI [(GB1) 5] >> ; +/MSung-Light << /FileType /TrueType /Path (MSung-Light) /SubfontID 0 /CSI [(CNS1) 5] >> ; +/MHei-Medium << /FileType /TrueType /Path (MHei-Medium) /SubfontID 0 /CSI [(GB1) 5] >> ; + % + % NOTE: getenv returns a boolean to indicate success of or failure, as well as the value on success. In the example, it uses this + % to include a default value should getenv fail. diff --git a/print/ghostscript9-agpl-base/files/patch-Resource-Init-gs_statd.ps b/print/ghostscript9-agpl-base/files/patch-Resource_Init_gs__statd.ps index a9996b623de8..d8b9a3a9cdee 100644 --- a/print/ghostscript9-agpl-base/files/patch-Resource-Init-gs_statd.ps +++ b/print/ghostscript9-agpl-base/files/patch-Resource_Init_gs__statd.ps @@ -1,6 +1,6 @@ ---- Resource/Init/gs_statd.ps.orig 2011-05-24 04:43:02.000000000 +0900 -+++ Resource/Init/gs_statd.ps 2011-05-24 04:43:31.000000000 +0900 -@@ -125,6 +125,12 @@ +--- Resource/Init/gs_statd.ps.orig 2015-03-30 08:21:24 UTC ++++ Resource/Init/gs_statd.ps +@@ -124,6 +124,12 @@ STRICT { (%END SIZES) .skipeof } if /ANSI_D {1585 2448 //.setpagesize exec} bind def /ANSI_E {2448 3168 //.setpagesize exec} bind def /ANSI_F {2016 2880 //.setpagesize exec} bind def diff --git a/print/ghostscript9-agpl-base/files/patch-Resource-Init-gs_ttf.ps b/print/ghostscript9-agpl-base/files/patch-Resource_Init_gs__ttf.ps index 19fc072bd4e2..620da9b1960b 100644 --- a/print/ghostscript9-agpl-base/files/patch-Resource-Init-gs_ttf.ps +++ b/print/ghostscript9-agpl-base/files/patch-Resource_Init_gs__ttf.ps @@ -1,8 +1,8 @@ ---- Resource/Init/gs_ttf.ps.orig 2011-05-24 04:46:01.000000000 +0900 -+++ Resource/Init/gs_ttf.ps 2011-05-24 04:46:22.000000000 +0900 -@@ -1029,10 +1029,21 @@ +--- Resource/Init/gs_ttf.ps.orig 2015-03-30 08:21:24 UTC ++++ Resource/Init/gs_ttf.ps +@@ -1093,10 +1093,21 @@ mark } ifelse - % Stack: ... /FontInfo mark key1 value1 ... + % Stack: ... /FontInfo mark key1 value1 ... post //null ne { - /ItalicAngle first_post_string 4 gets32 65536.0 div - /isFixedPitch first_post_string 12 getu32 0 ne diff --git a/print/ghostscript9-agpl-base/files/patch-Resource-Init-pdf_font.ps b/print/ghostscript9-agpl-base/files/patch-Resource_Init_pdf__font.ps index c966e57fba11..7ef0135da2ef 100644 --- a/print/ghostscript9-agpl-base/files/patch-Resource-Init-pdf_font.ps +++ b/print/ghostscript9-agpl-base/files/patch-Resource_Init_pdf__font.ps @@ -1,6 +1,6 @@ ---- Resource/Init/pdf_font.ps.orig Tue Aug 31 13:03:30 2004 -+++ Resource/Init/pdf_font.ps Wed Sep 15 19:15:00 2004 -@@ -1114,10 +1114,12 @@ +--- Resource/Init/pdf_font.ps.orig 2015-03-30 08:21:24 UTC ++++ Resource/Init/pdf_font.ps +@@ -1835,10 +1835,12 @@ currentdict /CMap_read_dict undef /buildCIDType0 { % <CIDFontType0-font-resource> buildCIDType0 <font> dup /BaseFont get findCIDFont exch pop diff --git a/print/ghostscript9-agpl-base/files/patch-base-gp_unix.c b/print/ghostscript9-agpl-base/files/patch-base_gp__unix.c index 5e89d3b811a4..eb39270d5fb4 100644 --- a/print/ghostscript9-agpl-base/files/patch-base-gp_unix.c +++ b/print/ghostscript9-agpl-base/files/patch-base_gp__unix.c @@ -1,6 +1,6 @@ ---- base/gp_unix.c.orig 2015-08-22 03:07:24.257409000 +0900 -+++ base/gp_unix.c 2015-08-22 03:08:15.753173000 +0900 -@@ -52,6 +52,7 @@ +--- base/gp_unix.c.orig 2015-03-30 08:21:24 UTC ++++ base/gp_unix.c +@@ -52,6 +52,7 @@ extern char *getenv(const char *); * and applied as a patch (preferable). */ #include <sys/types.h> @@ -8,7 +8,7 @@ #include <dirent.h> #include <dlfcn.h> #include <string.h> -@@ -61,26 +62,25 @@ +@@ -61,26 +62,25 @@ gp_init(void) { DIR* dir = NULL; struct dirent* dirent; diff --git a/print/ghostscript9-agpl-base/files/patch-base-gs.mak b/print/ghostscript9-agpl-base/files/patch-base_gs.mak index 50d31a63a2d2..a7a035bd4f06 100644 --- a/print/ghostscript9-agpl-base/files/patch-base-gs.mak +++ b/print/ghostscript9-agpl-base/files/patch-base_gs.mak @@ -1,6 +1,6 @@ ---- base/gs.mak.orig 2012-08-08 17:01:36.000000000 +0900 -+++ base/gs.mak 2012-10-14 02:29:03.000000000 +0900 -@@ -437,7 +437,7 @@ +--- base/gs.mak.orig 2015-03-30 08:21:24 UTC ++++ base/gs.mak +@@ -426,7 +426,7 @@ GCONFIG_EXTRAS= ld_tr=$(GLGENDIR)$(D)ld.tr $(ld_tr) : \ $(GS_MAK) $(TOP_MAKEFILES) $(GLSRCDIR)$(D)version.mak $(GENCONF_XE) $(ECHOGS_XE) $(devs_tr) $(DEVS_ALL) $(GLGENDIR)$(D)libcore.dev diff --git a/print/ghostscript9-agpl-base/files/patch-base-gsicc_create.c b/print/ghostscript9-agpl-base/files/patch-base_gsicc__create.c index 82bfee6c37ef..465789dfeaad 100644 --- a/print/ghostscript9-agpl-base/files/patch-base-gsicc_create.c +++ b/print/ghostscript9-agpl-base/files/patch-base_gsicc__create.c @@ -1,6 +1,6 @@ ---- base/gsicc_create.c.orig 2011-08-05 20:12:20.000000000 +0900 -+++ base/gsicc_create.c 2011-12-06 15:23:14.000000000 +0900 -@@ -113,6 +113,7 @@ +--- base/gsicc_create.c.orig 2015-03-30 08:21:24 UTC ++++ base/gsicc_create.c +@@ -116,6 +116,7 @@ Note: All profile data must be encoded a */ diff --git a/print/ghostscript9-agpl-base/files/patch-base-gsmalloc.c b/print/ghostscript9-agpl-base/files/patch-base_gsmalloc.c index 030f702d9415..6651a121aeb0 100644 --- a/print/ghostscript9-agpl-base/files/patch-base-gsmalloc.c +++ b/print/ghostscript9-agpl-base/files/patch-base_gsmalloc.c @@ -1,6 +1,6 @@ ---- base/gsmalloc.c.orig 2015-08-22 03:09:16.838614000 +0900 -+++ base/gsmalloc.c 2015-08-22 03:09:34.776354000 +0900 -@@ -178,7 +178,7 @@ +--- base/gsmalloc.c.orig 2015-03-30 08:21:24 UTC ++++ base/gsmalloc.c +@@ -178,7 +178,7 @@ gs_heap_alloc_bytes(gs_memory_t * mem, u } else { uint added = size + sizeof(gs_malloc_block_t); diff --git a/print/ghostscript9-agpl-base/files/patch-base-gxobj.h b/print/ghostscript9-agpl-base/files/patch-base_gxobj.h index 529efe379df2..992cee7b4d9c 100644 --- a/print/ghostscript9-agpl-base/files/patch-base-gxobj.h +++ b/print/ghostscript9-agpl-base/files/patch-base_gxobj.h @@ -1,6 +1,6 @@ ---- base/gxobj.h.orig Tue Mar 14 01:18:19 2006 -+++ base/gxobj.h Fri Mar 23 14:41:44 2007 -@@ -109,11 +109,15 @@ +--- base/gxobj.h.orig 2015-03-30 08:21:24 UTC ++++ base/gxobj.h +@@ -144,11 +144,15 @@ typedef struct obj_header_data_s { * required by the hardware, regardless of the value of obj_align_mod. * See gsmemraw.h for more information about this. */ diff --git a/print/ghostscript9-agpl-base/files/patch-base-openjpeg.mak b/print/ghostscript9-agpl-base/files/patch-base_openjpeg.mak index 3d85cb70abf1..cf38fe8c16bc 100644 --- a/print/ghostscript9-agpl-base/files/patch-base-openjpeg.mak +++ b/print/ghostscript9-agpl-base/files/patch-base_openjpeg.mak @@ -1,6 +1,6 @@ ---- base/openjpeg.mak.orig 2012-02-08 17:48:48.000000000 +0900 -+++ base/openjpeg.mak 2012-02-14 06:40:56.000000000 +0900 -@@ -101,7 +101,7 @@ +--- base/openjpeg.mak.orig 2015-03-30 08:21:24 UTC ++++ base/openjpeg.mak +@@ -113,7 +113,7 @@ $(OPEN_JPEG_GEN)openjpeg_0.dev : $(TOP_M $(SETMOD) $(OPEN_JPEG_GEN)openjpeg_0 $(open_jpeg_OBJS) # define our specific compiler @@ -8,4 +8,4 @@ +OPEN_JPEG_CC=$(CC) $(JPX_CFLAGS) $(I_)$(JPX_OPENJPEG_I_)$(_I) $(I_)$(JPX_OPENJPEG_I_)$(D)..$(_I) $(CFLAGS) $(D_)OPJ_STATIC$(_D) $(I_)$(OPEN_JPEG_GEN)$(_I) $(I_)$(JPX_OPENJPEG_I_)$(_I) $(I_)$(JPX_OPENJPEG_I_)$(D)..$(_I) $(JPXCF_) OPEN_JPEG_O=$(O_)$(OPEN_JPEG_OBJ)$(OPEN_JPEG_PREFIX) - OPEN_JPEG_DEP=$(AK) $(OPEN_JPEG_MAK) + OPEN_JPEG_DEP=$(AK) $(OPEN_JPEG_MAK) $(MAKEDIRS) diff --git a/print/ghostscript9-agpl-base/files/patch-base-unix-gcc.mak b/print/ghostscript9-agpl-base/files/patch-base_unix-gcc.mak index 2fd1d5ad7885..566a90f70542 100644 --- a/print/ghostscript9-agpl-base/files/patch-base-unix-gcc.mak +++ b/print/ghostscript9-agpl-base/files/patch-base_unix-gcc.mak @@ -1,5 +1,5 @@ ---- base/unix-gcc.mak.orig 2014-03-26 21:53:47.000000000 +0900 -+++ base/unix-gcc.mak 2014-08-25 00:19:13.000000000 +0900 +--- base/unix-gcc.mak.orig 2015-03-30 08:21:24 UTC ++++ base/unix-gcc.mak @@ -22,19 +22,19 @@ # source, generated intermediate file, and object directories # for the graphics library (GL) and the PostScript/PDF interpreter (PS). @@ -32,7 +32,7 @@ # Do not edit the next group of lines. -@@ -53,11 +53,10 @@ +@@ -53,11 +53,10 @@ PSD=$(PSGENDIR)/ # the directories also define the default search path for the # initialization files (gs_*.ps) and the fonts. @@ -47,7 +47,7 @@ exec_prefix = $(prefix) bindir = $(exec_prefix)/bin scriptdir = $(bindir) -@@ -107,7 +106,7 @@ +@@ -107,7 +106,7 @@ GENOPT= # This uses the more secure temporary file creation call # Enable this if it is available on your platform. @@ -56,7 +56,7 @@ # Define the name of the executable file. -@@ -142,7 +141,7 @@ +@@ -142,7 +141,7 @@ JSRCDIR=jpeg # some older JPEG streams that violate the standard. If the JPEG # library built from local sources, the patch will be applied. @@ -65,7 +65,7 @@ JPEG_NAME=jpeg # Define the directory where the PNG library sources are stored, -@@ -156,13 +155,13 @@ +@@ -156,13 +155,13 @@ PNGSRCDIR=libpng # what its name is. # See gs.mak and Make.htm for more information. @@ -81,7 +81,7 @@ TIFFSRCDIR=tiff TIFFCONFDIR=tiff TIFFPLATFORM=unix -@@ -180,12 +179,12 @@ +@@ -180,12 +179,12 @@ ZSRCDIR=zlib # what its name is (usually libz, but sometimes libgz). # See gs.mak and Make.htm for more information. @@ -96,7 +96,7 @@ JBIG2_LIB=jbig2dec JBIG2SRCDIR=jbig2dec -@@ -225,7 +224,7 @@ +@@ -225,7 +224,7 @@ RANLIB=ranlib # Define the name of the C compiler. @@ -105,7 +105,7 @@ # Define the name of the linker for the final link step. # Normally this is the same as the C compiler. -@@ -242,7 +241,7 @@ +@@ -242,7 +241,7 @@ GCFLAGS=-Wall -Wstrict-prototypes -Wmiss # Define the added flags for standard, debugging, profiling # and shared object builds. @@ -114,7 +114,7 @@ CFLAGS_DEBUG=-g -O0 CFLAGS_PROFILE=-pg -O2 CFLAGS_SO=-fPIC -@@ -258,7 +257,8 @@ +@@ -258,7 +257,8 @@ 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. @@ -124,7 +124,7 @@ CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS) -@@ -269,7 +269,7 @@ +@@ -269,7 +269,7 @@ 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. @@ -133,7 +133,7 @@ LDFLAGS=$(XLDFLAGS) -@@ -280,7 +280,7 @@ +@@ -280,7 +280,7 @@ LDFLAGS=$(XLDFLAGS) # Solaris may need -lnsl -lsocket -lposix4. # (Libraries required by individual drivers are handled automatically.) @@ -142,7 +142,7 @@ # Define the standard libraries to search at the end of linking. # Most platforms require -lpthread for the POSIX threads library; -@@ -302,7 +302,7 @@ +@@ -302,7 +302,7 @@ STDLIBS=-lm # Note that x_.h expects to find the header files in $(XINCLUDE)/X11, # not in $(XINCLUDE). @@ -151,7 +151,7 @@ # 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 -@@ -317,29 +317,29 @@ +@@ -317,29 +317,29 @@ XINCLUDE=-I/usr/X11R6/include #XLIBS=Xt SM ICE Xext X11 #XLIBDIRS=-L/usr/local/X/lib @@ -186,7 +186,7 @@ #FEATURE_DEVS=$(PSD)psl3.dev $(PSD)pdf.dev # The following is strictly for testing. FEATURE_DEVS_ALL=$(PSD)psl3.dev $(PSD)pdf.dev $(PSD)dpsnext.dev $(PSD)ttfont.dev $(PSD)rasterop.dev $(PSD)double.dev $(PSD)trapping.dev $(PSD)stocht.dev $(GLD)pipe.dev -@@ -488,6 +488,7 @@ +@@ -488,6 +488,7 @@ include $(GLSRCDIR)/unixlink.mak include $(GLSRCDIR)/unix-dll.mak include $(GLSRCDIR)/unix-end.mak include $(GLSRCDIR)/unixinst.mak diff --git a/print/ghostscript9-agpl-base/files/patch-base-unixinst.mak b/print/ghostscript9-agpl-base/files/patch-base_unixinst.mak index 0c67aa7c058b..1fb2e130e3af 100644 --- a/print/ghostscript9-agpl-base/files/patch-base-unixinst.mak +++ b/print/ghostscript9-agpl-base/files/patch-base_unixinst.mak @@ -1,6 +1,6 @@ ---- base/unixinst.mak.orig 2014-03-26 21:53:47.000000000 +0900 -+++ base/unixinst.mak 2014-11-23 17:01:40.000000000 +0900 -@@ -45,7 +45,7 @@ +--- base/unixinst.mak.orig 2015-03-30 08:21:24 UTC ++++ base/unixinst.mak +@@ -45,7 +45,7 @@ ps2ascii ps2epsi ps2pdf ps2pdf12 ps2pdf1 wftopfa fixmswrd.pl lprsetup.sh pj-gs.sh pv.sh sysvlp.sh unix-lpr.sh ;\ do if ( test -f $(PSLIBDIR)/$$f ); then \ (cat $(PSLIBDIR)/$$f | sed -e "s/GS_EXECUTABLE=gs/GS_EXECUTABLE=$(GS)/" > $(PSOBJDIR)/$$f); \ @@ -9,7 +9,7 @@ fi;\ done' -@@ -142,7 +142,7 @@ +@@ -142,7 +142,7 @@ install-doc: $(PSDOCDIR)/News.htm done' # install the man pages for each locale diff --git a/print/ghostscript9-agpl-base/files/patch-configure.ac b/print/ghostscript9-agpl-base/files/patch-configure.ac index 9b68cce459f5..14d40344ab49 100644 --- a/print/ghostscript9-agpl-base/files/patch-configure.ac +++ b/print/ghostscript9-agpl-base/files/patch-configure.ac @@ -1,6 +1,6 @@ ---- configure.ac.orig 2015-03-30 17:21:24.000000000 +0900 -+++ configure.ac 2015-08-22 03:22:12.231575000 +0900 -@@ -1607,7 +1607,7 @@ +--- configure.ac.orig 2015-03-30 08:21:24 UTC ++++ configure.ac +@@ -1607,7 +1607,7 @@ X_CFLAGS="" X_DEVS="" X_LIBS="" @@ -9,7 +9,7 @@ if test "$x_libraries" = "/usr/lib"; then echo "Ignoring X library directory \"$x_libraries\" requested by configure." x_libraries="NONE" -@@ -2074,7 +2074,10 @@ +@@ -2074,7 +2074,10 @@ AC_ARG_ENABLE([dynamic], AC_HELP_STRING( DBG_CFLAGS="$DYNAMIC_CFLAGS $DBG_CFLAGS" ;; *BSD) @@ -21,7 +21,7 @@ DYNAMIC_FLAGS="-DGS_DEVS_SHARED -DGS_DEVS_SHARED_DIR=\\\"\$(gssharedir)\\\"" X11_DEVS="" OPT_CFLAGS="$DYNAMIC_CFLAGS $OPT_CFLAGS" -@@ -2133,11 +2136,11 @@ +@@ -2133,11 +2136,11 @@ if test "x$fontpath" = "x"; then fontpath="${fontpath}:$datadir/fonts/default/TrueType" # These font directories are used by IRIX... diff --git a/print/ghostscript9-agpl-base/files/patch-contrib-contrib.mak b/print/ghostscript9-agpl-base/files/patch-contrib_contrib.mak index a9263619fd93..f2bde44902d0 100644 --- a/print/ghostscript9-agpl-base/files/patch-contrib-contrib.mak +++ b/print/ghostscript9-agpl-base/files/patch-contrib_contrib.mak @@ -1,6 +1,6 @@ ---- contrib/contrib.mak.orig 2014-03-26 21:53:47.000000000 +0900 -+++ contrib/contrib.mak 2014-08-25 00:49:19.000000000 +0900 -@@ -943,7 +943,7 @@ +--- contrib/contrib.mak.orig 2015-03-30 08:21:24 UTC ++++ contrib/contrib.mak +@@ -943,7 +943,7 @@ $(DD)dmprt.dev : $(dmprt_) $(DD)page.dev $(DEVOBJ)gdevdmpr.$(OBJ) : $(JAPSRC)gdevdmpr.c $(JAPSRC)dviprlib.h $(PDEVH) $(DEVCC) $(O_)$@ $(C_) $(JAPSRC)gdevdmpr.c @@ -9,7 +9,7 @@ $(DEVCC) $(O_)$@ $(C_) $(JAPSRC)dviprlib.c extra-dmprt-install: -@@ -1095,3 +1095,5 @@ +@@ -1095,3 +1095,5 @@ extra-upp-install: ### ------------ Build/Install special features ------------ ### install-contrib-extras: extra-dmprt-install extra-upp-install diff --git a/print/ghostscript9-agpl-base/files/patch-contrib__gomni.c b/print/ghostscript9-agpl-base/files/patch-contrib_gomni.c index 4129fdebbf74..a8cf980d3035 100644 --- a/print/ghostscript9-agpl-base/files/patch-contrib__gomni.c +++ b/print/ghostscript9-agpl-base/files/patch-contrib_gomni.c @@ -1,6 +1,6 @@ ---- contrib/gomni.c.orig 2013-04-28 02:09:12.000000000 +0900 -+++ contrib/gomni.c 2013-04-28 02:09:14.000000000 +0900 -@@ -530,7 +530,7 @@ +--- contrib/gomni.c.orig 2015-03-30 08:21:24 UTC ++++ contrib/gomni.c +@@ -530,7 +530,7 @@ CloseDevice (gx_device * pdev) && pDev->pcoreOmni->pszJobOptions ) { @@ -9,7 +9,7 @@ } if ( pDev->pcoreOmni -@@ -549,7 +549,7 @@ +@@ -549,7 +549,7 @@ CloseDevice (gx_device * pdev) if (pDev->pcoreOmni) { @@ -18,7 +18,7 @@ pDev->pcoreOmni = 0; } -@@ -720,7 +720,7 @@ +@@ -720,7 +720,7 @@ SetupDevice (gx_device *pgxdev, gs_param { PDEVSTRUCT p; @@ -27,7 +27,7 @@ if (!p) { dprintf ("<<<<<<<<<<<<<<<<<<<<<< ERROR >>>>>>>>>>>>>>>>>>>>>>>\n\n"); -@@ -734,7 +734,7 @@ +@@ -734,7 +734,7 @@ SetupDevice (gx_device *pgxdev, gs_param memset (pDev, 0, sizeof (Omni_Dev)); @@ -36,7 +36,7 @@ if (!pDev->pcoreOmni) { -@@ -783,7 +783,7 @@ +@@ -783,7 +783,7 @@ SetupDevice (gx_device *pgxdev, gs_param for (i = 0; i < sizeof (apszLibraryPaths)/sizeof (apszLibraryPaths[0]) && !pDev->hmodOmni; i++) { @@ -45,7 +45,7 @@ strlen (cOmnilib) + strlen (apszLibraryPaths[i]) + 1, -@@ -796,7 +796,7 @@ +@@ -796,7 +796,7 @@ SetupDevice (gx_device *pgxdev, gs_param if (fDebugOutput) dprintf2 ("SetupDevice: Trying to load %s = %p\n", pszDeviceLib, pDev->hmodOmni); } @@ -54,7 +54,7 @@ } if (!pDev->hmodOmni) -@@ -810,7 +810,7 @@ +@@ -810,7 +810,7 @@ SetupDevice (gx_device *pgxdev, gs_param for (i = 0; i < sizeof (apszLibraryPaths)/sizeof (apszLibraryPaths[0]) && !pDev->hmodOmni; i++) { @@ -63,7 +63,7 @@ strlen (cOmnilib) + strlen (apszLibraryPaths[i]) + 1, -@@ -830,7 +830,7 @@ +@@ -830,7 +830,7 @@ SetupDevice (gx_device *pgxdev, gs_param g_module_close (pModule); } } @@ -72,7 +72,7 @@ } return 1; -@@ -953,7 +953,7 @@ +@@ -953,7 +953,7 @@ SetupDevice (gx_device *pgxdev, gs_param ) { if (!pDev->pcoreOmni->pszJobOptions) @@ -81,7 +81,7 @@ memcpy (pDev->pcoreOmni->pszJobOptions, fname.data, fname.size); pDev->pcoreOmni->pszJobOptions[fname.size] = '\0'; } -@@ -1044,7 +1044,7 @@ +@@ -1044,7 +1044,7 @@ SetupDevice (gx_device *pgxdev, gs_param for (i = 0; i < sizeof (apszLibraryPaths)/sizeof (apszLibraryPaths[0]) && !pModule; i++) { @@ -90,7 +90,7 @@ strlen (cDialogName) + strlen (apszLibraryPaths[i]) + 1, -@@ -1059,7 +1059,7 @@ +@@ -1059,7 +1059,7 @@ SetupDevice (gx_device *pgxdev, gs_param pModule = g_module_open (pszDeviceLib, (GModuleFlags)0); } @@ -99,7 +99,7 @@ } if (!pModule) -@@ -1070,7 +1070,7 @@ +@@ -1070,7 +1070,7 @@ SetupDevice (gx_device *pgxdev, gs_param for (i = 0; i < sizeof (apszLibraryPaths)/sizeof (apszLibraryPaths[0]) && !pModule; i++) { @@ -108,7 +108,7 @@ strlen (cDialogName) + strlen (apszLibraryPaths[i]) + 1, -@@ -1092,7 +1092,7 @@ +@@ -1092,7 +1092,7 @@ SetupDevice (gx_device *pgxdev, gs_param g_module_close (pModule); } } @@ -117,7 +117,7 @@ } } else -@@ -1107,13 +1107,13 @@ +@@ -1107,13 +1107,13 @@ SetupDevice (gx_device *pgxdev, gs_param if (pDev->pcoreOmni->pszJobOptions) { @@ -133,7 +133,7 @@ strcpy (pDev->pcoreOmni->pszJobOptions, pszSelectedJobProperties); -@@ -1375,7 +1375,7 @@ +@@ -1375,7 +1375,7 @@ PrintPage (gx_device_printer *pgx_prt_de iBytesToAlloc += (iNumColors - 1) * sizeof (RGB2); } @@ -142,7 +142,7 @@ if (!pbmi) { eprintf("<<<<<<<<<<<<<<<<<<<<<< ERROR >>>>>>>>>>>>>>>>>>>>>>>\n\n"); -@@ -1481,7 +1481,7 @@ +@@ -1481,7 +1481,7 @@ PrintPage (gx_device_printer *pgx_prt_de } } @@ -151,7 +151,7 @@ if (pGSData == 0) /* can't allocate row buffer */ -@@ -1501,7 +1501,7 @@ +@@ -1501,7 +1501,7 @@ PrintPage (gx_device_printer *pgx_prt_de pasyncDev->pDev->iVertDots, 8000*1024); /*eight meg buffer */ @@ -160,7 +160,7 @@ if(!pBitmapMem) { -@@ -1613,7 +1613,7 @@ +@@ -1613,7 +1613,7 @@ PrintPage (gx_device_printer *pgx_prt_de { if (prtMode.iBitCount < 16) { @@ -169,7 +169,7 @@ if (pMonoData) { -@@ -1661,7 +1661,7 @@ +@@ -1661,7 +1661,7 @@ PrintPage (gx_device_printer *pgx_prt_de /* We're done with the mono band */ /* now free up the mono buffer so we can get clean data buffer if more lines are to be */ /* gray-scaled */ @@ -178,7 +178,7 @@ pMonoData = NULL; } -@@ -1709,11 +1709,11 @@ +@@ -1709,11 +1709,11 @@ PrintPage (gx_device_printer *pgx_prt_de done: diff --git a/print/ghostscript9-agpl-base/files/patch-contrib__japanese__dmp_site.ps b/print/ghostscript9-agpl-base/files/patch-contrib_japanese_dmp__site.ps index f24d26c6d2b7..0d1538f5d268 100644 --- a/print/ghostscript9-agpl-base/files/patch-contrib__japanese__dmp_site.ps +++ b/print/ghostscript9-agpl-base/files/patch-contrib_japanese_dmp__site.ps @@ -1,5 +1,5 @@ ---- contrib/japanese/dmp_site.ps.orig 2015-03-30 17:21:24.000000000 +0900 -+++ contrib/japanese/dmp_site.ps 2015-08-22 03:10:27.500014000 +0900 +--- contrib/japanese/dmp_site.ps.orig 2015-03-30 08:21:24 UTC ++++ contrib/japanese/dmp_site.ps @@ -1,7 +1,7 @@ %! BeginConfig diff --git a/print/ghostscript9-agpl-base/files/patch-contrib__japanese__gdevdmpr.c b/print/ghostscript9-agpl-base/files/patch-contrib_japanese_gdevdmpr.c index e4ed6582cf78..7d943a123a87 100644 --- a/print/ghostscript9-agpl-base/files/patch-contrib__japanese__gdevdmpr.c +++ b/print/ghostscript9-agpl-base/files/patch-contrib_japanese_gdevdmpr.c @@ -1,5 +1,5 @@ ---- contrib/japanese/gdevdmpr.c.orig 2014-03-26 21:53:47.000000000 +0900 -+++ contrib/japanese/gdevdmpr.c 2014-08-25 00:36:18.000000000 +0900 +--- contrib/japanese/gdevdmpr.c.orig 2015-03-30 08:21:24 UTC ++++ contrib/japanese/gdevdmpr.c @@ -32,7 +32,7 @@ #include "gdevprn.h" @@ -18,7 +18,7 @@ #define LOCAL_DEBUG 0 #define DEVICE_NAME "dmprt" -@@ -402,8 +400,6 @@ +@@ -402,8 +400,6 @@ gdev_dmprt_put_params(gx_device *pdev, g if (pddev->dmprt.max_height>0 && pddev->dmprt.max_height<pddev->height) pddev->height = pddev->dmprt.max_height; @@ -27,7 +27,7 @@ return code; } -@@ -422,8 +418,6 @@ +@@ -422,8 +418,6 @@ gdev_dmprt_put_dmprt_params(gx_device *p if (code < 0) return code; if (code == 0) pddev->dmprt.debug_f = vbool; @@ -36,7 +36,7 @@ code = param_read_bool(plist, "Verbose", &vbool); if (code < 0) return code; pddev->dmprt.verbose_f = vbool; -@@ -846,13 +840,12 @@ +@@ -846,13 +840,12 @@ gdev_dmprt_dviprt_lib_fopen(const char * char *env; strcpy(fname,fnamebase); diff --git a/print/ghostscript9-agpl-base/files/patch-lips:gdevlips.c b/print/ghostscript9-agpl-base/files/patch-contrib_lips4_gdevlips.c index 0917be89e49a..379db51cd66c 100644 --- a/print/ghostscript9-agpl-base/files/patch-lips:gdevlips.c +++ b/print/ghostscript9-agpl-base/files/patch-contrib_lips4_gdevlips.c @@ -1,6 +1,6 @@ ---- contrib/lips4/gdevlips.c.orig 2011-08-05 20:12:20.000000000 +0900 -+++ contrib/lips4/gdevlips.c 2011-12-06 15:31:38.000000000 +0900 -@@ -62,7 +62,15 @@ +--- contrib/lips4/gdevlips.c.orig 2015-03-30 08:21:24 UTC ++++ contrib/lips4/gdevlips.c +@@ -62,7 +62,15 @@ lips_media_selection(int width, int heig height = tmp; } for (pt = lips_paper_table; pt->num_unit < 80; pt++) diff --git a/print/ghostscript9-agpl-base/files/patch-lips:gdevlips.h b/print/ghostscript9-agpl-base/files/patch-contrib_lips4_gdevlips.h index b3520ba1ac33..f9f5f0906b27 100644 --- a/print/ghostscript9-agpl-base/files/patch-lips:gdevlips.h +++ b/print/ghostscript9-agpl-base/files/patch-contrib_lips4_gdevlips.h @@ -1,8 +1,8 @@ ---- contrib/lips4/gdevlips.h.orig Thu Nov 2 12:09:18 2000 -+++ contrib/lips4/gdevlips.h Tue Jan 13 01:23:47 2004 -@@ -188,6 +188,14 @@ +--- contrib/lips4/gdevlips.h.orig 2015-03-30 08:21:24 UTC ++++ contrib/lips4/gdevlips.h +@@ -191,6 +191,14 @@ bool faceup;\ - char mediaType[LIPS_MEDIACHAR_MAX]; + char mediaType[LIPS_MEDIACHAR_MAX] +/* added by shige 11/06 2003 */ +#define USE_LIPS_SIZE_ERROR diff --git a/print/ghostscript9-agpl-base/files/patch-devices-devs.mak b/print/ghostscript9-agpl-base/files/patch-devices_devs.mak index a1c1d134dd66..01d2cce19295 100644 --- a/print/ghostscript9-agpl-base/files/patch-devices-devs.mak +++ b/print/ghostscript9-agpl-base/files/patch-devices_devs.mak @@ -1,6 +1,6 @@ ---- devices/devs.mak.orig 2015-03-30 17:21:24.000000000 +0900 -+++ devices/devs.mak 2015-07-14 08:48:48.795797000 +0900 -@@ -546,7 +546,7 @@ +--- devices/devs.mak.orig 2015-03-30 08:21:24 UTC ++++ devices/devs.mak +@@ -546,7 +546,7 @@ $(DEVOBJ)gdevxalt.$(OBJ) : $(DEVSRC)gdev ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT $(DEVOBJ)X11.so : $(x11alt_) $(x11_) $(MAKEDIRS) diff --git a/print/ghostscript9-agpl-base/files/patch-devices-gdevl256.c b/print/ghostscript9-agpl-base/files/patch-devices_gdevl256.c index ed7d36002a62..86ebbb32fbd8 100644 --- a/print/ghostscript9-agpl-base/files/patch-devices-gdevl256.c +++ b/print/ghostscript9-agpl-base/files/patch-devices_gdevl256.c @@ -1,6 +1,6 @@ ---- devices/gdevl256.c.orig 2011-07-17 19:57:32.000000000 +0900 -+++ devices/gdevl256.c 2011-07-17 19:57:39.000000000 +0900 -@@ -302,12 +302,3 @@ +--- devices/gdevl256.c.orig 2015-03-30 08:21:24 UTC ++++ devices/gdevl256.c +@@ -303,12 +303,3 @@ lvga256_draw_line(gx_device * dev, int x gl_line(x0, y0, x1, y1, color); return 0; } diff --git a/print/ghostscript9-agpl-base/files/patch-devices-gdevperm.c b/print/ghostscript9-agpl-base/files/patch-devices_gdevperm.c index ed420367dc22..13a816906c13 100644 --- a/print/ghostscript9-agpl-base/files/patch-devices-gdevperm.c +++ b/print/ghostscript9-agpl-base/files/patch-devices_gdevperm.c @@ -1,6 +1,6 @@ ---- devices/gdevperm.c.orig 2012-02-08 17:48:48.000000000 +0900 -+++ devices/gdevperm.c 2012-02-13 00:44:23.000000000 +0900 -@@ -285,7 +285,7 @@ +--- devices/gdevperm.c.orig 2015-03-30 08:21:24 UTC ++++ devices/gdevperm.c +@@ -288,7 +288,7 @@ perm_get_color_mapping_procs(const gx_de (strncmp((const char *)name, (const char *)str, name_size) == 0)) static int @@ -9,7 +9,7 @@ int name_size, int component_type) { const gx_device_perm_t * const dev = (const gx_device_perm_t *)pdev; -@@ -332,7 +332,6 @@ +@@ -335,7 +335,6 @@ static int perm_decode_color(gx_device *dev, gx_color_index color, gx_color_value *out) { int bpc = 8; diff --git a/print/ghostscript9-agpl-base/files/patch-devices-gdevplib.c b/print/ghostscript9-agpl-base/files/patch-devices_gdevplib.c index b14a47184e50..2213e572f3db 100644 --- a/print/ghostscript9-agpl-base/files/patch-devices-gdevplib.c +++ b/print/ghostscript9-agpl-base/files/patch-devices_gdevplib.c @@ -1,6 +1,6 @@ ---- devices/gdevplib.c.orig 2015-03-30 17:21:24.000000000 +0900 -+++ devices/gdevplib.c 2015-07-14 08:51:50.711673000 +0900 -@@ -156,7 +156,11 @@ +--- devices/gdevplib.c.orig 2015-03-30 08:21:24 UTC ++++ devices/gdevplib.c +@@ -156,7 +156,11 @@ void __aebi_memmove(void *dest, const vo #ifdef TESTING_WITH_NO_BAND_DONOR diff --git a/print/ghostscript9-agpl-base/files/patch-devices-gdevvglb.c b/print/ghostscript9-agpl-base/files/patch-devices_gdevvglb.c index ca8dcf130c2c..86adcbcb2497 100644 --- a/print/ghostscript9-agpl-base/files/patch-devices-gdevvglb.c +++ b/print/ghostscript9-agpl-base/files/patch-devices_gdevvglb.c @@ -1,6 +1,6 @@ ---- devices/gdevvglb.c.orig 2011-07-17 19:56:33.000000000 +0900 -+++ devices/gdevvglb.c 2011-07-17 19:57:10.000000000 +0900 -@@ -367,12 +367,3 @@ +--- devices/gdevvglb.c.orig 2015-03-30 08:21:24 UTC ++++ devices/gdevvglb.c +@@ -368,12 +368,3 @@ vgalib_put_params(gx_device * dev, gs_pa } return 0; } diff --git a/print/ghostscript9-agpl-base/files/patch-epag-ert.c b/print/ghostscript9-agpl-base/files/patch-epag-3.09_ert.c index 6a6dd2540b8a..d4395ca747a5 100644 --- a/print/ghostscript9-agpl-base/files/patch-epag-ert.c +++ b/print/ghostscript9-agpl-base/files/patch-epag-3.09_ert.c @@ -1,5 +1,5 @@ ---- epag-3.09/ert.c.orig 2000-07-08 13:33:09.000000000 +0900 -+++ epag-3.09/ert.c 2012-02-13 01:28:55.000000000 +0900 +--- epag-3.09/ert.c.orig 2000-07-08 04:33:09 UTC ++++ epag-3.09/ert.c @@ -1,6 +1,8 @@ /* $Id: ert.c,v 1.3 1998/11/20 10:51:12 nari Exp $ */ diff --git a/print/ghostscript9-agpl-base/files/patch-epag__gdevepag.c b/print/ghostscript9-agpl-base/files/patch-epag-3.09_gdevepag.c index 6012768b4d9c..f4d3f11e7b8c 100644 --- a/print/ghostscript9-agpl-base/files/patch-epag__gdevepag.c +++ b/print/ghostscript9-agpl-base/files/patch-epag-3.09_gdevepag.c @@ -1,6 +1,6 @@ ---- epag/gdevepag.c.orig Sat Jul 8 13:33:09 2000 -+++ epag/gdevepag.c Sat Nov 24 15:25:11 2007 -@@ -102,30 +102,30 @@ +--- epag-3.09/gdevepag.c.orig 2000-07-08 04:33:09 UTC ++++ epag-3.09/gdevepag.c +@@ -102,30 +102,30 @@ typedef struct _epagBubble{ } EpagBubble; /* The device descriptors */ @@ -50,7 +50,7 @@ prn_params_procs(epag_open, gdev_prn_output_page, epag_close, epag_get_params, epag_put_params); gx_device_printer far_data gs_epag_device = -@@ -140,13 +140,13 @@ +@@ -140,13 +140,13 @@ prn_device(prn_epag_procs, "epag", static char *epson_remote_start = "\033\001@EJL \r\n"; /* Open the printer, adjusting the margins if necessary. */ @@ -66,7 +66,7 @@ epag_close(gx_device *pdev) { gdev_prn_open_printer(pdev, 1); -@@ -163,7 +163,7 @@ +@@ -163,7 +163,7 @@ epag_close(gx_device *pdev) return gdev_prn_close(pdev); } @@ -75,7 +75,7 @@ epag_print_page(gx_device_printer *pdev, FILE *fp) { EpagPageCont cont; -@@ -205,7 +205,7 @@ +@@ -205,7 +205,7 @@ static char can_inits[] ={ GS, '2', 'a', 'b', 'P', /* イメージ描画後下へ */ }; @@ -84,7 +84,7 @@ epag_printer_initialize(gx_device_printer *pdev, FILE *fp, int copies) { double xDpi,yDpi; -@@ -260,7 +260,7 @@ +@@ -260,7 +260,7 @@ epag_printer_initialize(gx_device_printe fprintf(fp,"%c%dcoO",GS, copies < 256 ? copies : 255); } @@ -93,7 +93,7 @@ epag_get_params(gx_device *pdev, gs_param_list *plist) { int code; -@@ -286,7 +286,7 @@ +@@ -286,7 +286,7 @@ epag_get_params(gx_device *pdev, gs_para } /* Put properties. */ @@ -102,7 +102,7 @@ epag_put_params(gx_device *pdev, gs_param_list *plist) { param_read_int(plist, "cRowBuf", &epag_cont.cRowBuf); -@@ -380,7 +380,7 @@ +@@ -380,7 +380,7 @@ void epag_paper_set(gx_device_printer *p /* * epag_bubble_flush_all: 残っている bubbleを全て出力する。 */ @@ -111,7 +111,7 @@ { int i; -@@ -392,7 +392,7 @@ +@@ -392,7 +392,7 @@ private void epag_bubble_flush_all(EpagP /* * epag_page_cont_init: EpagPageContの初期化、バッファ確保等 */ @@ -120,7 +120,7 @@ EpagPageCont *cont) { int bpl; -@@ -417,15 +417,15 @@ +@@ -417,15 +417,15 @@ private void epag_page_cont_init(gx_devi cont->maxY = epag_cont.cRowBuf / cont->bh * cont->bh ; if(cont->maxY < cont->bh) cont->maxY = cont->bh; @@ -140,7 +140,7 @@ bbtbl = (EpagBubble *)cont->bubbleBuffer; for(i=0;i<cont->maxBx-1;i++) bbtbl[i].next = &bbtbl[i+1]; -@@ -433,15 +433,15 @@ +@@ -433,15 +433,15 @@ private void epag_page_cont_init(gx_devi cont->freeBubbleList = &bbtbl[0]; } @@ -161,7 +161,7 @@ epag_read_image(EpagPageCont *cont) { int bh = cont->bh; -@@ -473,7 +473,7 @@ +@@ -473,7 +473,7 @@ epag_read_image(EpagPageCont *cont) /* * bh行分のラスターデータを処理する */ @@ -170,7 +170,7 @@ epag_process_line(EpagPageCont *cont) { int bh = cont->bh; -@@ -502,7 +502,7 @@ +@@ -502,7 +502,7 @@ epag_process_line(EpagPageCont *cont) else epag_rect_add(cont, 0, cont->maxBx-1); } @@ -179,7 +179,7 @@ epag_is_black(EpagPageCont *cont, int bx) { int bh = cont->bh; -@@ -520,7 +520,7 @@ +@@ -520,7 +520,7 @@ epag_is_black(EpagPageCont *cont, int bx return 0; } @@ -188,7 +188,7 @@ epag_rect_add(EpagPageCont *cont,int start,int end) { int x0 = start * cont->bw; -@@ -544,7 +544,7 @@ +@@ -544,7 +544,7 @@ epag_rect_add(EpagPageCont *cont,int sta } } @@ -197,7 +197,7 @@ epag_bubble_gen(EpagPageCont *cont, int x0, int x1, int y0, int y1) { EpagBubble *bbl; -@@ -569,7 +569,7 @@ +@@ -569,7 +569,7 @@ epag_bubble_gen(EpagPageCont *cont, int } } @@ -206,7 +206,7 @@ { int bx,bx0,bx1; -@@ -588,7 +588,7 @@ +@@ -588,7 +588,7 @@ private void epag_bubble_flush(EpagPageC /* イメージを出力 */ diff --git a/print/ghostscript9-agpl-base/files/patch-openjpeg-src-lib-openjp2-opj_includes.h b/print/ghostscript9-agpl-base/files/patch-openjpeg_src_lib_openjp2_opj__includes.h index c76c46f4ad48..922a0841f540 100644 --- a/print/ghostscript9-agpl-base/files/patch-openjpeg-src-lib-openjp2-opj_includes.h +++ b/print/ghostscript9-agpl-base/files/patch-openjpeg_src_lib_openjp2_opj__includes.h @@ -1,7 +1,7 @@ ---- openjpeg/src/lib/openjp2/opj_includes.h.orig 2012-02-13 08:48:33.000000000 +0900 -+++ openjpeg/src/lib/openjp2/opj_includes.h 2012-02-13 08:50:41.000000000 +0900 -@@ -77,7 +77,7 @@ - #endif /* INLINE */ +--- openjpeg/src/lib/openjp2/opj_includes.h.orig 2015-03-30 08:21:24 UTC ++++ openjpeg/src/lib/openjp2/opj_includes.h +@@ -109,7 +109,7 @@ + /* Are restricted pointers available? (C99) */ -#if (__STDC_VERSION__ != 199901L) diff --git a/print/ghostscript9-agpl-base/files/patch-psi-zicc.c b/print/ghostscript9-agpl-base/files/patch-psi-zicc.c deleted file mode 100644 index 98c4eed85c37..000000000000 --- a/print/ghostscript9-agpl-base/files/patch-psi-zicc.c +++ /dev/null @@ -1,12 +0,0 @@ ---- psi/zicc.c -+++ psi/zicc.c 2008-02-05 16:11:59.000000000 +0000 -@@ -77,6 +77,9 @@ zseticcspace(i_ctx_t * i_ctx_p) - dict_find_string(op, "N", &pnval); - ncomps = pnval->value.intval; - -+ if (2*ncomps > sizeof(range_buff)/sizeof(float)) -+ return_error(e_rangecheck); -+ - /* verify the DataSource entry */ - if (dict_find_string(op, "DataSource", &pstrmval) <= 0) - return_error(e_undefined); diff --git a/print/ghostscript9-agpl-base/files/patch-psi_zicc.c b/print/ghostscript9-agpl-base/files/patch-psi_zicc.c new file mode 100644 index 000000000000..c2d2953c91d1 --- /dev/null +++ b/print/ghostscript9-agpl-base/files/patch-psi_zicc.c @@ -0,0 +1,12 @@ +--- psi/zicc.c.orig 2015-03-30 08:21:24 UTC ++++ psi/zicc.c +@@ -61,6 +61,9 @@ int seticc(i_ctx_t * i_ctx_p, int ncomps + + palt_cs = gs_currentcolorspace(igs); + ++ if (2*ncomps > sizeof(range_buff)/sizeof(float)) ++ return_error(e_rangecheck); ++ + /* verify the DataSource entry */ + if (dict_find_string(ICCdict, "DataSource", &pstrmval) <= 0) + return_error(e_undefined); diff --git a/print/ghostscript9-agpl-base/files/patch-trio-triodef.h b/print/ghostscript9-agpl-base/files/patch-trio_triodef.h index 8428c0fedc98..ac09c5f67d16 100644 --- a/print/ghostscript9-agpl-base/files/patch-trio-triodef.h +++ b/print/ghostscript9-agpl-base/files/patch-trio_triodef.h @@ -1,5 +1,5 @@ ---- trio/triodef.h.orig 2015-07-19 03:20:32.007345000 +0900 -+++ trio/triodef.h 2015-07-19 03:27:30.381863000 +0900 +--- trio/triodef.h.orig 2015-03-30 08:21:24 UTC ++++ trio/triodef.h @@ -185,12 +185,13 @@ # endif #endif diff --git a/print/ghostscript9-agpl-base/files/patch-trio-triop.h b/print/ghostscript9-agpl-base/files/patch-trio_triop.h index 795b3299e564..41c2cae08857 100644 --- a/print/ghostscript9-agpl-base/files/patch-trio-triop.h +++ b/print/ghostscript9-agpl-base/files/patch-trio_triop.h @@ -1,6 +1,6 @@ ---- trio/triop.h.orig 2015-03-30 17:21:24.000000000 +0900 -+++ trio/triop.h 2015-07-21 06:00:48.713329000 +0900 -@@ -404,7 +404,11 @@ +--- trio/triop.h.orig 2015-03-30 08:21:24 UTC ++++ trio/triop.h +@@ -404,7 +404,11 @@ trio_pointer_t trio_register TRIO_PROTO( void trio_unregister TRIO_PROTO((trio_pointer_t handle)); TRIO_CONST char *trio_get_format TRIO_PROTO((trio_pointer_t ref)); |