works por deps fixed...
This commit is contained in:
@@ -0,0 +1,9 @@
|
||||
diff -up ghostscript-8.71/Resource/Init/Fontmap.Fontmap.local ghostscript-8.71/Resource/Init/Fontmap
|
||||
--- ghostscript-8.71/Resource/Init/Fontmap.Fontmap.local 2008-08-08 05:22:38.000000000 +0100
|
||||
+++ ghostscript-8.71/Resource/Init/Fontmap 2010-09-03 11:53:47.273865979 +0100
|
||||
@@ -2,3 +2,5 @@
|
||||
% See Fontmap.GS for the syntax of real Fontmap files.
|
||||
%% Replace 1 (Fontmap.GS)
|
||||
(Fontmap.GS) .runlibfile
|
||||
+% must be at the bottom of line to allow people overriding everything.
|
||||
+(Fontmap.local) .runlibfileifexists
|
||||
@@ -0,0 +1,11 @@
|
||||
diff -up ghostscript-9.07/cups/gdevcups.c.gdevcups-debug-uninit ghostscript-9.07/cups/gdevcups.c
|
||||
--- ghostscript-9.07/cups/gdevcups.c.gdevcups-debug-uninit 2013-02-14 07:58:16.000000000 +0000
|
||||
+++ ghostscript-9.07/cups/gdevcups.c 2013-02-14 17:16:59.677951232 +0000
|
||||
@@ -830,6 +830,7 @@ cups_get_matrix(gx_device *pdev, /* I -
|
||||
dmprintf4(pdev->memory, "DEBUG2: PageSize = [ %d %d ], HWResolution = [ %d %d ]\n",
|
||||
cups->header.PageSize[0], cups->header.PageSize[1],
|
||||
cups->header.HWResolution[0], cups->header.HWResolution[1]);
|
||||
+ if (size_set)
|
||||
dmprintf4(pdev->memory, "DEBUG2: HWMargins = [ %.3f %.3f %.3f %.3f ]\n",
|
||||
pdev->HWMargins[0], pdev->HWMargins[1], pdev->HWMargins[2],
|
||||
pdev->HWMargins[3]);
|
||||
@@ -0,0 +1,12 @@
|
||||
diff -up ghostscript-9.12/base/gsicc.c.gs694154 ghostscript-9.12/base/gsicc.c
|
||||
--- ghostscript-9.12/base/gsicc.c.gs694154 2014-03-25 08:52:16.000000000 +0000
|
||||
+++ ghostscript-9.12/base/gsicc.c 2014-03-26 11:32:31.406034840 +0000
|
||||
@@ -468,6 +468,8 @@ gx_remap_ICC_imagelab(const gs_client_co
|
||||
cmm_dev_profile_t *dev_profile;
|
||||
|
||||
code = dev_proc(dev, get_profile)(dev, &dev_profile);
|
||||
+ if (dev_profile == NULL)
|
||||
+ return gs_throw(gs_error_Fatal, "Attempting to do ICC remap with no profile");
|
||||
num_des_comps = gsicc_get_device_profile_comps(dev_profile);
|
||||
rendering_params.black_point_comp = pis->blackptcomp;
|
||||
rendering_params.graphics_type_tag = dev->graphics_type_tag;
|
||||
@@ -0,0 +1,12 @@
|
||||
diff -up ghostscript-9.12/base/gsicc_manage.c.icc-missing-check ghostscript-9.12/base/gsicc_manage.c
|
||||
--- ghostscript-9.12/base/gsicc_manage.c.icc-missing-check 2014-03-26 11:31:11.296570797 +0000
|
||||
+++ ghostscript-9.12/base/gsicc_manage.c 2014-03-26 11:32:10.384912584 +0000
|
||||
@@ -613,6 +613,8 @@ gsicc_set_srcgtag_struct(gsicc_manager_t
|
||||
icc_profile =
|
||||
gsicc_profile_new(str, mem, curr_ptr, strlen(curr_ptr));
|
||||
code = sfclose(str);
|
||||
+ }
|
||||
+ if (str != NULL && icc_profile != NULL) {
|
||||
gsicc_init_profile_info(icc_profile);
|
||||
cmm = gsCMM_DEFAULT;
|
||||
/* Check if this object is a devicelink profile.
|
||||
@@ -0,0 +1,35 @@
|
||||
diff -up ghostscript-9.06/base/gsicc_manage.c.iccprofiles-initdir ghostscript-9.06/base/gsicc_manage.c
|
||||
--- ghostscript-9.06/base/gsicc_manage.c.iccprofiles-initdir 2012-08-09 13:58:22.102364807 +0100
|
||||
+++ ghostscript-9.06/base/gsicc_manage.c 2012-08-09 14:09:24.495864641 +0100
|
||||
@@ -38,6 +38,7 @@
|
||||
#include "gsicc_create.h"
|
||||
#include "gpmisc.h"
|
||||
#include "gxdevice.h"
|
||||
+#include "gxiodev.h"
|
||||
|
||||
#define ICC_HEADER_SIZE 128
|
||||
|
||||
@@ -2176,8 +2177,21 @@ gs_currenticcdirectory(const gs_state *
|
||||
const gs_lib_ctx_t *lib_ctx = pgs->memory->gs_lib_ctx;
|
||||
|
||||
if (lib_ctx->profiledir == NULL) {
|
||||
- pval->data = (const byte *)rfs;
|
||||
- pval->size = strlen(rfs);
|
||||
+ int have_rom_device = 0;
|
||||
+ int i;
|
||||
+
|
||||
+ for (i = 0; i < gx_io_device_table_count; i++) {
|
||||
+ const gx_io_device *iodev = lib_ctx->io_device_table[i];
|
||||
+ const char *dname = iodev->dname;
|
||||
+
|
||||
+ if (dname && strlen(dname) == 5 && !memcmp("%rom%", dname, 5)) {
|
||||
+ have_rom_device = 1;
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ pval->data = (const byte *)(have_rom_device ? rfs : "");
|
||||
+ pval->size = strlen((const char *)pval->data);
|
||||
pval->persistent = true;
|
||||
} else {
|
||||
pval->data = (const byte *)(lib_ctx->profiledir);
|
||||
@@ -0,0 +1,14 @@
|
||||
diff -up ghostscript-8.61/ijs/Makefile.am.multilib ghostscript-8.61/ijs/Makefile.am
|
||||
diff -up ghostscript-8.61/ijs/ijs-config.in.multilib ghostscript-8.61/ijs/ijs-config.in
|
||||
--- ghostscript-8.61/ijs/ijs-config.in.multilib 2002-01-31 19:09:46.000000000 +0000
|
||||
+++ ghostscript-8.61/ijs/ijs-config.in 2007-11-23 09:19:18.000000000 +0000
|
||||
@@ -43,8 +43,7 @@ while test $# -gt 0; do
|
||||
echo $includes
|
||||
;;
|
||||
--libs)
|
||||
- libdirs=-L@libdir@
|
||||
- echo $libdirs -lijs
|
||||
+ echo -lijs
|
||||
;;
|
||||
*)
|
||||
echo "${usage}" 1>&2
|
||||
@@ -0,0 +1,12 @@
|
||||
diff -up ghostscript-8.64/psi/int.mak.noopt ghostscript-8.64/psi/int.mak
|
||||
--- ghostscript-8.64/psi/int.mak.noopt 2008-12-26 07:25:31.000000000 +0000
|
||||
+++ ghostscript-8.64/psi/int.mak 2009-02-04 11:33:48.000000000 +0000
|
||||
@@ -111,7 +111,7 @@ $(PSOBJ)igc.$(OBJ) : $(PSSRC)igc.c $(GH)
|
||||
$(PSOBJ)igcref.$(OBJ) : $(PSSRC)igcref.c $(GH) $(memory__h)\
|
||||
$(gsexit_h) $(gsstruct_h)\
|
||||
$(iastate_h) $(idebug_h) $(igc_h) $(iname_h) $(ipacked_h) $(store_h)
|
||||
- $(PSCC) $(PSO_)igcref.$(OBJ) $(C_) $(PSSRC)igcref.c
|
||||
+ $(PSCC) -O0 $(PSO_)igcref.$(OBJ) $(C_) $(PSSRC)igcref.c
|
||||
|
||||
$(PSOBJ)igcstr.$(OBJ) : $(PSSRC)igcstr.c $(GH) $(memory__h)\
|
||||
$(gsmdebug_h) $(gsstruct_h) $(iastate_h) $(igcstr_h)
|
||||
@@ -0,0 +1,52 @@
|
||||
diff -up ghostscript-9.12/Resource/Init/gs_fonts.ps.runlibfileifexists ghostscript-9.12/Resource/Init/gs_fonts.ps
|
||||
--- ghostscript-9.12/Resource/Init/gs_fonts.ps.runlibfileifexists 2014-03-25 08:52:16.000000000 +0000
|
||||
+++ ghostscript-9.12/Resource/Init/gs_fonts.ps 2014-03-26 12:01:48.248748767 +0000
|
||||
@@ -95,10 +95,19 @@ userdict /Fontmap .FontDirectory maxleng
|
||||
% stack: dict file fontname filename|aliasname
|
||||
1 index type /stringtype eq
|
||||
1 index type /nametype eq and 1 index xcheck and
|
||||
- 1 index /run eq 2 index /.runlibfile eq or and {
|
||||
+ 1 index /run eq 2 index /.runlibfile eq 3 index /.runlibfileifexists eq or or and {
|
||||
% This is an inclusion entry.
|
||||
- pop findlibfile { exch pop } { file } ifelse
|
||||
- 2 index exch .readFontmap pop
|
||||
+ 0 index /.runlibfileifexists eq {
|
||||
+ pop findlibfile {
|
||||
+ exch pop
|
||||
+ 2 index exch .readFontmap pop
|
||||
+ } {
|
||||
+ pop
|
||||
+ } ifelse
|
||||
+ } {
|
||||
+ pop findlibfile { exch pop } { file } ifelse
|
||||
+ 2 index exch .readFontmap pop
|
||||
+ } ifelse
|
||||
} {
|
||||
% This is a real entry.
|
||||
% Read and pop tokens until a semicolon.
|
||||
diff -up ghostscript-9.12/Resource/Init/gs_init.ps.runlibfileifexists ghostscript-9.12/Resource/Init/gs_init.ps
|
||||
--- ghostscript-9.12/Resource/Init/gs_init.ps.runlibfileifexists 2014-03-25 08:52:16.000000000 +0000
|
||||
+++ ghostscript-9.12/Resource/Init/gs_init.ps 2014-03-26 12:01:48.248748767 +0000
|
||||
@@ -681,6 +681,14 @@ systemdict /internaldict dup .makeintern
|
||||
{ /undefinedfilename signalerror }
|
||||
ifelse
|
||||
} bind def
|
||||
+/runlibfileifexists
|
||||
+ { % We don't want to bind 'run' into this procedure,
|
||||
+ % since run may get redefined.
|
||||
+ findlibfile
|
||||
+ { exch pop /run .systemvar exec }
|
||||
+ { pop }
|
||||
+ ifelse
|
||||
+ } bind def
|
||||
/selectdevice
|
||||
{ finddevice setdevice .setdefaultscreen } bind def
|
||||
/signalerror % <object> <errorname> signalerror -
|
||||
@@ -849,6 +857,7 @@ userdict /.currentresourcefile //null pu
|
||||
} bind def
|
||||
% Temporarily substitute it for the real runlibfile.
|
||||
/.runlibfile /runlibfile load def
|
||||
+/.runlibfileifexists /runlibfileifexists load def
|
||||
/runlibfile /runlibfile0 load def
|
||||
|
||||
% Create the error handling machinery.
|
||||
@@ -0,0 +1,10 @@
|
||||
diff -up ghostscript-9.00/lib/dvipdf.scripts ghostscript-9.00/lib/dvipdf
|
||||
--- ghostscript-9.00/lib/dvipdf.scripts 2010-06-03 01:32:07.000000000 +0100
|
||||
+++ ghostscript-9.00/lib/dvipdf 2010-09-23 09:56:35.592796899 +0100
|
||||
@@ -44,4 +44,4 @@ fi
|
||||
|
||||
# We have to include the options twice because -I only takes effect if it
|
||||
# appears before other options.
|
||||
-exec dvips -Ppdf $DVIPSOPTIONS -q -f "$infile" | $GS_EXECUTABLE $OPTIONS -q -P- -dSAFER -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sstdout=%stderr -sOutputFile="$outfile" $OPTIONS -c .setpdfwrite -
|
||||
+exec dvips -R -Ppdf $DVIPSOPTIONS -q -f "$infile" | $GS_EXECUTABLE $OPTIONS -q -P- -dSAFER -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sstdout=%stderr -sOutputFile="$outfile" $OPTIONS -c .setpdfwrite -
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
diff -up ghostscript-9.12/configure.ac.sys-zlib ghostscript-9.12/configure.ac
|
||||
--- ghostscript-9.12/configure.ac.sys-zlib 2014-03-26 11:48:54.983972222 +0000
|
||||
+++ ghostscript-9.12/configure.ac 2014-03-26 11:49:36.807230531 +0000
|
||||
@@ -854,7 +854,7 @@ AC_MSG_CHECKING([for local zlib source])
|
||||
dnl zlib is needed for language level 3, and libpng
|
||||
# we must define ZLIBDIR regardless because png.mak does a -I$(ZLIBDIR)
|
||||
# this seems a harmless default
|
||||
-ZLIBDIR=src
|
||||
+ZLIBDIR=$includedir
|
||||
AUX_SHARED_ZLIB=
|
||||
|
||||
if test -d $srcdir/zlib; then
|
||||
diff -up ghostscript-9.12/configure.sys-zlib ghostscript-9.12/configure
|
||||
--- ghostscript-9.12/configure.sys-zlib 2014-03-26 11:49:45.547284521 +0000
|
||||
+++ ghostscript-9.12/configure 2014-03-26 11:49:56.171350127 +0000
|
||||
@@ -6254,7 +6254,7 @@ fi
|
||||
$as_echo_n "checking for local zlib source... " >&6; }
|
||||
# we must define ZLIBDIR regardless because png.mak does a -I$(ZLIBDIR)
|
||||
# this seems a harmless default
|
||||
-ZLIBDIR=src
|
||||
+ZLIBDIR=$includedir
|
||||
AUX_SHARED_ZLIB=
|
||||
|
||||
if test -d $srcdir/zlib; then
|
||||
@@ -0,0 +1,22 @@
|
||||
diff -up ghostscript-9.07/base/wrfont.c.wrf-snprintf ghostscript-9.07/base/wrfont.c
|
||||
--- ghostscript-9.07/base/wrfont.c.wrf-snprintf 2013-07-01 13:02:33.373244683 +0100
|
||||
+++ ghostscript-9.07/base/wrfont.c 2013-07-01 13:04:55.022864299 +0100
|
||||
@@ -72,7 +72,8 @@ WRF_wfloat(WRF_output * a_output, double
|
||||
{
|
||||
char buffer[32];
|
||||
|
||||
- gs_sprintf(buffer, "%f", a_float);
|
||||
+ if (gs_snprintf(buffer, sizeof (buffer), "%f", a_float) >= sizeof (buffer))
|
||||
+ abort();
|
||||
WRF_wstring(a_output, buffer);
|
||||
}
|
||||
|
||||
@@ -81,6 +82,7 @@ WRF_wint(WRF_output * a_output, long a_i
|
||||
{
|
||||
char buffer[32];
|
||||
|
||||
- gs_sprintf(buffer, "%ld", a_int);
|
||||
+ if (gs_snprintf(buffer, sizeof (buffer), "%ld", a_int) >= sizeof (buffer))
|
||||
+ abort();
|
||||
WRF_wstring(a_output, buffer);
|
||||
}
|
||||
Reference in New Issue
Block a user