rpms/ghostscript/devel ghostscript-split-cidfnmap.patch, NONE, 1.1 ghostscript.spec, 1.124, 1.125

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/ghostscript/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24212

Modified Files:
	ghostscript.spec 
Added Files:
	ghostscript-split-cidfnmap.patch 
Log Message:
* Tue Dec  5 2006 Tim Waugh <twaugh at redhat.com>
- Added split-cidfnmap patch (bug #194592).
- Resolves: rhbz#194592


ghostscript-split-cidfnmap.patch:
 cjkfnmap.ps |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

--- NEW FILE ghostscript-split-cidfnmap.patch ---
--- espgs-8.15.2/lib/cjkv/cjkfnmap.ps.split-cidfnmap	2006-11-17 16:59:21.000000000 +0000
+++ espgs-8.15.2/lib/cjkv/cjkfnmap.ps	2006-11-17 17:03:39.000000000 +0000
@@ -75,10 +75,17 @@
                 % stack: dict file cidfontname 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 .cjkv_readCIDFontmap pop
+        0 index /.runlibfileifexists eq {
+	  pop findlibfile {
+	    exch pop
+	    2 index exch .cjkv_readCIDFontmap pop
+	  } { pop } ifelse
+	} {
+	  pop findlibfile { exch pop } { file } ifelse
+	  2 index exch .cjkv_readCIDFontmap pop
+	} ifelse
       } {
         exch dup type /stringtype eq {cvn} if exch
        { 2 index token not


Index: ghostscript.spec
===================================================================
RCS file: /cvs/dist/rpms/ghostscript/devel/ghostscript.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- ghostscript.spec	16 Nov 2006 17:35:44 -0000	1.124
+++ ghostscript.spec	5 Dec 2006 16:45:13 -0000	1.125
@@ -18,6 +18,7 @@
 Patch2: ghostscript-scripts.patch
 Patch3: ghostscript-noopt.patch
 Patch4: ghostscript-big-cmap-post.patch
+Patch5: ghostscript-split-cidfnmap.patch
 
 Requires: urw-fonts >= 1.1, ghostscript-fonts
 BuildRequires: libjpeg-devel, libXt-devel
@@ -83,6 +84,9 @@
 # Support reading a big cmap/post table from a TrueType font.
 %patch4 -p1 -b .big-cmap-post
 
+# Support CIDFnmap inclusion from other files (bug #194592).
+%patch5 -p1 -b .split-cidfnmap
+
 # Convert manual pages to UTF-8
 from8859_1() {
 	iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
@@ -237,6 +241,9 @@
 %{_libdir}/libijs.*a
 
 %changelog
+* Tue Dec  5 2006 Tim Waugh <twaugh at redhat.com>
+- Added split-cidfnmap patch (bug #194592).
+
 * Thu Nov 16 2006 Tim Waugh <twaugh at redhat.com> 8.15.3-2
 - 8.15.3.  No longer need gtk2, ps2epsi, badc, pagesize,
   use-external-freetype, split-font-configuration or cjkv patches.