856d045a27
No longer need iccprofiles-initdir, gs694154, crash, sys-zlib, or trio-g patches. Resolves: rhbz#1145482
53 lines
2.3 KiB
Diff
53 lines
2.3 KiB
Diff
diff -up ghostscript-9.15/Resource/Init/gs_fonts.ps.runlibfileifexists ghostscript-9.15/Resource/Init/gs_fonts.ps
|
|
--- ghostscript-9.15/Resource/Init/gs_fonts.ps.runlibfileifexists 2014-09-22 11:17:33.000000000 +0100
|
|
+++ ghostscript-9.15/Resource/Init/gs_fonts.ps 2014-09-23 09:45:44.029511858 +0100
|
|
@@ -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.15/Resource/Init/gs_init.ps.runlibfileifexists ghostscript-9.15/Resource/Init/gs_init.ps
|
|
--- ghostscript-9.15/Resource/Init/gs_init.ps.runlibfileifexists 2014-09-22 11:17:33.000000000 +0100
|
|
+++ ghostscript-9.15/Resource/Init/gs_init.ps 2014-09-23 09:45:44.030511863 +0100
|
|
@@ -684,6 +684,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 -
|
|
@@ -852,6 +860,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.
|