- Revert previous change, but define .runlibfileifexists, not just

runlibfileifexists.
This commit is contained in:
Tim Waugh 2007-11-30 09:03:51 +00:00
parent bd71cc47fb
commit 9f8ded33f8
3 changed files with 36 additions and 6 deletions

10
cidfmap
View File

@ -2,9 +2,9 @@
% Don't change following line. We should ensure that the original one is surely loaded. % Don't change following line. We should ensure that the original one is surely loaded.
(cidfmap.GS) .runlibfile (cidfmap.GS) .runlibfile
% following lines are for CJK fonts. % following lines are for CJK fonts.
(cidfmap.ja) .runlibfile (cidfmap.ja) .runlibfileifexists
(cidfmap.ko) .runlibfile (cidfmap.ko) .runlibfileifexists
(cidfmap.zh_CN) .runlibfile (cidfmap.zh_CN) .runlibfileifexists
(cidfmap.zh_TW) .runlibfile (cidfmap.zh_TW) .runlibfileifexists
% must be at the bottom of line to allow people overriding everything. % must be at the bottom of line to allow people overriding everything.
(cidfmap.local) .runlibfile (cidfmap.local) .runlibfileifexists

View File

@ -0,0 +1,26 @@
diff -up ghostscript-8.61/lib/gs_init.ps.runlibfileifexists ghostscript-8.61/lib/gs_init.ps
--- ghostscript-8.61/lib/gs_init.ps.runlibfileifexists 2007-10-31 17:00:55.000000000 +0000
+++ ghostscript-8.61/lib/gs_init.ps 2007-11-30 09:02:19.000000000 +0000
@@ -671,6 +671,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 -
@@ -839,6 +847,7 @@ userdict /.currentresourcefile //null pu
} bind def
% Temporarily substitute it for the real runlibfile.
/.runlibfile /runlibfile load def
+/.runlibfileifexists /runlibfile load def
/runlibfile /runlibfile0 load def
% Create the error handling machinery.

View File

@ -5,7 +5,7 @@ Summary: A PostScript(TM) interpreter and renderer.
Name: ghostscript Name: ghostscript
Version: %{gs_ver} Version: %{gs_ver}
Release: 3%{?dist} Release: 4%{?dist}
License: GPLv2 License: GPLv2
URL: http://www.ghostscript.com/ URL: http://www.ghostscript.com/
@ -257,6 +257,10 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libgs.so %{_libdir}/libgs.so
%changelog %changelog
* Fri Nov 30 2007 Tim Waugh <twaugh@redhat.com> 8.61-4
- Revert previous change, but define .runlibfileifexists, not just
runlibfileifexists.
* Wed Nov 28 2007 Tim Waugh <twaugh@redhat.com> 8.61-3 * Wed Nov 28 2007 Tim Waugh <twaugh@redhat.com> 8.61-3
- No longer need runlibfileifexists. - No longer need runlibfileifexists.
- Use runlibfile in cidfmap. - Use runlibfile in cidfmap.