- 8.15.3. No longer need gtk2, ps2epsi, badc, pagesize,

use-external-freetype, split-font-configuration or cjkv patches.
- Renumbered patches.
This commit is contained in:
Tim Waugh 2006-11-16 17:35:44 +00:00
parent 2265fe0750
commit 3da9d92cb8
5 changed files with 37 additions and 72 deletions

View File

@ -16,3 +16,4 @@ espgs-8.15rc4-source.tar.bz2
espgs-8.15.1-source.tar.bz2
adobe-cmaps-200406.tar.gz
espgs-8.15.2-source.tar.bz2
espgs-8.15.3-source.tar.bz2

View File

@ -1,5 +1,5 @@
--- espgs-8.15.2/lib/gs_ttf.ps.big-cmap-post 2005-09-22 22:31:58.000000000 +0100
+++ espgs-8.15.2/lib/gs_ttf.ps 2006-04-25 16:49:58.000000000 +0100
--- espgs-8.15.3/lib/gs_ttf.ps.big-cmap-post 2006-06-06 10:59:04.000000000 +0100
+++ espgs-8.15.3/lib/gs_ttf.ps 2006-11-16 17:25:12.000000000 +0000
@@ -261,6 +261,54 @@
} for pop exch pop
} bind def
@ -145,10 +145,10 @@
(OS/2) 1 index
- (post) 1 index
+ (post) { .readbigtable }
%(vhea) 1 index
systemdict /DEVICE .knownget { (pdfwrite) ne } {true} ifelse {
(vhea) 1 index % better to be ignored for vertical writing in pdfwrite
@@ -867,10 +915,17 @@
(vhea) 1 index
% Big tables
(glyf) { .readbigtable }
@@ -860,10 +908,17 @@
} ifelse
% Stack: ... /FontInfo mark key1 value1 ...
post null ne {
@ -170,7 +170,7 @@
} if
counttomark 0 ne { .dicttomark } { pop pop } ifelse
/XUID [orgXUID 42 curxuid]
@@ -929,22 +984,22 @@
@@ -922,22 +977,22 @@
} if
tabdict /cmap get % bool [] i PlatID SpecID (cmap)
dup /cmaptab exch def % temporary

View File

@ -1,37 +1,23 @@
--- espgs-8.15rc3/lib/pv.sh.scripts 2005-01-19 04:08:41.000000000 +0000
+++ espgs-8.15rc3/lib/pv.sh 2005-06-02 17:40:08.000000000 +0100
@@ -26,12 +26,17 @@
--- espgs-8.15.3/lib/pv.sh.scripts 2006-05-03 00:04:46.000000000 +0100
+++ espgs-8.15.3/lib/pv.sh 2006-11-16 17:05:01.000000000 +0000
@@ -26,7 +26,7 @@
# the -D switch from the call of dvips below.
#
TEMPDIR=.
-PAGE=$1
+PAGE="$1"
shift
-FILE=$1
+FILE="$1"
FILE="$1"
shift
-trap "rm -rf $TEMPDIR/$FILE.$$.pv" 0 1 2 15
-#dvips -D$RESOLUTION -p $PAGE -n 1 $FILE $* -o $FILE.$$.pv
-dvips -p $PAGE -n 1 $FILE $* -o $FILE.$$.pv
-gs $FILE.$$.pv
+TEMPFILE=`mktemp "$TEMPDIR/$FILE.XXXXXX"`
+if [ $? -ne 0 ]
+then
+ exit 1
+fi
+trap 'rm -f "$TEMPFILE"' 0 1 2 15
+#dvips -R -D$RESOLUTION -p $PAGE -n 1 $FILE $* -o $FILE.$$.pv
+dvips -R -p $PAGE -n 1 "$FILE" "$@" -o "$TEMPFILE"
+gs "$TEMPFILE"
exit 0
--- espgs-8.15rc3/lib/ps2epsi.scripts 2005-06-02 17:41:32.000000000 +0100
+++ espgs-8.15rc3/lib/ps2epsi 2005-06-02 17:41:50.000000000 +0100
@@ -5,7 +5,7 @@
gs=gs
@@ -38,8 +38,8 @@
else
tmpfile="$TEMPDIR/$FILE.$$.pv"
fi
-tmpfile=/tmp/ps2epsi$$
+tmpfile=`mktemp ${TMPDIR-/tmp}/ps2epsi.XXXXXX`
rm -f $tmpfile
if test -e $tmpfile; then
echo "$0: Our temporary file $tmpfile already exists." 1>&2
-trap "rm -rf $tmpfile" 0 1 2 15
-#dvips -D$RESOLUTION -p $PAGE -n 1 $FILE $* -o $FILE.$$.pv
-dvips -p $PAGE -n 1 "$FILE" "$@" -o "$tmpfile"
+trap 'rm -rf "$tmpfile"' 0 1 2 15
+#dvips -R -D$RESOLUTION -p $PAGE -n 1 $FILE $* -o $FILE.$$.pv
+dvips -R -p "$PAGE" -n 1 "$FILE" "$@" -o "$tmpfile"
gs "$tmpfile"
exit 0

View File

@ -1,11 +1,11 @@
%define gs_ver 8.15.2
%define gs_ver 8.15.3
%define gs_dot_ver 8.15
%{expand: %%define build_with_freetype %{?_with_freetype:1}%{!?_with_freetype:0}}
Summary: A PostScript(TM) interpreter and renderer.
Name: ghostscript
Version: %{gs_ver}
Release: 9
Release: 2%{?dist}
License: GPL
URL: http://www.cups.org/espgs/
@ -15,16 +15,9 @@ Source1: FAPIcidfmap
Source4: cidfmap
Patch1: ghostscript-multilib.patch
Patch2: ghostscript-gtk2.patch
Patch3: ghostscript-scripts.patch
Patch4: ghostscript-ps2epsi.patch
Patch5: ghostscript-badc.patch
Patch6: ghostscript-pagesize.patch
Patch7: ghostscript-noopt.patch
Patch8: ghostscript-use-external-freetype.patch
Patch9: ghostscript-split-font-configuration.patch
Patch10: ghostscript-big-cmap-post.patch
Patch11: espgs-cjkv.patch
Patch2: ghostscript-scripts.patch
Patch3: ghostscript-noopt.patch
Patch4: ghostscript-big-cmap-post.patch
Requires: urw-fonts >= 1.1, ghostscript-fonts
BuildRequires: libjpeg-devel, libXt-devel
@ -81,34 +74,14 @@ A GTK-enabled version of Ghostscript, called 'gsx'.
# Fix ijs-config not to have multilib conflicts (bug #192672)
%patch1 -p1 -b .multilib
# Make it build.
%patch2 -p1 -b .gtk2
# Fix some shell scripts
%patch3 -p1 -b .scripts
# Fix sed usage in ps2epsi (bug #89300).
%patch4 -p1 -b .ps2epsi
%patch5 -p1 -b .badc
# Prevent pdf2ps generating "null setpagesize" (bug #126446).
%patch6 -p1 -b .pagesize
%patch2 -p1 -b .scripts
# Build igcref.c with -O0 to work around bug #150771.
%patch7 -p1 -b .noopt
# Use external freetype (bug #161187).
%patch8 -p1 -b .use-external-freetype
# Allow separated font configuration (bug #161187).
%patch9 -p1 -b .split-font-configuration
%patch3 -p1 -b .noopt
# Support reading a big cmap/post table from a TrueType font.
%patch10 -p1 -b .big-cmap-post
# CJKV from upstream.
%patch11 -p1 -b .cjkv
%patch4 -p1 -b .big-cmap-post
# Convert manual pages to UTF-8
from8859_1() {
@ -264,6 +237,11 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libijs.*a
%changelog
* Thu Nov 16 2006 Tim Waugh <twaugh@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.
- Renumbered patches.
* Tue Oct 3 2006 Tim Waugh <twaugh@redhat.com> 8.15.2-9
- Apply CJKV patch from svn164:165 plus the fix from svn173:174 (bug #194592,
bug #203712, possibly bug #167596).

View File

@ -1,3 +1,3 @@
2fbae60417d42779f6488ab897dcaaf6 acro5-cmaps-2001.tar.gz
dfc93dd2aaaf2b86d2fd55f654c13261 adobe-cmaps-200406.tar.gz
66180d4c0aa44c4c51ea58e13b08f2ae espgs-8.15.2-source.tar.bz2
4ec87a3da20c1b433ffbe0ffe3675fcd espgs-8.15.3-source.tar.bz2