[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/ghostscript/devel FAPIcidfmap, NONE, 1.1 ghostscript-split-font-configuration.patch, NONE, 1.1 ghostscript.spec, 1.76, 1.77 ghostscript-japanese-fonts.patch, 1.1, NONE



Author: twaugh

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

Modified Files:
	ghostscript.spec 
Added Files:
	FAPIcidfmap ghostscript-split-font-configuration.patch 
Removed Files:
	ghostscript-japanese-fonts.patch 
Log Message:
* Wed Jul 13 2005 Tim Waugh <twaugh redhat com>
- Split font configuration (bug #161187).


--- NEW FILE FAPIcidfmap ---
%!
% Don't change following line. We should ensure that the original one is surely loaded.
(FAPIcidfmap.GS) .runlibfile
% following lines are for CJK fonts.
(FAPIcidfmap.ja) .runlibfileifexists
(FAPIcidfmap.ko) .runlibfileifexists
(FAPIcidfmap.zh_CN) .runlibfileifexists
(FAPIcidfmap.zh_TW) .runlibfileifexists

ghostscript-split-font-configuration.patch:
 espgs-8.15rc3/lib/gs_fonts.ps |   13 ++++++++++---
 lib/gs_init.ps.in             |    9 +++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

--- NEW FILE ghostscript-split-font-configuration.patch ---
diff -ruN espgs-8.15rc3.orig/lib/gs_fonts.ps espgs-8.15rc3/lib/gs_fonts.ps
--- espgs-8.15rc3.orig/lib/gs_fonts.ps	2005-02-17 06:21:49.000000000 +0900
+++ espgs-8.15rc3/lib/gs_fonts.ps	2005-07-13 20:14:12.000000000 +0900
@@ -96,10 +96,17 @@
                 % 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 filelibfile {
+            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 -ruN espgs-8.15rc3.orig/lib/gs_init.ps espgs-8.15rc3/lib/gs_init.ps
--- espgs-8.15rc3.orig/lib/gs_init.ps.in	2005-07-12 11:04:36.000000000 +0900
+++ espgs-8.15rc3/lib/gs_init.ps.in	2005-07-13 20:14:12.000000000 +0900
@@ -655,6 +655,13 @@
 	   { /undefinedfilename signalerror }
 	  ifelse
 	} bind def
+/runlibfileifexists
+	{
+	  findlibfile
+	   { exch pop /run .systemvar exec }
+	   { pop }
+	  ifelse
+	} bind def
 /selectdevice
 	{ finddevice setdevice .setdefaultscreen } bind def
 /signalerror		% <object> <errorname> signalerror -
@@ -816,6 +823,7 @@
 	} 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.
@@ -1655,6 +1663,7 @@
 
 % Restore the real definition of runlibfile.
 /runlibfile /.runlibfile load def
+/runlibfileifexists /.runlibfileifexists load def
 currentdict /.runlibfile .undef
 
 % Bind all the operators defined as procedures.


Index: ghostscript.spec
===================================================================
RCS file: /cvs/dist/rpms/ghostscript/devel/ghostscript.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- ghostscript.spec	13 Jul 2005 09:05:30 -0000	1.76
+++ ghostscript.spec	13 Jul 2005 13:29:37 -0000	1.77
@@ -11,6 +11,7 @@
 URL: http://www.cups.org/espgs/
 Group: Applications/Publishing
 Source0: ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/ghostscript/%{?gs_rc:test/}espgs-%{gs_ver}%{gs_rc}-source.tar.bz2
+Source1: FAPIcidfmap
 
 Patch1: ghostscript-build.patch
 Patch2: ghostscript-gtk2.patch
@@ -20,7 +21,7 @@
 Patch6: ghostscript-pagesize.patch
 Patch7: ghostscript-noopt.patch
 Patch8: ghostscript-use-external-freetype.patch
-Patch9: ghostscript-japanese-fonts.patch
+Patch9: ghostscript-split-font-configuration.patch
 
 Requires: zlib, libpng, glib2
 Requires: urw-fonts >= 1.1, ghostscript-fonts
@@ -94,8 +95,8 @@
 # Use external freetype (bug #161187).
 %patch8 -p1 -b .use-external-freetype
 
-# Add Japanese fonts to FAPIcidfmap (bug #161187).
-%patch9 -p1 -b .japanese-fonts
+# Allow separated font configuration (bug #161187).
+%patch9 -p1 -b .split-font-configuration
 
 # Convert manual pages to UTF-8
 from8859_1() {
@@ -105,7 +106,17 @@
 for i in man/de/*.1; do from8859_1 "$i"; done
 
 %build
-%configure --with-ijs --enable-dynamic
+FONTPATH=
+for path in \
+	%{_datadir}/fonts/default/%{name} \
+	%{_datadir}/fonts/default/Type1 \
+	%{_datadir}/fonts/default/amspsfnt/pfb \
+	%{_datadir}/fonts/default/cmpsfont/pfb \
+	%{_sysconfdir}/%{name}
+do
+  FONTPATH="$FONTPATH${FONTPATH:+:}$path"
+done
+%configure --with-ijs --enable-dynamic --with-fontpath="$FONTPATH"
 
 # Build IJS
 cd ijs
@@ -150,6 +161,12 @@
 ln -sf gs.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1/ghostscript.1.gz
 ln -sf gs $RPM_BUILD_ROOT/usr/bin/ghostscript
 
+# Rename an original FAPIcidfmap to FAPIcidfmap.GS
+mv $RPM_BUILD_ROOT%{_datadir}/%{name}/%{gs_ver}/lib/FAPIcidfmap{,.GS}
+# Install our own FAPIcidfmap to allow the separated
+# FAPIcidfmap which the font packages own.
+install -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/%{gs_ver}/lib/FAPIcidfmap
+
 # Don't ship sysvlp.sh.
 rm -f $RPM_BUILD_ROOT/usr/bin/sysvlp.sh
 
@@ -227,6 +244,7 @@
 
 %changelog
 * Wed Jul 13 2005 Tim Waugh <twaugh redhat com>
+- Split font configuration (bug #161187).
 - Reverted this change:
   - Build requires xorg-x11-devel, not XFree86-devel.
 


--- ghostscript-japanese-fonts.patch DELETED ---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]