From aaa2f40d1585a8240cae5ddca58e1d1ef3684f1c Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Tue, 13 Jun 2006 12:52:15 +0000
Subject: [PATCH] - Undo svn sync.

---
 ghostscript-big-cmap-post.patch | 14 +++++++-------
 ghostscript.spec                | 24 ++++++++----------------
 2 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/ghostscript-big-cmap-post.patch b/ghostscript-big-cmap-post.patch
index bee3d1a..c6b6db6 100644
--- a/ghostscript-big-cmap-post.patch
+++ b/ghostscript-big-cmap-post.patch
@@ -1,5 +1,5 @@
---- 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
+--- 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
 @@ -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
- 	% Big tables
-   (glyf) { .readbigtable }
-@@ -860,10 +908,17 @@
+   %(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 @@
    } 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]
-@@ -922,22 +977,22 @@
+@@ -929,22 +984,22 @@
      } if
      tabdict /cmap get                                   % bool [] i PlatID SpecID (cmap)
      dup /cmaptab exch def % temporary
diff --git a/ghostscript.spec b/ghostscript.spec
index f8c9549..97bbd9e 100644
--- a/ghostscript.spec
+++ b/ghostscript.spec
@@ -14,7 +14,6 @@ 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
@@ -77,7 +76,6 @@ 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
@@ -86,12 +84,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
@@ -100,7 +98,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
@@ -115,8 +113,6 @@ from8859_1() {
 }
 for i in man/de/*.1; do from8859_1 "$i"; done
 
-autoconf
-
 %build
 FONTPATH=
 for path in \
@@ -129,7 +125,7 @@ for path in \
 do
   FONTPATH="$FONTPATH${FONTPATH:+:}$path"
 done
-%configure --with-ijs --enable-dynamic --with-fontpath="$FONTPATH" --enable-gtk
+%configure --with-ijs --enable-dynamic --with-fontpath="$FONTPATH"
 
 # Build IJS
 cd ijs
@@ -149,11 +145,6 @@ 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
@@ -175,8 +166,6 @@ 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
@@ -271,6 +260,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libijs.*a
 
 %changelog
+* Tue Jun 13 2006 Tim Waugh <twaugh@redhat.com>
+- Undo svn sync.
+
 * Fri Jun  9 2006 Tim Waugh <twaugh@redhat.com> 8.15.2-5
 - Sync to svn165.