- Sync to svn165.

This commit is contained in:
Tim Waugh 2006-06-09 16:50:24 +00:00
parent 6e08ee84ce
commit 42590c5c21
2 changed files with 28 additions and 14 deletions

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.2/lib/gs_ttf.ps.big-cmap-post 2006-06-09 13:37:44.000000000 +0100
+++ espgs-8.15.2/lib/gs_ttf.ps 2006-06-09 13:39:13.000000000 +0100
@@ -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

@ -5,7 +5,7 @@ Summary: A PostScript(TM) interpreter and renderer.
Name: ghostscript
Version: %{gs_ver}
Release: 4
Release: 5
License: GPL
URL: http://www.cups.org/espgs/
@ -14,6 +14,7 @@ Source0: ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/ghostscript/%{?
Source1: FAPIcidfmap
Source4: cidfmap
Patch0: espgs-svn165.patch
Patch1: ghostscript-multilib.patch
Patch2: ghostscript-gtk2.patch
Patch3: ghostscript-scripts.patch
@ -76,6 +77,7 @@ A GTK-enabled version of Ghostscript, called 'gsx'.
%prep
%setup -q -n espgs-%{gs_ver}%{?gs_rc:%gs_rc}
%patch0 -p1 -b .svn165
# Fix ijs-config not to have multilib conflicts (bug #192672)
%patch1 -p1 -b .multilib
@ -84,12 +86,12 @@ A GTK-enabled version of Ghostscript, called 'gsx'.
%patch2 -p1 -b .gtk2
# Fix some shell scripts
%patch3 -p1 -b .scripts
#%patch3 -p1 -b .scripts
# Fix sed usage in ps2epsi (bug #89300).
%patch4 -p1 -b .ps2epsi
#%patch4 -p1 -b .ps2epsi
%patch5 -p1 -b .badc
#%patch5 -p1 -b .badc
# Prevent pdf2ps generating "null setpagesize" (bug #126446).
%patch6 -p1 -b .pagesize
@ -98,7 +100,7 @@ A GTK-enabled version of Ghostscript, called 'gsx'.
%patch7 -p1 -b .noopt
# Use external freetype (bug #161187).
%patch8 -p1 -b .use-external-freetype
#%patch8 -p1 -b .use-external-freetype
# Allow separated font configuration (bug #161187).
%patch9 -p1 -b .split-font-configuration
@ -113,6 +115,8 @@ from8859_1() {
}
for i in man/de/*.1; do from8859_1 "$i"; done
autoconf
%build
FONTPATH=
for path in \
@ -125,7 +129,7 @@ for path in \
do
FONTPATH="$FONTPATH${FONTPATH:+:}$path"
done
%configure --with-ijs --enable-dynamic --with-fontpath="$FONTPATH"
%configure --with-ijs --enable-dynamic --with-fontpath="$FONTPATH" --enable-gtk
# Build IJS
cd ijs
@ -145,6 +149,11 @@ make so RPM_OPT_FLAGS="$RPM_OPT_FLAGS" prefix=%{_prefix}
make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" prefix=%{_prefix}
%endif
mv sobin/gsc sobin/gsx
%configure --with-ijs --enable-dynamic --with-fontpath="$FONTPATH" --disable-gtk
make so RPM_OPT_FLAGS="$RPM_OPT_FLAGS" prefix=%{_prefix} \
FT_BRIDGE=1 FT_CFLAGS="$FT_CFLAGS" FT_LIB=freetype
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT
@ -166,6 +175,8 @@ make install soinstall \
CUPSCONFIG=$RPM_BUILD_ROOT`cups-config --serverroot` \
CUPSDATA=$RPM_BUILD_ROOT`cups-config --datadir`
install -m0755 sobin/gsx $RPM_BUILD_ROOT%{_bindir}/gsx
mv -f $RPM_BUILD_ROOT%{_bindir}/gsc $RPM_BUILD_ROOT%{_bindir}/gs
cd ijs
@ -214,7 +225,7 @@ mkdir -p $RPM_BUILD_ROOT/etc/ghostscript
find $RPM_BUILD_ROOT%{_mandir}/de/man1 -type l | xargs rm -f
MAIN_PWD=`pwd`
(cd $RPM_BUILD_ROOT; find ./usr/share/ghostscript/%{gs_dot_ver}/lib/* | \
(cd $RPM_BUILD_ROOT; find ./usr/share/ghostscript/%{gs_dot_ver}/lib -type f | \
sed -e 's/\.//;' | grep -v lib/Fontmap* | grep -v gs_init.ps > $MAIN_PWD/rpm.sharelist
find .%{_bindir}/ | sed -e 's/\.//;' | \
grep -v '/$\|/hpijs$\|/gsx$\|/ijs-config$' \
@ -260,6 +271,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libijs.*a
%changelog
* Fri Jun 9 2006 Tim Waugh <twaugh@redhat.com> 8.15.2-5
- Sync to svn165.
* Fri May 26 2006 Tim Waugh <twaugh@redhat.com> 8.15.2-4
- Fix ijs-config not to have multilib conflicts (bug #192672)