From edd157b6e11ebe9f814c17b6ad2c0218b8554e3c0b49365aa8d3ec0baf353619 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 17 Aug 2010 12:29:59 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Publishing/a2ps?expand=0&rev=7 --- a2ps-4.13.dif | 128 +++++++++++++++++++++++++++----------------------- a2ps-open | 105 +++++++++++++++++++++++++++++++++++++++++ a2ps.changes | 1 + a2ps.spec | 3 ++ 4 files changed, 179 insertions(+), 58 deletions(-) create mode 100644 a2ps-open diff --git a/a2ps-4.13.dif b/a2ps-4.13.dif index 227e6c5..1b0c225 100644 --- a/a2ps-4.13.dif +++ b/a2ps-4.13.dif @@ -1,5 +1,5 @@ --- .pkgextract -+++ .pkgextract 2006-02-23 13:05:17.000000000 +0100 ++++ .pkgextract 2006-02-23 12:05:17.000000000 +0000 @@ -0,0 +1,9 @@ +patch -p0 -s --suffix=.ogon < ../a2ps-4.13-ogonkify.patch +patch -p0 -s --suffix=.secu < ../a2ps-4.13-security.patch @@ -11,7 +11,7 @@ +patch -p0 -s --suffix=.base < ../a2ps-4.13-base.patch +patch -p0 -s --suffix=.utf8 < ../a2ps-4.13-utf8.patch --- configure -+++ configure 2006-02-23 13:05:17.000000000 +0100 ++++ configure 2006-02-23 12:05:17.000000000 +0000 @@ -8448,8 +8448,9 @@ echo "configure:8448: checking for PostS # Try to find some PostScript fonts. # Find out if ghostscript is installed @@ -25,7 +25,7 @@ if test "cd $ac_dir 2>/dev/null && echo *.afm"; then ac_psfont_path="$ac_psfont_path:$ac_dir"; --- configure.in -+++ configure.in 2006-05-19 12:34:39.000000000 +0200 ++++ configure.in 2006-05-19 10:34:39.000000000 +0000 @@ -197,8 +197,9 @@ AC_MSG_CHECKING(for PostScript fonts pat # Try to find some PostScript fonts. # Find out if ghostscript is installed @@ -39,7 +39,7 @@ if test "cd $ac_dir 2>/dev/null && echo *.afm"; then ac_psfont_path="$ac_psfont_path:$ac_dir"; --- afm/fonts.map -+++ afm/fonts.map 2006-02-23 13:05:17.000000000 +0100 ++++ afm/fonts.map 2006-02-23 12:05:17.000000000 +0000 @@ -43,6 +43,14 @@ Bookman-Demi pbkd Bookman-DemiItalic pbkdi Bookman-Light pbkl @@ -113,7 +113,7 @@ ZapfChancery-MediumItalic pzcmi ZapfDingbats pzdr --- afm/pcrb.afm -+++ afm/pcrb.afm 2006-02-23 13:05:17.000000000 +0100 ++++ afm/pcrb.afm 2006-02-23 12:05:17.000000000 +0000 @@ -17,7 +17,7 @@ CapHeight 633 XHeight 487 Descender -257 @@ -149,7 +149,7 @@ CC aring 2 ; PCC a 0 0 ; PCC ring 0 0 ; EndComposites --- afm/pcrbo.afm -+++ afm/pcrbo.afm 2006-02-23 13:05:17.000000000 +0100 ++++ afm/pcrbo.afm 2006-02-23 12:05:17.000000000 +0000 @@ -17,7 +17,7 @@ CapHeight 633 XHeight 487 Descender -257 @@ -185,7 +185,7 @@ CC aring 2 ; PCC a 0 0 ; PCC ring 0 0 ; EndComposites --- afm/pcrr.afm -+++ afm/pcrr.afm 2006-02-23 13:05:17.000000000 +0100 ++++ afm/pcrr.afm 2006-02-23 12:05:17.000000000 +0000 @@ -17,7 +17,7 @@ CapHeight 583 XHeight 437 Descender -207 @@ -221,7 +221,7 @@ CC aring 2 ; PCC a 0 0 ; PCC ring 0 0 ; EndComposites --- afm/pcrro.afm -+++ afm/pcrro.afm 2006-02-23 13:05:17.000000000 +0100 ++++ afm/pcrro.afm 2006-02-23 12:05:17.000000000 +0000 @@ -17,7 +17,7 @@ CapHeight 583 XHeight 437 Descender -207 @@ -257,7 +257,7 @@ CC aring 2 ; PCC a 0 0 ; PCC ring 0 0 ; EndComposites --- afm/phvb.afm -+++ afm/phvb.afm 2006-02-23 13:05:17.000000000 +0100 ++++ afm/phvb.afm 2006-02-23 12:05:17.000000000 +0000 @@ -17,7 +17,7 @@ CapHeight 729 XHeight 542 Descender -219 @@ -284,7 +284,7 @@ CC Zcaron 2 ; PCC Z 0 0 ; PCC caron 139 191 ; CC zcaron 2 ; PCC z 0 0 ; PCC caron 83 0 ; CC Scaron 2 ; PCC S 0 0 ; PCC caron 167 191 ; -@@ -427,6 +428,7 @@ CC Ntilde 2 ; PCC N 0 0 ; PCC tilde 200 +@@ -427,6 +428,7 @@ CC Ntilde 2 ; PCC N 0 0 ; PCC tilde 200 CC ntilde 2 ; PCC n 0 0 ; PCC tilde 146 0 ; CC Otilde 2 ; PCC O 0 0 ; PCC tilde 222 191 ; CC otilde 2 ; PCC o 0 0 ; PCC tilde 139 0 ; @@ -293,7 +293,7 @@ CC aring 2 ; PCC a 0 0 ; PCC ring 111 0 ; EndComposites --- afm/phvbo.afm -+++ afm/phvbo.afm 2006-02-23 13:05:17.000000000 +0100 ++++ afm/phvbo.afm 2006-02-23 12:05:17.000000000 +0000 @@ -17,7 +17,7 @@ CapHeight 729 XHeight 542 Descender -219 @@ -320,7 +320,7 @@ CC Zcaron 2 ; PCC Z 0 0 ; PCC caron 139 187 ; CC zcaron 2 ; PCC z 0 0 ; PCC caron 83 0 ; CC Scaron 2 ; PCC S 0 0 ; PCC caron 167 187 ; -@@ -425,6 +426,7 @@ CC Ntilde 2 ; PCC N 0 0 ; PCC tilde 194 +@@ -425,6 +426,7 @@ CC Ntilde 2 ; PCC N 0 0 ; PCC tilde 194 CC ntilde 2 ; PCC n 0 0 ; PCC tilde 139 0 ; CC Otilde 2 ; PCC O 0 0 ; PCC tilde 222 187 ; CC otilde 2 ; PCC o 0 0 ; PCC tilde 139 0 ; @@ -329,7 +329,7 @@ CC aring 2 ; PCC a 0 0 ; PCC ring 111 0 ; EndComposites --- afm/phvr.afm -+++ afm/phvr.afm 2006-02-23 13:05:17.000000000 +0100 ++++ afm/phvr.afm 2006-02-23 12:05:17.000000000 +0000 @@ -17,7 +17,7 @@ CapHeight 729 XHeight 525 Descender -219 @@ -356,7 +356,7 @@ CC Zcaron 2 ; PCC Z 0 0 ; PCC caron 139 199 ; CC zcaron 2 ; PCC z 0 0 ; PCC caron 83 0 ; CC Scaron 2 ; PCC S 0 0 ; PCC caron 167 199 ; -@@ -431,6 +432,7 @@ CC Ntilde 2 ; PCC N 0 0 ; PCC tilde 200 +@@ -431,6 +432,7 @@ CC Ntilde 2 ; PCC N 0 0 ; PCC tilde 200 CC ntilde 2 ; PCC n 0 0 ; PCC tilde 117 0 ; CC Otilde 2 ; PCC O 0 0 ; PCC tilde 222 199 ; CC otilde 2 ; PCC o 0 0 ; PCC tilde 111 0 ; @@ -365,7 +365,7 @@ CC aring 2 ; PCC a 0 0 ; PCC ring 111 0 ; EndComposites --- afm/phvro.afm -+++ afm/phvro.afm 2006-02-23 13:05:17.000000000 +0100 ++++ afm/phvro.afm 2006-02-23 12:05:17.000000000 +0000 @@ -17,7 +17,7 @@ CapHeight 729 XHeight 525 Descender -219 @@ -392,7 +392,7 @@ CC Zcaron 2 ; PCC Z 0 0 ; PCC caron 139 204 ; CC zcaron 2 ; PCC z 0 0 ; PCC caron 83 0 ; CC Scaron 2 ; PCC S 0 0 ; PCC caron 167 204 ; -@@ -424,6 +425,7 @@ CC Ntilde 2 ; PCC N 0 0 ; PCC tilde 194 +@@ -424,6 +425,7 @@ CC Ntilde 2 ; PCC N 0 0 ; PCC tilde 194 CC ntilde 2 ; PCC n 0 0 ; PCC tilde 111 0 ; CC Otilde 2 ; PCC O 0 0 ; PCC tilde 222 204 ; CC otilde 2 ; PCC o 0 0 ; PCC tilde 111 0 ; @@ -401,7 +401,7 @@ CC aring 2 ; PCC a 0 0 ; PCC ring 111 0 ; EndComposites --- afm/ptmb.afm -+++ afm/ptmb.afm 2006-02-23 13:05:17.000000000 +0100 ++++ afm/ptmb.afm 2006-02-23 12:05:17.000000000 +0000 @@ -17,7 +17,7 @@ CapHeight 681 XHeight 460 Descender -210 @@ -428,7 +428,7 @@ CC Zcaron 2 ; PCC Z 0 0 ; PCC caron 167 219 ; CC zcaron 2 ; PCC z 0 0 ; PCC caron 55 0 ; CC Scaron 2 ; PCC S 0 0 ; PCC caron 111 219 ; -@@ -450,6 +451,7 @@ CC Ntilde 2 ; PCC N 0 0 ; PCC tilde 194 +@@ -450,6 +451,7 @@ CC Ntilde 2 ; PCC N 0 0 ; PCC tilde 194 CC ntilde 2 ; PCC n 0 0 ; PCC tilde 111 0 ; CC Otilde 2 ; PCC O 0 0 ; PCC tilde 222 219 ; CC otilde 2 ; PCC o 0 0 ; PCC tilde 83 0 ; @@ -437,7 +437,7 @@ CC aring 2 ; PCC a 0 0 ; PCC ring 76 0 ; EndComposites --- afm/ptmbi.afm -+++ afm/ptmbi.afm 2006-02-23 13:05:17.000000000 +0100 ++++ afm/ptmbi.afm 2006-02-23 12:05:17.000000000 +0000 @@ -17,7 +17,7 @@ CapHeight 662 XHeight 458 Descender -203 @@ -464,7 +464,7 @@ CC Zcaron 2 ; PCC Z 0 0 ; PCC caron 139 204 ; CC zcaron 2 ; PCC z 0 0 ; PCC caron 28 0 ; CC Scaron 2 ; PCC S 0 0 ; PCC caron 111 204 ; -@@ -434,6 +435,7 @@ CC Ntilde 2 ; PCC N 0 0 ; PCC tilde 194 +@@ -434,6 +435,7 @@ CC Ntilde 2 ; PCC N 0 0 ; PCC tilde 194 CC ntilde 2 ; PCC n 0 0 ; PCC tilde 111 0 ; CC Otilde 2 ; PCC O 0 0 ; PCC tilde 194 204 ; CC otilde 2 ; PCC o 0 0 ; PCC tilde 83 0 ; @@ -473,7 +473,7 @@ CC aring 2 ; PCC a 0 0 ; PCC ring 83 0 ; EndComposites --- afm/ptmi.afm -+++ afm/ptmi.afm 2006-02-23 13:05:17.000000000 +0100 ++++ afm/ptmi.afm 2006-02-23 12:05:17.000000000 +0000 @@ -17,7 +17,7 @@ CapHeight 660 XHeight 446 Descender -206 @@ -500,7 +500,7 @@ CC Zcaron 2 ; PCC Z 0 0 ; PCC caron 111 227 ; CC zcaron 2 ; PCC z 0 0 ; PCC caron 28 0 ; CC Scaron 2 ; PCC S 0 0 ; PCC caron 83 227 ; -@@ -446,6 +447,7 @@ CC Ntilde 2 ; PCC N 0 0 ; PCC tilde 181 +@@ -446,6 +447,7 @@ CC Ntilde 2 ; PCC N 0 0 ; PCC tilde 181 CC ntilde 2 ; PCC n 0 0 ; PCC tilde 76 0 ; CC Otilde 2 ; PCC O 0 0 ; PCC tilde 221 227 ; CC otilde 2 ; PCC o 0 0 ; PCC tilde 89 0 ; @@ -509,7 +509,7 @@ CC aring 2 ; PCC a 0 0 ; PCC ring 29 0 ; EndComposites --- afm/ptmr.afm -+++ afm/ptmr.afm 2006-02-23 13:05:17.000000000 +0100 ++++ afm/ptmr.afm 2006-02-23 12:05:17.000000000 +0000 @@ -17,7 +17,7 @@ CapHeight 662 XHeight 448 Descender -217 @@ -536,7 +536,7 @@ CC Zcaron 2 ; PCC Z 0 0 ; PCC caron 139 214 ; CC zcaron 2 ; PCC z 0 0 ; PCC caron 55 0 ; CC Scaron 2 ; PCC S 0 0 ; PCC caron 111 214 ; -@@ -439,6 +440,7 @@ CC Ntilde 2 ; PCC N 0 0 ; PCC tilde 194 +@@ -439,6 +440,7 @@ CC Ntilde 2 ; PCC N 0 0 ; PCC tilde 194 CC ntilde 2 ; PCC n 0 0 ; PCC tilde 83 0 ; CC Otilde 2 ; PCC O 0 0 ; PCC tilde 194 214 ; CC otilde 2 ; PCC o 0 0 ; PCC tilde 83 0 ; @@ -545,7 +545,7 @@ CC aring 2 ; PCC a 0 0 ; PCC ring 55 0 ; EndComposites --- contrib/emacs/a2ps.el -+++ contrib/emacs/a2ps.el 2006-02-23 13:05:17.000000000 +0100 ++++ contrib/emacs/a2ps.el 2006-02-23 12:05:17.000000000 +0000 @@ -44,7 +44,7 @@ ;; a2ps-compile-regexp @@ -556,7 +556,7 @@ ;;thank god for make-regexp.el! (defvar a2ps-font-lock-keywords --- doc/Makefile.in -+++ doc/Makefile.in 2006-02-23 13:05:17.000000000 +0100 ++++ doc/Makefile.in 2006-02-23 12:05:17.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4a from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am @@ -789,7 +789,7 @@ --- doc/a2ps.texi -+++ doc/a2ps.texi 2006-02-23 13:05:17.000000000 +0100 ++++ doc/a2ps.texi 2006-02-23 12:05:17.000000000 +0000 @@ -6182,7 +6182,7 @@ Error related questions. @subsection Why Does it Print Nothing? @@ -799,7 +799,7 @@ @end quotation There are two ways that printing can fail: silently, or with a -@@ -6311,7 +6311,7 @@ If it is incorrect, ask for help around +@@ -6311,7 +6311,7 @@ If it is incorrect, ask for help around @subsection Why Does it Say my File is Binary? @quotation @@ -809,7 +809,7 @@ There are several reasons that can cause @pack{} to consider a file is --- encoding/encoding.map -+++ encoding/encoding.map 2006-02-23 13:05:17.000000000 +0100 ++++ encoding/encoding.map 2006-02-23 12:05:17.000000000 +0000 @@ -84,6 +84,10 @@ iso15 iso15 latin9 iso15 latin0 iso15 @@ -822,7 +822,7 @@ ######################################################################## # Other encodings --- etc/Makefile.in -+++ etc/Makefile.in 2006-02-23 13:05:17.000000000 +0100 ++++ etc/Makefile.in 2006-02-23 12:05:17.000000000 +0000 @@ -297,7 +297,7 @@ uninstall-local: # Building the correct a2ps.cfg @@ -833,7 +833,7 @@ # Building a time stamp to know the version. README: README.in Makefile --- etc/a2ps_cfg.in -+++ etc/a2ps_cfg.in 2008-07-15 18:50:20.922218080 +0200 ++++ etc/a2ps_cfg.in 2010-08-17 11:16:45.035125629 +0000 @@ -43,26 +43,56 @@ # (Must be defined before --medium) # ################################################################# @@ -918,7 +918,19 @@ ################################################################# -@@ -264,31 +294,16 @@ $3p<-$3p> $4l# lines\n|| +@@ -190,8 +220,9 @@ Variable: del.metapost \ + # Either GV (prefered) or Ghostview will be used as the "display" printer + # We give -dNOPLATFONTS so that real fonts are used + # (Strange results appear with Ogonkify's fonts for instance). +-@COM_ghostview@Variable: ghostview @ghostview@ -arguments -dNOPLATFONTS +-@COM_gv@Variable: ghostview @gv@ -antialias -arguments -dNOPLATFONTS ++##@COM_ghostview@Variable: ghostview @ghostview@ -arguments -dNOPLATFONTS ++#@COM_gv@Variable: ghostview @gv@ -antialias -arguments -dNOPLATFONTS ++Variable: ghostview a2ps-open + + # Used for the `pdf' printer. + # Use as `#{ps2pdf} INPUT OUTPUT'. +@@ -267,31 +298,16 @@ Delegation: utf8 utf8:plain iconv -c -f @COM_PSUTILS@@COM_dvips@ fi ########## HTML files @@ -956,7 +968,7 @@ ########## PDF files # Delegated to pdf2ps, GS 5.50 --- lib/jobs.c -+++ lib/jobs.c 2006-02-23 13:05:17.000000000 +0100 ++++ lib/jobs.c 2006-02-23 12:05:17.000000000 +0000 @@ -134,10 +134,19 @@ a2ps_job_new (void) /* Set the NLS on */ @@ -979,7 +991,7 @@ bindtextdomain (PACKAGE, LOCALEDIR); textdomain (PACKAGE); --- lib/metaseq.c -+++ lib/metaseq.c 2006-02-23 13:05:17.000000000 +0100 ++++ lib/metaseq.c 2006-02-23 12:05:17.000000000 +0000 @@ -205,7 +205,7 @@ grow_user_string_obstack (struct obstack int justification = 1; @@ -990,7 +1002,7 @@ int type; --- lib/options.c -+++ lib/options.c 2006-02-23 13:05:17.000000000 +0100 ++++ lib/options.c 2006-02-23 12:05:17.000000000 +0000 @@ -54,10 +54,14 @@ #include "argv.h" #include "quotearg.h" @@ -1039,7 +1051,7 @@ * the encoding.map has not been read yet (because to read * encoding.map, one has to know the lib path, and to know --- lib/path-concat.c -+++ lib/path-concat.c 2006-02-23 13:05:17.000000000 +0100 ++++ lib/path-concat.c 2006-02-23 12:05:17.000000000 +0000 @@ -21,17 +21,15 @@ # include #endif @@ -1062,7 +1074,7 @@ #ifndef DIRECTORY_SEPARATOR # define DIRECTORY_SEPARATOR '/' --- lib/printlen.c -+++ lib/printlen.c 2006-02-23 13:05:17.000000000 +0100 ++++ lib/printlen.c 2006-02-23 12:05:17.000000000 +0000 @@ -28,14 +28,15 @@ Foundation, Inc., 59 Temple Place - Suit unsigned long strtoul (); @@ -1091,8 +1103,8 @@ int --- lib/title.c -+++ lib/title.c 2006-02-23 13:05:17.000000000 +0100 -@@ -83,11 +83,13 @@ title (stream, c, center_p, format, va_a ++++ lib/title.c 2006-02-23 12:05:17.000000000 +0000 +@@ -87,11 +87,13 @@ title (stream, c, center_p, format, va_a VA_START (args, format); len = vprintflen (format, args); @@ -1107,7 +1119,7 @@ vfprintf (stream, format, args); # else --- lib/xstrrpl.c -+++ lib/xstrrpl.c 2006-02-23 13:05:17.000000000 +0100 ++++ lib/xstrrpl.c 2006-02-23 12:05:17.000000000 +0000 @@ -22,6 +22,7 @@ #include #include "xstrrpl.h" @@ -1117,7 +1129,7 @@ /* Perform subsitutions in string. Result is malloc'd --- man/a2ps.1 -+++ man/a2ps.1 2006-02-23 13:05:17.000000000 +0100 ++++ man/a2ps.1 2006-02-23 12:05:17.000000000 +0000 @@ -80,8 +80,8 @@ first fill (DIRECTION=) rows, or columns predefined font sizes and layouts for 1.. 9 virtuals .TP @@ -1130,7 +1142,7 @@ \fB\-j\fR, \fB\-\-borders\fR* print borders around columns --- ogonkify/Makefile.in -+++ ogonkify/Makefile.in 2006-02-23 13:05:17.000000000 +0100 ++++ ogonkify/Makefile.in 2006-02-23 12:05:17.000000000 +0000 @@ -138,7 +138,7 @@ PSPROGS = allchars.ps compose.ps helper. @EXTENSIONS_TRUE@bin_SCRIPTS = @EXTENSIONS_TRUE@ogonkify composeglyphs @@ -1141,7 +1153,7 @@ # --- ogonkify/ogonkify.in.in -+++ ogonkify/ogonkify.in.in 2006-02-23 13:05:17.000000000 +0100 ++++ ogonkify/ogonkify.in.in 2006-02-23 12:05:17.000000000 +0000 @@ -38,7 +38,7 @@ $encoding='L2'; 'ibmpc','IBMPCEncoding', 'mac','MacintoshEncoding', 'HP','HPRomanEncoding'); @@ -1152,7 +1164,7 @@ 'Helvetica', 'Helvetica-Oblique', 'Helvetica-Bold', 'Helvetica-BoldOblique'); --- ogonkify/pcrb-o.afm -+++ ogonkify/pcrb-o.afm 2006-02-23 13:05:17.000000000 +0100 ++++ ogonkify/pcrb-o.afm 2006-02-23 12:05:17.000000000 +0000 @@ -5,7 +5,7 @@ FontName Courier-Bold-Ogonki EncodingScheme StandardEncoding FullName Courier-Bold-Ogonki Composite font @@ -1171,7 +1183,7 @@ C -1 ; WX 600 ; N Icircumflex ; B 77 0 523 780 ; C -1 ; WX 600 ; N Atilde ; B -9 0 609 759 ; --- ogonkify/pcrbo-o.afm -+++ ogonkify/pcrbo-o.afm 2006-02-23 13:05:17.000000000 +0100 ++++ ogonkify/pcrbo-o.afm 2006-02-23 12:05:17.000000000 +0000 @@ -5,7 +5,7 @@ FontName Courier-BoldOblique-Ogonki EncodingScheme StandardEncoding FullName Courier-BoldOblique-Ogonki Composite font @@ -1190,7 +1202,7 @@ C -1 ; WX 600 ; N Icircumflex ; B 77 0 642 780 ; C -1 ; WX 600 ; N Atilde ; B -9 0 638 759 ; --- ogonkify/pcrr-o.afm -+++ ogonkify/pcrr-o.afm 2006-02-23 13:05:17.000000000 +0100 ++++ ogonkify/pcrr-o.afm 2006-02-23 12:05:17.000000000 +0000 @@ -5,7 +5,7 @@ FontName Courier-Ogonki EncodingScheme StandardEncoding FullName Courier-Ogonki Composite font @@ -1209,7 +1221,7 @@ C -1 ; WX 600 ; N Icircumflex ; B 96 0 504 775 ; C -1 ; WX 600 ; N Atilde ; B 3 0 597 732 ; --- ogonkify/pcrro-o.afm -+++ ogonkify/pcrro-o.afm 2006-02-23 13:05:17.000000000 +0100 ++++ ogonkify/pcrro-o.afm 2006-02-23 12:05:17.000000000 +0000 @@ -5,7 +5,7 @@ FontName Courier-Oblique-Ogonki EncodingScheme StandardEncoding FullName Courier-Oblique-Ogonki Composite font @@ -1228,7 +1240,7 @@ C -1 ; WX 600 ; N Icircumflex ; B 96 0 623 775 ; C -1 ; WX 600 ; N Atilde ; B 3 0 656 732 ; --- ogonkify/phvb-o.afm -+++ ogonkify/phvb-o.afm 2006-02-23 13:05:17.000000000 +0100 ++++ ogonkify/phvb-o.afm 2006-02-23 12:05:17.000000000 +0000 @@ -5,7 +5,7 @@ FontName Helvetica-Bold-Ogonki EncodingScheme StandardEncoding FullName Helvetica-Bold-Ogonki Composite font @@ -1247,7 +1259,7 @@ C -1 ; WX 737 ; N registered ; B -14 -20 751 745 ; C -1 ; WX 556 ; N scaron ; B 29 -23 520 745 ; --- ogonkify/phvbo-o.afm -+++ ogonkify/phvbo-o.afm 2006-02-23 13:05:17.000000000 +0100 ++++ ogonkify/phvbo-o.afm 2006-02-23 12:05:17.000000000 +0000 @@ -5,7 +5,7 @@ FontName Helvetica-BoldOblique-Ogonki EncodingScheme StandardEncoding FullName Helvetica-BoldOblique-Ogonki Composite font @@ -1266,7 +1278,7 @@ C -1 ; WX 737 ; N registered ; B 55 -20 837 745 ; C -1 ; WX 556 ; N scaron ; B 60 -23 597 745 ; --- ogonkify/phvr-o.afm -+++ ogonkify/phvr-o.afm 2006-02-23 13:05:17.000000000 +0100 ++++ ogonkify/phvr-o.afm 2006-02-23 12:05:17.000000000 +0000 @@ -5,7 +5,7 @@ FontName Helvetica-Ogonki EncodingScheme StandardEncoding FullName Helvetica-Ogonki Composite font @@ -1285,7 +1297,7 @@ C -1 ; WX 737 ; N registered ; B -13 -23 751 741 ; C -1 ; WX 500 ; N scaron ; B 34 -24 459 740 ; --- ogonkify/phvro-o.afm -+++ ogonkify/phvro-o.afm 2006-02-23 13:05:17.000000000 +0100 ++++ ogonkify/phvro-o.afm 2006-02-23 12:05:17.000000000 +0000 @@ -5,7 +5,7 @@ FontName Helvetica-Oblique-Ogonki EncodingScheme StandardEncoding FullName Helvetica-Oblique-Ogonki Composite font @@ -1304,7 +1316,7 @@ C -1 ; WX 737 ; N registered ; B 55 -23 836 741 ; C -1 ; WX 500 ; N scaron ; B 61 -24 547 740 ; --- ogonkify/ptmb-o.afm -+++ ogonkify/ptmb-o.afm 2006-02-23 13:05:17.000000000 +0100 ++++ ogonkify/ptmb-o.afm 2006-02-23 12:05:17.000000000 +0000 @@ -5,7 +5,7 @@ FontName Times-Bold-Ogonki EncodingScheme StandardEncoding FullName Times-Bold-Ogonki Composite font @@ -1323,7 +1335,7 @@ C -1 ; WX 747 ; N registered ; B 16 -17 730 690 ; C -1 ; WX 389 ; N scaron ; B 29 -17 359 690 ; --- ogonkify/ptmbi-o.afm -+++ ogonkify/ptmbi-o.afm 2006-02-23 13:05:17.000000000 +0100 ++++ ogonkify/ptmbi-o.afm 2006-02-23 12:05:17.000000000 +0000 @@ -5,7 +5,7 @@ FontName Times-BoldItalic-Ogonki EncodingScheme StandardEncoding FullName Times-BoldItalic-Ogonki Composite font @@ -1342,7 +1354,7 @@ C -1 ; WX 747 ; N registered ; B 23 -18 723 676 ; C -1 ; WX 389 ; N scaron ; B 16 -13 465 683 ; --- ogonkify/ptmr-o.afm -+++ ogonkify/ptmr-o.afm 2006-02-23 13:05:17.000000000 +0100 ++++ ogonkify/ptmr-o.afm 2006-02-23 12:05:17.000000000 +0000 @@ -5,7 +5,7 @@ FontName Times-Roman-Ogonki EncodingScheme StandardEncoding FullName Times-Roman-Ogonki Composite font @@ -1352,7 +1364,7 @@ C 32 ; WX 250 ; N space ; B 0 0 0 0 ; C 33 ; WX 333 ; N exclam ; B 130 -9 238 676 ; C 34 ; WX 408 ; N quotedbl ; B 77 431 331 676 ; -@@ -167,6 +167,7 @@ C -1 ; WX 444 ; N egrave ; B 25 -10 424 +@@ -167,6 +167,7 @@ C -1 ; WX 444 ; N egrave ; B 25 -10 424 C -1 ; WX 300 ; N twosuperior ; B 1 270 296 676 ; C -1 ; WX 444 ; N eacute ; B 25 -10 424 678 ; C -1 ; WX 500 ; N otilde ; B 29 -10 470 638 ; @@ -1361,7 +1373,7 @@ C -1 ; WX 500 ; N ocircumflex ; B 29 -10 470 674 ; C -1 ; WX 500 ; N yacute ; B 14 -218 475 678 ; --- ogonkify/ptmri-o.afm -+++ ogonkify/ptmri-o.afm 2006-02-23 13:05:17.000000000 +0100 ++++ ogonkify/ptmri-o.afm 2006-02-23 12:05:17.000000000 +0000 @@ -5,7 +5,7 @@ FontName Times-Italic-Ogonki EncodingScheme StandardEncoding FullName Times-Italic-Ogonki Composite font @@ -1371,7 +1383,7 @@ C 32 ; WX 250 ; N space ; B 0 0 0 0 ; C 33 ; WX 333 ; N exclam ; B 39 -11 302 667 ; C 34 ; WX 420 ; N quotedbl ; B 144 421 432 666 ; -@@ -167,6 +167,7 @@ C -1 ; WX 444 ; N egrave ; B 31 -11 412 +@@ -167,6 +167,7 @@ C -1 ; WX 444 ; N egrave ; B 31 -11 412 C -1 ; WX 300 ; N twosuperior ; B 33 271 324 676 ; C -1 ; WX 444 ; N eacute ; B 31 -11 459 664 ; C -1 ; WX 500 ; N otilde ; B 27 -11 496 624 ; @@ -1380,7 +1392,7 @@ C -1 ; WX 500 ; N ocircumflex ; B 27 -11 468 661 ; C -1 ; WX 444 ; N yacute ; B -24 -206 459 664 ; --- src/main.c -+++ src/main.c 2006-02-23 13:05:17.000000000 +0100 ++++ src/main.c 2006-02-23 12:05:17.000000000 +0000 @@ -56,6 +56,7 @@ #include "signame.h" #include "long-options.h" diff --git a/a2ps-open b/a2ps-open new file mode 100644 index 0000000..d2585d1 --- /dev/null +++ b/a2ps-open @@ -0,0 +1,105 @@ +#!/bin/bash +# +# a2ps-open based on xdg-open, see below +# +# The changes are +# Copyright 2009, Werner Fink +# +#--------------------------------------------- +# xdg-open +# +# Utility script to open a URL in the registered default application. +# +# Refer to the usage() function below for usage. +# +# Copyright 2006, Kevin Krammer +# Copyright 2006, Jeremy White +# +# LICENSE: +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR +# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +# OTHER DEALINGS IN THE SOFTWARE. +# +#--------------------------------------------- + +#-------------------------------------- +# Checks for known desktop environments +# set variable DE to the desktop environments name, lowercase + +detectDE() +{ + if test "$KDE_FULL_SESSION" = "true" ; then DE=kde; + elif test -n "$GNOME_DESKTOP_SESSION_ID" ; then DE=gnome; + elif xprop -root _DT_SAVE_MODE | grep ' = \"xfce4\"$' &>/dev/null ; then DE=xfce; + fi +} + +#---------------------------------------------------------------------------- +# kfmclient exec/openURL can give bogus exit value in KDE <= 3.5.4 +# It also always returns 1 in KDE 3.4 and earlier +# Simply return 0 in such case + +kfmclient_fix_exit_code() +{ + local -i major minor release + local IFS + IFS=. + read -t 1 major minor release < <(kde-config --version 2>/dev/null | + sed -nr '/^KDE:/ {s/KDE:[[:blank:]]+([0-9]*\.[0-9]+\.[0-9]*).+/\1/p;}') + ((major > 3)) && return $1 + ((minor > 5)) && return $1 + ((release > 4)) && return $1 + return 0 +} + +open_kde() +{ + kfmclient exec "$1" + kfmclient_fix_exit_code $? + test $? -eq 0 || exit 1 +} + +open_gnome() +{ + gnome-open "$1" + test $? -eq 0 || exit 1 +} + +open_xfce() +{ + exo-open "$1" + test $? -eq 0 || exit 1 +} + +open_generic() +{ + gv -antialias ${1+"$@"} + test $? -eq 0 || exit 1 +} + +detectDE + +GS_DEVICE=x11alpha +GS_OPTIONS=-dNOPLATFONTS +export GS_DEVICE GS_OPTIONS +case "$DE" in +# kde) open_kde ${1+"$@"} ;; +# gnome) open_gnome ${1+"$@"} ;; +# xfce) open_xfce ${1+"$@"} ;; + *) open_generic ${1+"$@"} +esac diff --git a/a2ps.changes b/a2ps.changes index c348520..1796011 100644 --- a/a2ps.changes +++ b/a2ps.changes @@ -2,6 +2,7 @@ Tue Aug 17 10:05:05 CEST 2010 - werner@suse.de - Suggest a few useful packages (bnc#631293) +- Add a2ps-open as wrapper for printer `display' ------------------------------------------------------------------- Fri Aug 28 16:27:05 CEST 2009 - werner@suse.de diff --git a/a2ps.spec b/a2ps.spec index 89a1464..6d282df 100644 --- a/a2ps.spec +++ b/a2ps.spec @@ -32,6 +32,7 @@ Release: 1328 Summary: Converts ASCII Text into PostScript Source: a2ps-4.13b.tar.bz2 Source1: a2ps-ko.po +Source2: a2ps-open Patch: a2ps-4.13.dif Patch1: a2ps-4.13-security.patch Patch2: a2ps-4.13-ogonkify.patch @@ -131,6 +132,7 @@ rename no nb po/no.* rm -r %{buildroot}/%{_infodir}/dir %{find_lang} %{name} rm -f %{buildroot}%{_libdir}/liba2ps.la + install -m 0755 %{S:2} %{buildroot}/%{_bindir}/ %clean %{?buildroot: %{__rm} -rf %{buildroot}} @@ -151,6 +153,7 @@ rename no nb po/no.* %config /etc/a2ps-site.cfg %config /etc/a2ps.cfg %{_bindir}/a2ps +%{_bindir}/a2ps-open %{_bindir}/card %{_bindir}/composeglyphs %{_bindir}/fixnt