From f8f891f65adeec61bd430a7cf111428a2d2d38ac Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Wed, 4 Feb 2009 13:11:11 +0000 Subject: [PATCH] - 8.64. --- ghostscript-fPIC.patch | 48 +++++++++++++++------------- ghostscript-noopt.patch | 7 ++-- ghostscript-pksmraw.patch | 8 ++--- ghostscript-runlibfileifexists.patch | 10 +++--- ghostscript-scripts.patch | 26 ++++++++------- ghostscript-system-jasper.patch | 6 ++-- ghostscript.spec | 42 ++++++++++++------------ 7 files changed, 75 insertions(+), 72 deletions(-) diff --git a/ghostscript-fPIC.patch b/ghostscript-fPIC.patch index 9b4deb2..3d64259 100644 --- a/ghostscript-fPIC.patch +++ b/ghostscript-fPIC.patch @@ -1,26 +1,7 @@ ---- ghostscript-8.60-r8112/src/lib.mak.fPIC 2007-07-10 17:03:11.000000000 +0100 -+++ ghostscript-8.60-r8112/src/lib.mak 2007-07-10 17:05:56.000000000 +0100 -@@ -874,7 +874,7 @@ - $(GLOBJ)gsparamx.$(OBJ) : $(GLSRC)gsparamx.c $(string__h)\ - $(gserror_h) $(gserrors_h) $(gsmemory_h) $(gsparam_h) $(gsparamx_h)\ - $(gstypes_h) -- $(GLCC) $(GLO_)gsparamx.$(OBJ) $(C_) $(GLSRC)gsparamx.c -+ $(GLCCSHARED) $(GLO_)gsparamx.$(OBJ) $(C_) $(GLSRC)gsparamx.c - - # Future replacement for gsparams.c - $(GLOBJ)gsparam2.$(OBJ) : $(GLSRC)gsparam2.c $(GXERR) $(memory__h)\ -@@ -1077,7 +1077,7 @@ - - # Provide a mapping between StandardEncoding and ISOLatin1Encoding. - $(GLOBJ)gdevemap.$(OBJ) : $(GLSRC)gdevemap.c $(AK) $(std_h) -- $(GLCC) $(GLO_)gdevemap.$(OBJ) $(C_) $(GLSRC)gdevemap.c -+ $(GLCCSHARED) $(GLO_)gdevemap.$(OBJ) $(C_) $(GLSRC)gdevemap.c - - ###### Create a pseudo-"feature" for the entire graphics library. - ---- ghostscript-8.60-r8112/src/devs.mak.fPIC 2007-07-10 17:05:00.000000000 +0100 -+++ ghostscript-8.60-r8112/src/devs.mak 2007-07-10 17:05:07.000000000 +0100 -@@ -464,7 +464,7 @@ +diff -up ghostscript-8.64/base/devs.mak.fPIC ghostscript-8.64/base/devs.mak +--- ghostscript-8.64/base/devs.mak.fPIC 2008-11-07 18:49:34.000000000 +0000 ++++ ghostscript-8.64/base/devs.mak 2009-02-04 11:34:21.000000000 +0000 +@@ -456,7 +456,7 @@ $(GLOBJ)gdevx.$(OBJ) : $(GLSRC)gdevx.c $ $(GLCCSHARED) $(XINCLUDE) $(GLO_)gdevx.$(OBJ) $(C_) $(GLSRC)gdevx.c $(GLOBJ)gdevxcmp.$(OBJ) : $(GLSRC)gdevxcmp.c $(GDEVX) $(math__h) @@ -29,3 +10,24 @@ $(GLOBJ)gdevxini.$(OBJ) : $(GLSRC)gdevxini.c $(GDEVX) $(memory__h)\ $(gserrors_h) $(gsparamx_h) $(gxdevmem_h) $(gdevbbox_h) +diff -up ghostscript-8.64/base/lib.mak.fPIC ghostscript-8.64/base/lib.mak +--- ghostscript-8.64/base/lib.mak.fPIC 2009-01-08 09:17:18.000000000 +0000 ++++ ghostscript-8.64/base/lib.mak 2009-02-04 11:34:21.000000000 +0000 +@@ -894,7 +894,7 @@ $(GLOBJ)gsparam.$(OBJ) : $(GLSRC)gsparam + $(GLOBJ)gsparamx.$(OBJ) : $(GLSRC)gsparamx.c $(string__h)\ + $(gserror_h) $(gserrors_h) $(gsmemory_h) $(gsparam_h) $(gsparamx_h)\ + $(gstypes_h) +- $(GLCC) $(GLO_)gsparamx.$(OBJ) $(C_) $(GLSRC)gsparamx.c ++ $(GLCCSHARED) $(GLO_)gsparamx.$(OBJ) $(C_) $(GLSRC)gsparamx.c + + # Future replacement for gsparams.c + $(GLOBJ)gsparam2.$(OBJ) : $(GLSRC)gsparam2.c $(GXERR) $(memory__h)\ +@@ -1085,7 +1085,7 @@ $(GLOBJ)gdevnfwd.$(OBJ) : $(GLSRC)gdevnf + + # Provide a mapping between StandardEncoding and ISOLatin1Encoding. + $(GLOBJ)gdevemap.$(OBJ) : $(GLSRC)gdevemap.c $(AK) $(std_h) +- $(GLCC) $(GLO_)gdevemap.$(OBJ) $(C_) $(GLSRC)gdevemap.c ++ $(GLCCSHARED) $(GLO_)gdevemap.$(OBJ) $(C_) $(GLSRC)gdevemap.c + + ###### Create a pseudo-"feature" for the entire graphics library. + diff --git a/ghostscript-noopt.patch b/ghostscript-noopt.patch index 3a93580..589cf82 100644 --- a/ghostscript-noopt.patch +++ b/ghostscript-noopt.patch @@ -1,6 +1,7 @@ ---- ghostscript-7.07/src/int.mak.noopt 2005-03-10 17:22:53.000000000 +0000 -+++ ghostscript-7.07/src/int.mak 2005-03-10 17:24:10.000000000 +0000 -@@ -105,7 +105,7 @@ +diff -up ghostscript-8.64/psi/int.mak.noopt ghostscript-8.64/psi/int.mak +--- ghostscript-8.64/psi/int.mak.noopt 2008-12-26 07:25:31.000000000 +0000 ++++ ghostscript-8.64/psi/int.mak 2009-02-04 11:33:48.000000000 +0000 +@@ -111,7 +111,7 @@ $(PSOBJ)igc.$(OBJ) : $(PSSRC)igc.c $(GH) $(PSOBJ)igcref.$(OBJ) : $(PSSRC)igcref.c $(GH) $(memory__h)\ $(gsexit_h) $(gsstruct_h)\ $(iastate_h) $(idebug_h) $(igc_h) $(iname_h) $(ipacked_h) $(store_h) diff --git a/ghostscript-pksmraw.patch b/ghostscript-pksmraw.patch index 826e000..e713efc 100644 --- a/ghostscript-pksmraw.patch +++ b/ghostscript-pksmraw.patch @@ -1,7 +1,7 @@ -diff -up ghostscript-8.62/src/gxclrast.c.pksmraw ghostscript-8.62/src/gxclrast.c ---- ghostscript-8.62/src/gxclrast.c.pksmraw 2008-03-31 17:24:32.000000000 +0100 -+++ ghostscript-8.62/src/gxclrast.c 2008-03-31 17:25:33.000000000 +0100 -@@ -2606,8 +2606,6 @@ static int apply_create_compositor(gx_de +diff -up ghostscript-8.64/base/gxclrast.c.pksmraw ghostscript-8.64/base/gxclrast.c +--- ghostscript-8.64/base/gxclrast.c.pksmraw 2008-12-13 20:05:37.000000000 +0000 ++++ ghostscript-8.64/base/gxclrast.c 2009-02-04 11:36:25.000000000 +0000 +@@ -2685,8 +2685,6 @@ static int apply_create_compositor(gx_de rc_increment(tdev); *ptarget = tdev; } diff --git a/ghostscript-runlibfileifexists.patch b/ghostscript-runlibfileifexists.patch index f375a14..3c14a98 100644 --- a/ghostscript-runlibfileifexists.patch +++ b/ghostscript-runlibfileifexists.patch @@ -1,7 +1,7 @@ -diff -up ghostscript-8.61/lib/gs_init.ps.runlibfileifexists ghostscript-8.61/lib/gs_init.ps ---- ghostscript-8.61/lib/gs_init.ps.runlibfileifexists 2007-10-31 17:00:55.000000000 +0000 -+++ ghostscript-8.61/lib/gs_init.ps 2007-11-30 09:02:19.000000000 +0000 -@@ -671,6 +671,14 @@ systemdict /internaldict dup .makeintern +diff -up ghostscript-8.64/Resource/Init/gs_init.ps.runlibfileifexists ghostscript-8.64/Resource/Init/gs_init.ps +--- ghostscript-8.64/Resource/Init/gs_init.ps.runlibfileifexists 2009-01-08 09:17:18.000000000 +0000 ++++ ghostscript-8.64/Resource/Init/gs_init.ps 2009-02-04 11:35:19.000000000 +0000 +@@ -672,6 +672,14 @@ systemdict /internaldict dup .makeintern { /undefinedfilename signalerror } ifelse } bind def @@ -16,7 +16,7 @@ diff -up ghostscript-8.61/lib/gs_init.ps.runlibfileifexists ghostscript-8.61/lib /selectdevice { finddevice setdevice .setdefaultscreen } bind def /signalerror % signalerror - -@@ -839,6 +847,7 @@ userdict /.currentresourcefile //null pu +@@ -840,6 +848,7 @@ userdict /.currentresourcefile //null pu } bind def % Temporarily substitute it for the real runlibfile. /.runlibfile /runlibfile load def diff --git a/ghostscript-scripts.patch b/ghostscript-scripts.patch index 9a495f3..f2617f8 100644 --- a/ghostscript-scripts.patch +++ b/ghostscript-scripts.patch @@ -1,6 +1,16 @@ ---- ghostscript-8.60-r8112/lib/pv.sh.scripts 2007-07-05 11:41:52.000000000 +0100 -+++ ghostscript-8.60-r8112/lib/pv.sh 2007-07-10 16:08:47.000000000 +0100 -@@ -31,7 +31,7 @@ +diff -up ghostscript-8.64/lib/dvipdf.scripts ghostscript-8.64/lib/dvipdf +--- ghostscript-8.64/lib/dvipdf.scripts 2009-01-10 22:11:18.000000000 +0000 ++++ ghostscript-8.64/lib/dvipdf 2009-02-04 11:32:31.000000000 +0000 +@@ -44,4 +44,4 @@ fi + + # We have to include the options twice because -I only takes effect if it + # appears before other options. +-exec dvips -Ppdf $DVIPSOPTIONS -q -f "$infile" | $GS_EXECUTABLE $OPTIONS -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sstdout=%stderr -sOutputFile="$outfile" $OPTIONS -c .setpdfwrite - ++exec dvips -R -Ppdf $DVIPSOPTIONS -q -f "$infile" | $GS_EXECUTABLE $OPTIONS -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sstdout=%stderr -sOutputFile="$outfile" $OPTIONS -c .setpdfwrite - +diff -up ghostscript-8.64/lib/pv.sh.scripts ghostscript-8.64/lib/pv.sh +--- ghostscript-8.64/lib/pv.sh.scripts 2007-07-05 11:41:52.000000000 +0100 ++++ ghostscript-8.64/lib/pv.sh 2009-02-04 11:31:32.000000000 +0000 +@@ -31,7 +31,7 @@ fi GS_EXECUTABLE=gs TEMPDIR=. @@ -9,7 +19,7 @@ shift FILE="$1" shift -@@ -44,7 +44,7 @@ +@@ -44,7 +44,7 @@ else tmpfile="$TEMPDIR/$FILE.$$.pv" fi trap "rm -rf $tmpfile" 0 1 2 15 @@ -19,11 +29,3 @@ +dvips -R -p $PAGE -n 1 "$FILE" "$@" -o $tmpfile $GS_EXECUTABLE $tmpfile exit 0 ---- ghostscript-8.60-r8112/lib/dvipdf.scripts 2007-07-10 16:08:57.000000000 +0100 -+++ ghostscript-8.60-r8112/lib/dvipdf 2007-07-10 16:09:17.000000000 +0100 -@@ -44,4 +44,4 @@ - - # We have to include the options twice because -I only takes effect if it - # appears before other options. --exec dvips $DVIPSOPTIONS -q -f "$infile" | $GS_EXECUTABLE $OPTIONS -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sOutputFile="$outfile" $OPTIONS -c .setpdfwrite - -+exec dvips -R $DVIPSOPTIONS -q -f "$infile" | $GS_EXECUTABLE $OPTIONS -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sOutputFile="$outfile" $OPTIONS -c .setpdfwrite - diff --git a/ghostscript-system-jasper.patch b/ghostscript-system-jasper.patch index 628f7de..444b760 100644 --- a/ghostscript-system-jasper.patch +++ b/ghostscript-system-jasper.patch @@ -1,6 +1,6 @@ -diff -up ghostscript-8.61/src/sjpx.c.system-jasper ghostscript-8.61/src/sjpx.c ---- ghostscript-8.61/src/sjpx.c.system-jasper 2008-02-22 14:10:00.000000000 +0000 -+++ ghostscript-8.61/src/sjpx.c 2008-02-22 14:10:15.000000000 +0000 +diff -up ghostscript-8.64/base/sjpx.c.system-jasper ghostscript-8.64/base/sjpx.c +--- ghostscript-8.64/base/sjpx.c.system-jasper 2008-08-21 00:22:49.000000000 +0100 ++++ ghostscript-8.64/base/sjpx.c 2009-02-04 11:35:56.000000000 +0000 @@ -34,14 +34,6 @@ static void s_jpxd_set_defaults(stream_s private_st_jpxd_state(); /* creates a gc object for our state, defined in sjpx.h */ diff --git a/ghostscript.spec b/ghostscript.spec index dac8c7c..6267cf2 100644 --- a/ghostscript.spec +++ b/ghostscript.spec @@ -1,11 +1,11 @@ -%define gs_ver 8.63 -%define gs_dot_ver 8.63 +%define gs_ver 8.64 +%define gs_dot_ver 8.64 %{expand: %%define build_with_freetype %{?_with_freetype:1}%{!?_with_freetype:0}} Summary: A PostScript interpreter and renderer. Name: ghostscript Version: %{gs_ver} -Release: 4%{?dist} +Release: 1%{?dist} License: GPLv2 URL: http://www.ghostscript.com/ @@ -97,7 +97,7 @@ rm -rf libpng zlib jpeg jasper %patch4 -p1 -b .fPIC # Define .runlibfileifexists. -%patch5 -p1 -b .runlibfileifexists +%patch5 -p1 %patch6 -p1 -b .system-jasper @@ -157,6 +157,7 @@ make RPM_OPT_FLAGS="$RPM_OPT_FLAGS $EXTRAFLAGS" prefix=%{_prefix} \ make so RPM_OPT_FLAGS="$RPM_OPT_FLAGS $EXTRAFLAGS" prefix=%{_prefix} make RPM_OPT_FLAGS="$RPM_OPT_FLAGS $EXTRAFLAGS" prefix=%{_prefix} %endif +make cups %install rm -rf $RPM_BUILD_ROOT @@ -169,7 +170,7 @@ make install soinstall \ prefix=$RPM_BUILD_ROOT%{_prefix} \ mandir=$RPM_BUILD_ROOT%{_mandir} \ datadir=$RPM_BUILD_ROOT%{_datadir} \ - gsincludedir=$RPM_BUILD_ROOT%{_includedir}/ghostscript \ + gsincludedir=$RPM_BUILD_ROOT%{_includedir}/ghostscript/ \ bindir=$RPM_BUILD_ROOT%{_bindir} \ libdir=$RPM_BUILD_ROOT%{_libdir} \ docdir=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{gs_dot_ver} \ @@ -190,18 +191,15 @@ echo ".so man1/gs.1" > $RPM_BUILD_ROOT/%{_mandir}/man1/ghostscript.1 ln -sf gs $RPM_BUILD_ROOT/usr/bin/ghostscript # Rename an original cidfmap to cidfmap.GS -mv $RPM_BUILD_ROOT%{_datadir}/%{name}/%{gs_dot_ver}/lib/cidfmap{,.GS} +mv $RPM_BUILD_ROOT%{_datadir}/%{name}/%{gs_dot_ver}/Resource/Init/cidfmap{,.GS} # Install our own cidfmap to allow the separated # cidfmap which the font packages own. -install -m0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/%{name}/%{gs_dot_ver}/lib/CIDFnmap -install -m0644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/%{name}/%{gs_dot_ver}/lib/cidfmap +install -m0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/%{name}/%{gs_dot_ver}/Resource/Init/CIDFnmap +install -m0644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/%{name}/%{gs_dot_ver}/Resource/Init/cidfmap # Header files. mkdir -p $RPM_BUILD_ROOT%{_includedir}/ghostscript -install -m0644 src/iapi.h $RPM_BUILD_ROOT%{_includedir}/ghostscript -install -m0644 src/ierrors.h $RPM_BUILD_ROOT%{_includedir}/ghostscript -install -m0644 src/errors.h $RPM_BUILD_ROOT%{_includedir}/ghostscript -install -m0644 src/gdevdsp.h $RPM_BUILD_ROOT%{_includedir}/ghostscript +install -m0644 base/errors.h $RPM_BUILD_ROOT%{_includedir}/ghostscript # Don't ship pkgconfig files. rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/ijs.pc @@ -214,9 +212,6 @@ rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/cups rm -f $RPM_BUILD_ROOT%{_libdir}/cups/filter/pstoraster rm -f $RPM_BUILD_ROOT/usr/lib/cups/filter/pstoraster -# Don't ship two copies of Resource. Just the versioned one will do. -rm -rf $RPM_BUILD_ROOT%{_datadir}/ghostscript/Resource - # Don't ship URW fonts; we already have them. rm -rf $RPM_BUILD_ROOT%{_datadir}/ghostscript/%{gs_dot_ver}/Resource/Font @@ -233,8 +228,8 @@ find $RPM_BUILD_ROOT%{_mandir}/de/man1 -type l | xargs rm -f rm -f $RPM_BUILD_ROOT%{_bindir}/fixmswrd.pl MAIN_PWD=`pwd` -(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 +(cd $RPM_BUILD_ROOT; find ./usr/share/ghostscript/%{gs_dot_ver}/Resource -type f | \ + sed -e 's/\.//;' | grep -v Fontmap | grep -v gs_init.ps > $MAIN_PWD/rpm.sharelist find .%{_bindir}/ | sed -e 's/\.//;' | \ grep -v '/$\|/hpijs$\|/gsx$\|/ijs-config$' \ >> $MAIN_PWD/rpm.sharelist) @@ -253,11 +248,12 @@ rm -rf $RPM_BUILD_ROOT %dir %{_datadir}/ghostscript %dir %{_datadir}/ghostscript/conf.d %dir %{_datadir}/ghostscript/%{gs_dot_ver} -%dir %{_datadir}/ghostscript/%{gs_dot_ver}/lib -%config %{_datadir}/ghostscript/%{gs_dot_ver}/lib/gs_init.ps -%config %{_datadir}/ghostscript/%{gs_dot_ver}/lib/Fontmap* -%{_datadir}/ghostscript/%{gs_dot_ver}/Resource/ +%dir %{_datadir}/ghostscript/%{gs_dot_ver}/Resource +%dir %{_datadir}/ghostscript/%{gs_dot_ver}/Resource/Init +%config %{_datadir}/ghostscript/%{gs_dot_ver}/Resource/Init/gs_init.ps +%config %{_datadir}/ghostscript/%{gs_dot_ver}/Resource/Init/Fontmap* %{_datadir}/ghostscript/%{gs_dot_ver}/examples +%{_datadir}/ghostscript/%{gs_dot_ver}/lib %{_mandir}/man*/* %lang(de) %{_mandir}/de/man*/* %{_libdir}/libgs.so.* @@ -267,6 +263,7 @@ rm -rf $RPM_BUILD_ROOT /usr/lib/cups/filter/pstopxl %{_datadir}/cups/model/pxl* %config(noreplace) /etc/ghostscript/%{gs_dot_ver}/* +/usr/lib/cups/filter/pdftoraster %files doc %defattr(-,root,root) @@ -288,7 +285,8 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libgs.so %changelog -* Fri Jan 30 2009 Tim Waugh +* Wed Feb 4 2009 Tim Waugh 8.64-1 +- 8.64. - Removed trade marks to avoid any potential confusion. * Fri Oct 17 2008 Tim Waugh