Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text In directory sc8-pr-cvs17:/tmp/cvs-serv27034/10.4/unstable/main/finkinfo/text
Modified Files: ghostscript-esp.info ghostscript-esp.patch Log Message: (1) Use libjpeg (Added to Depends and BuildDepends). (2) Without GimpPrint. (Cannot use GimpPrint on Tiger) (3) Now we don't modify ps2pdfwr, create ps2jpdf instead. ps2jpdf uses "convert-euc" command for handling hyperref's bookmarks. (4) Delete some patches from %n.patch, get the patches from the web instead. Index: ghostscript-esp.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/ghostscript-esp.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- ghostscript-esp.patch 10 Apr 2007 11:08:37 -0000 1.3 +++ ghostscript-esp.patch 3 Jun 2007 00:41:58 -0000 1.4 @@ -1,46 +1,3 @@ ---- espgs-7.07.1/lib/ps2ps.org 2005-03-16 13:22:27.000000000 +0100 -+++ espgs-7.07.1/lib/ps2ps 2005-03-16 13:22:44.000000000 +0100 -@@ -6,7 +6,7 @@ - while true - do - case "$1" in -- -*) OPTIONS="$OPTIONS $1" ;; -+ -?*) OPTIONS="$OPTIONS $1" ;; - *) break ;; - esac - shift ---- espgs-7.05.5/man/gs.1 2002-04-23 07:58:37.000000000 -0400 -+++ espgs-7.05.5/man/gs.1.new 2003-01-18 14:22:46.000000000 -0500 -@@ -257,7 +257,7 @@ - the directories specified by the \fBGS_LIB_DEFAULT\fR macro in the - Ghostscript makefile when the executable was built. When \fBgs\fR is built - on Unix, \fBGS_LIB_DEFAULT\fR is usually --"/usr/local/share/ghostscript/#.##:/usr/local/share/ghostscript/fonts" -+"<PREFIX>/share/ghostscript/#.##:<PREFIX>/share/ghostscript/fonts" - where "#.##" represents the Ghostscript version number. - .PP - Each of these (\fBGS_LIB_DEFAULT\fR, \fBGS_LIB\fR, and \fB\-I\fR parameter) -@@ -432,16 +432,16 @@ - location of Ghostscript documentation on your system, from which you can - get more details. - .TP --.B /usr/local/share/ghostscript/#.##/* -+.B <PREFIX>/share/ghostscript/#.##/* - Startup files, utilities, and basic font definitions - .TP --.B /usr/local/share/ghostscript/fonts/* -+.B <PREFIX>/share/ghostscript/#.##/fonts/* - More font definitions - .TP --.B /usr/local/share/ghostscript/#.##/examples/* -+.B <PREFIX>/share/ghostscript-#.##/examples/* - Ghostscript demonstration files - .TP --.B /usr/local/share/ghostscript/#.##/doc/* -+.B <PREFIX>/share/doc/ghostscript-#.##/html/* - Diverse document files - .SH ENVIRONMENT - .TP diff -Naur espgs-7.05.6.orig/lib/gs_res.ps.in espgs-7.05.6/lib/gs_res.ps.in --- espgs-7.05.6.orig/lib/gs_res.ps.in 2002-12-28 07:01:36.000000000 +0900 +++ espgs-7.05.6/lib/gs_res.ps.in 2002-12-28 07:03:20.000000000 +0900 @@ -55,18 +12,6 @@ /GenericResourcePathSep (/) readonly .forcedef % pssys'params is r-o end end ---- espgs-7.05.6/src/gdevpx.c 2002-04-23 07:58:43.000000000 -0400 -+++ espgs-7.05.6/src/gdevpx.c.new 2003-11-09 15:25:16.000000000 -0500 -@@ -851,8 +851,7 @@ - px_put_s(s, (uint)pattern[i]); - px_put_a(s, pxaLineDashStyle); - if (offset != 0) { -- px_put_rl(s, offset); -- px_put_a(s, pxaDashOffset); -+ px_put_usa(s, (uint)offset, pxaDashOffset); - } - } - spputc(s, pxtSetLineDash); diff -ruN espgs-7.07.1.orig/src/configure espgs-7.07.1/src/configure --- espgs-7.07.1-orig/configure 2003-10-10 04:54:02.000000000 +0900 +++ espgs-7.07.1/configure 2006-02-28 16:09:48.000000000 +0900 @@ -79,7 +24,7 @@ CFLAGS="`$CUPSCONFIG --cflags` $CFLAGS" cups_serverroot="`$CUPSCONFIG --serverroot`" cups_serverbin="`$CUPSCONFIG --serverbin`" -@@ -5568,8 +5568,8 @@ +@@ -5568,11 +5568,11 @@ echo "${ECHO_T}yes" >&6 OMNIDEVS='$(DD)omni.dev' @@ -89,7 +34,11 @@ + LIBS="$LIBS `$GLIB_CONFIG --libs gmodule-2.0`" if test -n "$GCC"; then - LIBS="$LIBS -lstdc++" +- LIBS="$LIBS -lstdc++" ++ : + fi + else + echo "$as_me:$LINENO: result: no" >&5 diff -ruN espgs-7.07.1-orig/pstoraster/cups.mak espgs-7.07.1/pstoraster/cups.mak --- espgs-7.07.1-orig/pstoraster/cups.mak 2003-08-21 00:12:43.000000000 +0900 +++ espgs-7.07.1/pstoraster/cups.mak 2006-02-25 15:52:09.000000000 +0900 Index: ghostscript-esp.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/ghostscript-esp.info,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- ghostscript-esp.info 26 Apr 2007 12:56:29 -0000 1.7 +++ ghostscript-esp.info 3 Jun 2007 00:41:58 -0000 1.8 @@ -1,15 +1,16 @@ Package: ghostscript-esp Version: 7.07.1 -Revision: 31 +Revision: 32 Description: Enhanced GNU Ghostscript with better CJK and printer support -Depends: x11, ghostscript-fonts, libpng3-shlibs (>= 1.2.5-3), gettext, applesystemfonts, appleotffonts, ipafonts, glib2-shlibs (>= 2.12.0-1) -BuildDepends: x11-dev, libpng3 (>= 1.2.5-3), gimp-print-dev | gimp-print7-dev, cups-dev, gettext-dev, glib2-dev (>= 2.12.0-1), pkgconfig +Depends: x11, ghostscript-fonts, libjpeg-shlibs (>= 6b-1), libpng3-shlibs (>= 1.2.5-3), gettext, applesystemfonts, appleotffonts, ipafonts, glib2-shlibs (>= 2.12.0-1), system-perl +BuildDepends: x11-dev, libjpeg (>= 6b-1), libpng3 (>= 1.2.5-3), cups-dev, gettext-dev, glib2-dev (>= 2.12.0-1), pkgconfig Conflicts: ghostscript (>= 0), ghostscript-nox, ghostscript6, ghostscript6-nox, ghostscript7, system-ghostscript, system-ghostscript8, system-ghostscript6 Replaces: ghostscript (>= 0), ghostscript-nox, ghostscript6, ghostscript6-nox, ghostscript7 Provides: ghostscript License: GPL Source: mirror:sourceforge:espgs/espgs-%v-source.tar.bz2 -Source2: mirror:ctan:support/ghostscript/3rdparty/jpegsrc.v6b.tar.gz +# downloaded from http://www.rmatsumoto.org/tex-ps-pdf/convert-euc.txt +Source2: http://fink.sodan.ecc.u-tokyo.ac.jp/pkgdists/convert-euc-20070119.txt Source3: ftp://ftp.gyve.org/pub/gs-cjk/adobe-cmaps-200406.tar.gz Source4: ftp://ftp.t.ring.gr.jp/pub/text/TeX/ptex-win32/gs/acro5-cmaps-2001.zip Source5: http://tagoh.jp/junk/ghostscript-7.07-bigposttable.patch @@ -30,8 +31,11 @@ Source20: http://gentoo.cites.uiuc.edu/pub/gentoo-portage/app-text/ghostscript-esp/files/gs-fix-gc.patch Source21: http://gentoo.cites.uiuc.edu/pub/gentoo-portage/app-text/ghostscript-esp/files/gs7.07.1-nogtk2.patch Source22: http://gentoo.cites.uiuc.edu/pub/gentoo-portage/app-text/ghostscript-esp/files/gs7.07.1-tempfile.patch +Source23: http://gentoo.cites.uiuc.edu/pub/gentoo-portage/app-text/ghostscript-esp/files/gs7.07.1-ps2ps.patch +Source24: http://gentoo.cites.uiuc.edu/pub/gentoo-portage/app-text/ghostscript-esp/files/ghostscript-7.05.6.man.patch +Source25: http://gentoo.cites.uiuc.edu/pub/gentoo-portage/app-text/ghostscript-esp/files/gs7.05.6-gdevpx.patch Source-MD5: d30bf5c09f2c7caa8291f6305cf03044 -Source2-MD5: dbd5f3b47ed13132f04c685d608a7547 +Source2-MD5: d79bdc356974869471eea82bce66819d Source3-MD5: dfc93dd2aaaf2b86d2fd55f654c13261 Source4-MD5: 5fd9d1a0c61692551b01b8f153c313a4 Source5-MD5: f834d056ca972c457a2ff3b1e839e562 @@ -52,8 +56,10 @@ Source20-MD5: 8c6a3d7e8897b4297ef853dbd89e408b Source21-MD5: 92fa24960f2c7802749ce6908aeaf60d Source22-MD5: 0201da09644874147627750546511c36 +Source23-MD5: b2ca914ffcff3e5296d6b5acc7fac182 +Source24-MD5: fd34b2b7a029f19eab4ba3f69afe295e +Source25-MD5: 68fa21d11a860c222c8ba89c39ce578e SourceDirectory: espgs-%v -Source2ExtractDir: espgs-%v Source3ExtractDir: Resource Source4ExtractDir: Resource PatchScript: << @@ -69,8 +75,27 @@ # CIDToGIDMap of NeverEmbed CJK TrueType and Encoding of CIDFont into PDF patch -p0 < ../fix_cidfontname_Encoding_CIDToGIDMap_DW_W.patch - # modify ps2pdfwr to use NeverEmbed - (cd lib && patch -p0 < ../../modify_ps2pdfwr.patch) + ######################### make ps2jpdf start ######################### + cp lib/ps2pdfwr lib/ps2jpdf + + # modify ps2jpdf to use NeverEmbed + sed s/ps2pdfwr/ps2jpdf/ < ../modify_ps2pdfwr.patch | patch -p0 -d lib + + # add NeverEmbedCIDFontList and AlwaysEmbedCIDFontList + sed s/ps2pdfwr/ps2jpdf/ < ../modify_ps2pdfwr-20050921.patch | patch -p0 -d lib + + # to handle hyperref's bookmarks, convert EUC into UTF-8 + sed -i.bak \ + 's:\(exec gs.* -f\) "$infile":cat "$infile" | %p/bin/convert-euc | \1 -:' \ + lib/ps2jpdf + + # fix PATH of system-perl + sed -i.bak 's:/usr/local/bin/perl5:/usr/bin/perl:' ../convert-euc*.txt + + # install ps2jpdf + sed -i.bak 's:\(ps2pdfwr\):\1 ps2jpdf:' src/unixinst.mak + + ######################### make ps2jpdf end ######################### # to handle TrueType fonts which have a big cmap table patch -p0 < ../ghostscript-7.07-bigcmaptable.patch @@ -97,9 +122,6 @@ # recommended with adobe-cmaps-200406 patch -p0 < ../fix_cidfonttype2_Adobe-Japan1-6.patch - # add NeverEmbedCIDFontList and AlwaysEmbedCIDFontList - (cd lib && patch -p0 < ../../modify_ps2pdfwr-20050921.patch) - # Insecure tempfile handling patch -p1 < ../gs7.07.1-tempfile.patch @@ -109,13 +131,22 @@ # Build the small Ghostscript loaders without GTK+ sed 's|$(DESTDIR)||g' < ../gs7.07.1-nogtk2.patch | patch -p0 + # Handle ps2ps argument + patch -p0 < ../gs7.07.1-ps2ps.patch + + # man page patch + sed 's|/usr/share|%p/share|g' < ../ghostscript-7.05.6.man.patch | patch -p1 + + # pxl dash patch + patch -p1 < ../gs7.05.6-gdevpx.patch + # See DescPackaging sed 's|<PREFIX>|%p|g' < %a/%n.patch | patch -p1 << NoSetMAKEFLAGS: true SetMAKEFLAGS: -j1 SetCFLAGS: -I%p/include -ConfigureParams: --mandir='${prefix}/share/man' --with-x --with-gimp-print --with-cups --with-omni +ConfigureParams: --mandir='${prefix}/share/man' --with-x --without-gimp-print --with-cups --with-omni CompileScript: << GLIB_CONFIG=%p/bin/pkg-config ./configure %c make CFLAGS_STANDARD="-O2 -I%p/include" XLDFLAGS="-L%p/lib -lintl" @@ -127,6 +158,9 @@ install -m 755 -d %i/share/ghostscript/Resource/Font install -m 755 -d %i/share/ghostscript/Resource/CIDFont + install -m 755 -d %i/bin + install -m 755 ../convert-euc*.txt %i/bin/convert-euc + install -m 755 -d %i/sbin install -m 755 finkcups %i/sbin << @@ -141,10 +175,10 @@ If that doesn't matter for you and you want to use OTF(Hiragino) for a preview, modify CIDFnmap.CJK in %p/share/ghostscript/7.07/lib/. - In order to create PDF file from PS file with embedded fonts, run ps2pdfwr - like this: - $ env NeverEmbedFontList=' ' NeverEmbedCIDFontList=' ' ps2pdfwr sample.ps - See ps2pdfwr for details. It doesn't embed fonts by default. + In order to create PDF file from PS file WITHOUT embedded fonts, + run "ps2jpdf" command instead of "ps2pdf*" command. + See ps2jpdf for details. It doesn't embed fonts by default. In addition, + ps2jpdf converts EUC characters in hyperref's bookmarks into UTF-8 ones. [About CUPS] In order to enable ESP GS's CUPS, run the following command manually: @@ -154,10 +188,7 @@ (ghostscript-esp) is removed, original files are restored from those backups. << DescPackaging: << - A patch to ps2ps is based on Gentoo Linux's gs7.07.1-ps2ps.patch. - A patch to gs.1 is based on Gentoo Linux's ghostscript-7.05.6.man.patch. A patch to gs_res.ps.in is based on Gentoo Linux's gs7.07.1-cjk.diff. - A patch to gdevpx.c is based on Gentoo Linux's gs7.05.6-gdevpx.patch. A patch to configure handles problems of encryption libraries on Panther and makes GS to use glib2 instead of glib. ------------------------------------------------------------------------- This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits