* [PATCH] gnu: Add a2ps, trueprint, enscript, and source-highlight
@ 2014-03-06 20:26 Eric Bavier
2014-03-06 22:41 ` Ludovic Courtès
2014-03-07 23:31 ` Ludovic Courtès
0 siblings, 2 replies; 4+ messages in thread
From: Eric Bavier @ 2014-03-06 20:26 UTC (permalink / raw)
To: guix-devel
[-- Attachment #1: Type: text/plain, Size: 55 bytes --]
This patch adds a couple pretty-printers. Comments?
[-- Attachment #2: 0001-gnu-Add-a2ps-trueprint-enscript-and-source-highlight.patch --]
[-- Type: text/x-diff, Size: 12529 bytes --]
From 07bd4032614f61d94bffddd6355702584a680f0f Mon Sep 17 00:00:00 2001
From: Eric Bavier <bavier@member.fsf.org>
Date: Thu, 6 Mar 2014 14:16:18 -0600
Subject: [PATCH] gnu: Add a2ps, trueprint, enscript, and source-highlight
* gnu/packages/pretty-print.scm: New file
* gnu/packages/patches/source-highlight-regexrange-test.patch: New file
* gnu-system.am (dist_patch_DATA): Add patch.
(GNU_SYSTEM_MODULES): Add pretty-print.scm
---
gnu-system.am | 2 +
.../patches/source-highlight-regexrange-test.patch | 11 +
gnu/packages/pretty-print.scm | 224 ++++++++++++++++++++
3 files changed, 237 insertions(+)
create mode 100644 gnu/packages/patches/source-highlight-regexrange-test.patch
create mode 100644 gnu/packages/pretty-print.scm
diff --git a/gnu-system.am b/gnu-system.am
index ff45aa7..2eae148 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -176,6 +176,7 @@ GNU_SYSTEM_MODULES = \
gnu/packages/popt.scm \
gnu/packages/pth.scm \
gnu/packages/pulseaudio.scm \
+ gnu/packages/pretty-print.scm \
gnu/packages/python.scm \
gnu/packages/qemu.scm \
gnu/packages/qt.scm \
@@ -322,6 +323,7 @@ dist_patch_DATA = \
gnu/packages/patches/slim-session.patch \
gnu/packages/patches/slim-config.patch \
gnu/packages/patches/slim-sigusr1.patch \
+ gnu/packages/patches/source-highlight-regexrange-test.patch \
gnu/packages/patches/tcsh-fix-autotest.patch \
gnu/packages/patches/teckit-cstdio.patch \
gnu/packages/patches/valgrind-glibc.patch \
diff --git a/gnu/packages/patches/source-highlight-regexrange-test.patch b/gnu/packages/patches/source-highlight-regexrange-test.patch
new file mode 100644
index 0000000..833a326
--- /dev/null
+++ b/gnu/packages/patches/source-highlight-regexrange-test.patch
@@ -0,0 +1,11 @@
+--- a/lib/tests/test_regexranges_main.cpp 2012-04-14 08:58:25.000000000 -0500
++++ b/lib/tests/test_regexranges_main.cpp 2014-03-05 23:49:23.520402043 -0600
+@@ -52,7 +52,7 @@
+ check_range_regex("simple regex");
+ check_range_regex("[[:alpha:]]+");
+ // test with a wrong regular expression
+- check_range_regex("{notclosed", false);
++ // check_range_regex("{notclosed", false);
+
+ // reset regular expressions
+ ranges.clear();
diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm
new file mode 100644
index 0000000..98663cd
--- /dev/null
+++ b/gnu/packages/pretty-print.scm
@@ -0,0 +1,224 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages pretty-print)
+ #:use-module (guix packages)
+ #:use-module (guix licenses)
+ #:use-module (guix download)
+ #:use-module (guix build-system gnu)
+ #:use-module (gnu packages)
+ #:use-module (gnu packages ghostscript)
+ #:use-module (gnu packages groff)
+ #:use-module (gnu packages imagemagick)
+ #:use-module (gnu packages gv)
+ #:use-module (gnu packages boost)
+ #:use-module (gnu packages bison)
+ #:use-module (gnu packages flex)
+ #:use-module (gnu packages gperf)
+ #:use-module (gnu packages perl)
+ #:use-module (gnu packages file))
+
+(define-public a2ps
+ (package
+ (name "a2ps")
+ (version "4.14")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnu/a2ps/a2ps-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "195k78m1h03m961qn7jr120z815iyb93gwi159p1p9348lyqvbpk"))))
+ (build-system gnu-build-system)
+ (inputs
+ `(("psutils" ,psutils)
+ ("groff" ,groff)
+ ("gv" ,gv)
+ ("imagemagick" ,imagemagick)))
+ (native-inputs
+ `(("gperf" ,gperf)
+ ("perl" ,perl)
+ ("file" ,file)))
+ (arguments
+ '(#:phases (alist-replace
+ 'configure
+ (lambda* (#:key #:allow-other-keys #:rest args)
+ (let ((configure (assoc-ref %standard-phases 'configure)))
+ (substitute* "configure"
+ (("/usr/bin/file") (which "file")))
+ (apply configure args)))
+ (alist-cons-before
+ 'build 'patch-scripts
+ (lambda _
+ (substitute*
+ '("afm/make_fonts_map.sh"
+ "tests/defs"
+ "tests/backup.tst"
+ "tests/styles.tst")
+ (("/bin/rm") (which "rm"))))
+ (alist-cons-before
+ 'check 'patch-test-files
+ ;; Alternatively, we could unpatch the shebangs in tstfiles
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((perl (assoc-ref inputs "perl")))
+ (substitute* '("tests/ps-ref/includeres.ps"
+ "tests/gps-ref/includeres.ps")
+ (("/usr/local/bin/perl")
+ (string-append perl "/bin/perl"))))
+ ;; Some of the reference postscript contain a 'version 3'
+ ;; string that in inconsistent with the source text in the
+ ;; tstfiles directory. Erroneous search-and-replace?
+ (substitute* '("tests/ps-ref/InsertBlock.ps"
+ "tests/gps-ref/InsertBlock.ps"
+ "tests/ps-ref/bookie.ps"
+ "tests/gps-ref/bookie.ps")
+ (("version 3") "version 2"))
+ (substitute* '("tests/ps-ref/psmandup.ps"
+ "tests/gps-ref/psmandup.ps")
+ (("#! */bin/sh") (string-append
+ "#!" (which "sh")))))
+ %standard-phases)))))
+ (home-page "http://www.gnu.org/software/a2ps")
+ (synopsis "Any file to PostScript, including pretty-printing")
+ (description
+ "GNU a2ps converts almost anything to a PostScript file, ready for
+printing. It accomplishes this by being able to delegate files to external
+handlers, such as Groff and Gzip. It handles as many steps as is necessary to
+produce a pretty-printed file. It also includes some extra abilities for
+special cases, such as pretty-printing \"--help\" output.")
+ (license gpl3+)))
+
+(define-public trueprint
+ (package
+ (name "trueprint")
+ (version "5.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnu/trueprint/trueprint-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "13rkc0fga10xyf56yy9dnq95zndnfadkhxflnp24skszj21y8jqh"))))
+ (build-system gnu-build-system)
+ (native-inputs `(("file" ,file)))
+ (arguments
+ ;; Must define DIFF_CMD for tests to pass
+ '(#:configure-flags '("CPPFLAGS=-DDIFF_CMD=\\\"diff\\\"")
+ #:phases (alist-replace
+ 'configure
+ (lambda* (#:key #:allow-other-keys #:rest args)
+ (let ((configure (assoc-ref %standard-phases 'configure)))
+ (substitute* "configure"
+ (("/usr/bin/file") (which "file")))
+ (apply configure args)))
+ %standard-phases)))
+ (home-page "http://www.gnu.org/software/trueprint")
+ (synopsis "Pretty-print C sources and other plain text to PostScript")
+ (description
+ "GNU Trueprint translates C source code files as PostScript files.
+In addition to the basic source code output, it can also perform diff-marking,
+indentation counting, function and file indices and more.")
+ (license gpl2)))
+
+(define-public enscript
+ (package
+ (name "enscript")
+ (version "1.6.6")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnu/enscript/enscript-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "1fy0ymvzrrvs889zanxcaxjfcxarm2d3k43c9frmbl1ld7dblmkd"))))
+ (build-system gnu-build-system)
+ (home-page "http://www.gnu.org/software/enscript")
+ (synopsis "Generating PostScript, including pretty-printing")
+ (description
+ "GNU Enscript is a program to convert ASCII text files to PostScript,
+HTML or RTF formats, to be stored in files or sent immediately to a printer.
+It also includes the capability to perform syntax highlighting for several
+different programming languages.")
+ (license gpl3+)))
+
+(define-public source-highlight
+ (package
+ (name "source-highlight")
+ (version "3.1.7")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnu/src-highlite/source-highlight-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "1s49ld8cnpzhhwq0r7s0sfm3cg3nhhm0wla27lwraifrrl3y1cp1"))
+ (patches
+ (list (search-patch
+ ;; Patch submitted as Savannah item #41786
+ "source-highlight-regexrange-test.patch")))))
+ (build-system gnu-build-system)
+ ;; The ctags that comes with emacs does not support the --excmd options,
+ ;; so can't be used
+ (inputs
+ `(("boost" ,boost-1.54)))
+ (native-inputs
+ `(("bison" ,bison)
+ ("flex" ,flex)
+ ("file" ,file)))
+ (arguments
+ `(#:configure-flags
+ (list (string-append "--with-boost="
+ (assoc-ref %build-inputs "boost")))
+ #:parallel-tests? #f ;There appear to be race conditions
+ #:phases (alist-replace
+ 'configure
+ (lambda* (#:key #:allow-other-keys #:rest args)
+ (let ((configure (assoc-ref %standard-phases 'configure)))
+ (substitute* "configure"
+ (("/usr/bin/file") (which "file")))
+ (apply configure args)))
+ (alist-cons-before
+ 'check 'patch-test-files
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; Unpatch shebangs in test input so that source-highlight
+ ;; is still able to infer input language
+ (substitute* '("tests/test.sh"
+ "tests/test2.sh"
+ "tests/test.tcl")
+ (((string-append "#! *" (which "sh"))) "#!/bin/sh"))
+ ;; Initial patching unrecoverably removes whitespace, so
+ ;; remove it also in the comparison output.
+ (substitute* '("tests/test.sh.html"
+ "tests/test2.sh.html"
+ "tests/test.tcl.html")
+ (("#! */bin/sh") "#!/bin/sh")))
+ %standard-phases))))
+ (home-page "http://www.gnu.org/software/src-highlite")
+ (synopsis "Produce a document with syntax highlighting from a source file")
+ (description
+ "GNU source-highlight reads in a source code file and produces an output
+file in which the keywords are highlighted in different colors to designate
+their syntactic role. It supports over 150 different languages and it can
+output to 8 different formats, including HTML, LaTeX and ODF. It can also
+output to ANSI color escape sequences, so that highlighted source code can be
+seen in a terminal.")
+ (license gpl3+)))
--
1.7.9.5
[-- Attachment #3: Type: text/plain, Size: 12 bytes --]
--
`~Eric
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] gnu: Add a2ps, trueprint, enscript, and source-highlight
2014-03-06 20:26 [PATCH] gnu: Add a2ps, trueprint, enscript, and source-highlight Eric Bavier
@ 2014-03-06 22:41 ` Ludovic Courtès
2014-03-07 16:16 ` Eric Bavier
2014-03-07 23:31 ` Ludovic Courtès
1 sibling, 1 reply; 4+ messages in thread
From: Ludovic Courtès @ 2014-03-06 22:41 UTC (permalink / raw)
To: Eric Bavier; +Cc: guix-devel
Eric Bavier <ericbavier@gmail.com> skribis:
> From 07bd4032614f61d94bffddd6355702584a680f0f Mon Sep 17 00:00:00 2001
> From: Eric Bavier <bavier@member.fsf.org>
> Date: Thu, 6 Mar 2014 14:16:18 -0600
> Subject: [PATCH] gnu: Add a2ps, trueprint, enscript, and source-highlight
>
> * gnu/packages/pretty-print.scm: New file
> * gnu/packages/patches/source-highlight-regexrange-test.patch: New file
> * gnu-system.am (dist_patch_DATA): Add patch.
> (GNU_SYSTEM_MODULES): Add pretty-print.scm
Looks good to me.
> --- /dev/null
> +++ b/gnu/packages/patches/source-highlight-regexrange-test.patch
> @@ -0,0 +1,11 @@
> +--- a/lib/tests/test_regexranges_main.cpp 2012-04-14 08:58:25.000000000 -0500
> ++++ b/lib/tests/test_regexranges_main.cpp 2014-03-05 23:49:23.520402043 -0600
> +@@ -52,7 +52,7 @@
Could you add one or two lines saying what the patch is about and point
to the upstream commit or discussion?
OK to push with this change.
Thanks!
Ludo’.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] gnu: Add a2ps, trueprint, enscript, and source-highlight
2014-03-06 22:41 ` Ludovic Courtès
@ 2014-03-07 16:16 ` Eric Bavier
0 siblings, 0 replies; 4+ messages in thread
From: Eric Bavier @ 2014-03-07 16:16 UTC (permalink / raw)
To: ludo; +Cc: guix-devel
ludo@gnu.org (Ludovic Courtès) writes:
> Could you add one or two lines saying what the patch is about and point
> to the upstream commit or discussion?
>
> OK to push with this change.
Pushed with an small patch explanation.
Thanks.
--
`~Eric
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] gnu: Add a2ps, trueprint, enscript, and source-highlight
2014-03-06 20:26 [PATCH] gnu: Add a2ps, trueprint, enscript, and source-highlight Eric Bavier
2014-03-06 22:41 ` Ludovic Courtès
@ 2014-03-07 23:31 ` Ludovic Courtès
1 sibling, 0 replies; 4+ messages in thread
From: Ludovic Courtès @ 2014-03-07 23:31 UTC (permalink / raw)
To: Eric Bavier; +Cc: guix-devel
Eric Bavier <ericbavier@gmail.com> skribis:
> +(define-public source-highlight
> + (package
> + (name "source-highlight")
> + (version "3.1.7")
> + (source
> + (origin
> + (method url-fetch)
> + (uri (string-append "mirror://gnu/src-highlite/source-highlight-"
> + version ".tar.gz"))
> + (sha256
> + (base32
> + "1s49ld8cnpzhhwq0r7s0sfm3cg3nhhm0wla27lwraifrrl3y1cp1"))
> + (patches
> + (list (search-patch
> + ;; Patch submitted as Savannah item #41786
> + "source-highlight-regexrange-test.patch")))))
> + (build-system gnu-build-system)
> + ;; The ctags that comes with emacs does not support the --excmd options,
> + ;; so can't be used
> + (inputs
> + `(("boost" ,boost-1.54)))
I just realized that ‘boost-1.54’ is unbound. Is that required, or does
that work with 1.55 (aka. ‘boost’)?
TIA,
Ludo’.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-03-07 23:31 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-03-06 20:26 [PATCH] gnu: Add a2ps, trueprint, enscript, and source-highlight Eric Bavier
2014-03-06 22:41 ` Ludovic Courtès
2014-03-07 16:16 ` Eric Bavier
2014-03-07 23:31 ` Ludovic Courtès
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).