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

rpms/ghostscript/devel ghostscript-big-cmap-post.patch, 1.3, 1.4 ghostscript-gtk2.patch, 1.2, 1.3 ghostscript.spec, 1.117, 1.118 espgs-svn165.patch, 1.1, NONE



Author: twaugh

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

Modified Files:
	ghostscript-big-cmap-post.patch ghostscript-gtk2.patch 
	ghostscript.spec 
Removed Files:
	espgs-svn165.patch 
Log Message:
* Tue Jun 13 2006 Tim Waugh <twaugh redhat com>
- Undo svn sync.


ghostscript-big-cmap-post.patch:
 gs_ttf.ps |  115 +++++++++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 85 insertions(+), 30 deletions(-)

Index: ghostscript-big-cmap-post.patch
===================================================================
RCS file: /cvs/dist/rpms/ghostscript/devel/ghostscript-big-cmap-post.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ghostscript-big-cmap-post.patch	9 Jun 2006 16:50:24 -0000	1.3
+++ ghostscript-big-cmap-post.patch	13 Jun 2006 12:52:15 -0000	1.4
@@ -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

ghostscript-gtk2.patch:
 unix-dll.mak |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: ghostscript-gtk2.patch
===================================================================
RCS file: /cvs/dist/rpms/ghostscript/devel/ghostscript-gtk2.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ghostscript-gtk2.patch	9 Jun 2006 16:50:24 -0000	1.2
+++ ghostscript-gtk2.patch	13 Jun 2006 12:52:15 -0000	1.3
@@ -1,63 +1,11 @@
---- espgs-8.15.2/configure.ac.gtk2	2006-06-09 14:16:36.000000000 +0100
-+++ espgs-8.15.2/configure.ac	2006-06-09 14:18:15.000000000 +0100
-@@ -481,12 +481,9 @@
- SOC_LIBS=""
- SOC_LOADER="dxmainc.c"
- if test "x$enable_gtk" != "xno"; then
--	AC_PATH_PROG(GTKCONFIG, gtk-config)
--	if test "x$GTKCONFIG" != x; then
--		SOC_LOADER="dxmain.c"
--		SOC_CFLAGS="`$GTKCONFIG --cflags`"
--		SOC_LIBS="`$GTKCONFIG --libs`"
--	fi
-+	SOC_LOADER="dxmain.c"
-+	SOC_CFLAGS="`pkg-config gtk+-2.0 --cflags`"
-+	SOC_LIBS="`pkg-config gtk+-2.0 --libs`"
- fi
- AC_SUBST(SOC_CFLAGS)
- AC_SUBST(SOC_LIBS)
---- espgs-8.15.2/src/unix-dll.mak.gtk2	2006-06-09 14:31:35.000000000 +0100
-+++ espgs-8.15.2/src/unix-dll.mak	2006-06-09 14:35:55.000000000 +0100
-@@ -39,11 +39,6 @@
- GSSOC_XE=$(BINDIR)/$(GSSOC_XENAME)
- GSSOC=$(BINDIR)/$(SOBINRELDIR)/$(GSSOC_XENAME)
+--- espgs-8.15rc3/src/unix-dll.mak.gtk2	2005-01-19 04:08:41.000000000 +0000
++++ espgs-8.15rc3/src/unix-dll.mak	2005-06-03 12:31:56.000000000 +0100
+@@ -67,7 +67,7 @@
+ # Build the small Ghostscript loaders, with Gtk+ and without
  
--# loader suporting display device using Gtk+
--GSSOX_XENAME=$(GS)x$(XE)
--GSSOX_XE=$(BINDIR)/$(GSSOX_XENAME)
--GSSOX=$(BINDIR)/$(SOBINRELDIR)/$(GSSOX_XENAME)
--
- # shared library
- GS_SONAME=lib$(GS).so
- GS_SONAME_MAJOR=$(GS_SONAME).$(GS_VERSION_MAJOR)
-@@ -83,13 +78,13 @@
+ $(GSSOX_XE): $(GS_SO) $(GLSRC)dxmain.c
+-	$(GLCC) -g `gtk-config --cflags` -o $(GSSOX_XE) $(GLSRC)dxmain.c -L$(BINDIR) -l$(GS) `gtk-config --libs`
++	$(GLCC) -g `pkg-config gtk+-2.0 --cflags` -o $(GSSOX_XE) $(GLSRC)dxmain.c -L$(BINDIR) -l$(GS) `pkg-config gtk+-2.0 --libs`
  
- # Normal shared object
- so: SODIRS
--	$(MAKE) $(SODEFS) CFLAGS='$(CFLAGS_STANDARD) $(CFLAGS_SO) $(ACDEFS) $(GCFLAGS) $(XCFLAGS)' prefix=$(prefix) $(GSSOC) $(GSSOX)
-+	$(MAKE) $(SODEFS) CFLAGS='$(CFLAGS_STANDARD) $(CFLAGS_SO) $(ACDEFS) $(GCFLAGS) $(XCFLAGS)' prefix=$(prefix) $(GSSOC)
- 
- # Debug shared object
- # Note that this is in the same directory as the normal shared
- # object, so you will need to use 'make soclean', 'make sodebug'
- sodebug: SODIRS
--	$(MAKE) $(SODEFS) GENOPT='-DDEBUG' CFLAGS='$(CFLAGS_DEBUG) $(CFLAGS_SO) $(ACDEFS) $(GCFLAGS) $(XCFLAGS)' $(GSSOC) $(GSSOX)
-+	$(MAKE) $(SODEFS) GENOPT='-DDEBUG' CFLAGS='$(CFLAGS_DEBUG) $(CFLAGS_SO) $(ACDEFS) $(GCFLAGS) $(XCFLAGS)' $(GSSOC)
- 
- install-so: so
- 	-mkdir -p $(prefix)
-@@ -99,7 +94,6 @@
- 	-mkdir -p $(bindir)
- 	-mkdir -p $(libdir)
- 	$(INSTALL_PROGRAM) $(GSSOC) $(bindir)/$(GSSOC_XENAME)
--	$(INSTALL_PROGRAM) $(GSSOX) $(bindir)/$(GSSOX_XENAME)
- 	$(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME_MAJOR_MINOR)
- 	$(RM_) $(libdir)/$(GS_SONAME)
- 	ln -s $(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME)
-@@ -122,6 +116,5 @@
- 	$(RM_) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME)
- 	$(RM_) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR)
- 	$(RM_) $(GSSOC)
--	$(RM_) $(GSSOX)
- 
- # End of unix-dll.mak
+ $(GSSOC_XE): $(GS_SO) $(GLSRC)dxmainc.c
+ 	$(GLCC) -g -o $(GSSOC_XE) $(GLSRC)dxmainc.c -L$(BINDIR) -l$(GS)


Index: ghostscript.spec
===================================================================
RCS file: /cvs/dist/rpms/ghostscript/devel/ghostscript.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- ghostscript.spec	9 Jun 2006 16:50:24 -0000	1.117
+++ ghostscript.spec	13 Jun 2006 12:52:15 -0000	1.118
@@ -14,7 +14,6 @@
 Source1: FAPIcidfmap
 Source4: cidfmap
 
-Patch0: espgs-svn165.patch
 Patch1: ghostscript-multilib.patch
 Patch2: ghostscript-gtk2.patch
 Patch3: ghostscript-scripts.patch
@@ -77,7 +76,6 @@
 
 %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 @@
 %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 @@
 %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 @@
 }
 for i in man/de/*.1; do from8859_1 "$i"; done
 
-autoconf
-
 %build
 FONTPATH=
 for path in \
@@ -129,7 +125,7 @@
 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 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 @@
 	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 @@
 %{_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.
 


--- espgs-svn165.patch DELETED ---


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