libextractor enhancements up for review

libextractor enhancements up for review

[ng0]

[PATCH 1/5] gnu: Add libmp4v2.

This package is pulled from code.google.com and I am trying to contact upstream to check where the new canonical upstream location is.

[PATCH 2/5] gnu: Add tidy-html.
[PATCH 3/5] gnu: Add libsmf.

Those three above might need some further review, this is just to send in for a review before final descriptions, etc.

[PATCH 4/5] gnu: libextractor: Add dependencies.

Add the 3 new packages + bzip2 to the dependencies. For tidy (tidy-html) I'm not sure wether it is picked up, but libsmf and libmp4v2 are detected.
Our rpm package has problems, even adding it to configure will not make libextractor pick the include/rpm/rpm* files up.

[PATCH 5/5] gnu: libextractor: Move .a files to output "static".

Save about ~397 KiB, which compared to the size of libextractor isn't that small.

[PATCH 1/5] gnu: Add libmp4v2.

[ng0]

* gnu/packages/video.scm (libmp4v2): New variable.
---
 gnu/packages/video.scm | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 76b80b334..371031b03 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -11,7 +11,7 @@
 ;;; Copyright © 2016 Kei Kebreau <kei@openmailbox.org>
 ;;; Copyright © 2016 Dmitry Nikolaev <cameltheman@gmail.com>
 ;;; Copyright © 2016 Andy Patterson <ajpatter@uwaterloo.ca>
-;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
+;;; Copyright © 2016 ng0 <ng0@libertad.pw>
 ;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;
@@ -57,6 +57,7 @@
   #:use-module (gnu packages compression)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages databases)
+  #:use-module (gnu packages dejagnu)
   #:use-module (gnu packages elf)
   #:use-module (gnu packages flex)
   #:use-module (gnu packages fontutils)
@@ -75,6 +76,7 @@
   #:use-module (gnu packages linux)
   #:use-module (gnu packages lua)
   #:use-module (gnu packages m4)
+  #:use-module (gnu packages man)
   #:use-module (gnu packages mp3)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages ocr)
@@ -1859,3 +1861,48 @@ of modern, widely supported codecs.")
     (description
      "Openh264 is a library which can decode H264 video streams.")
     (license license:bsd-2)))
+
+(define-public libmp4v2
+  (package
+    (name "libmp4v2")
+    (version "2.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://storage.googleapis.com/google-code-archive-downloads/v2/"
+                           "code.google.com/mp4v2/mp4v2-" version ".tar.bz2"))
+       (file-name (string-append name "-" version ".tar.bz2"))
+       (sha256
+        (base32
+         "0f438bimimsvxjbdp4vsr8hjw2nwggmhaxgcw07g2z361fkbj683"))))
+    (build-system gnu-build-system)
+    (outputs '("out"
+               "static")) ; 3.7MiB .a file
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'install 'move-static-libraries
+           (lambda* (#:key outputs #:allow-other-keys)
+             ;; Move static libraries to the "static" output.
+             (let* ((out    (assoc-ref outputs "out"))
+                    (lib    (string-append out "/lib"))
+                    (static (assoc-ref outputs "static"))
+                    (slib   (string-append static "/lib")))
+               (mkdir-p slib)
+               (for-each (lambda (file)
+                           (install-file file slib)
+                           (delete-file file))
+                         (find-files lib "\\.a$"))
+               #t))))))
+    (native-inputs
+     `(("help2man" ,help2man)
+       ("dejagnu" ,dejagnu)))
+    (home-page "https://code.google.com/archive/p/mp4v2/")
+    (synopsis "libmp4v2 provides an API to create and modify mp4 files")
+    (description
+     "The MP4v2 library provides an API to create and modify mp4 files as defined by
+ISO-IEC:14496-1:2001 MPEG-4 Systems.  This file format is derived from Apple's QuickTime
+file format that has been used as a multimedia file format in a variety of platforms and
+applications.  It is a very powerful and extensible format that can accommodate
+practically any type of media.")
+    (license license:mpl1.1)))
-- 
2.11.0

[PATCH 2/5] gnu: Add tidy-html.

[ng0]

* gnu/packages/web.scm (tidy-html): New variable.
---
 gnu/packages/web.scm | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 50 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 184869200..f28944c75 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -13,7 +13,7 @@
 ;;; Copyright © 2016 Rene Saavedra <rennes@openmailbox.org>
 ;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
 ;;; Copyright © 2016 Clément Lassieur <clement@lassieur.org>
-;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
+;;; Copyright © 2016 ng0 <ng0@libertad.pw>
 ;;; Copyright © 2016 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2016 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;;
@@ -3938,3 +3938,52 @@ useful for users behind restrictive firewalls.  As long as Web traffic is
 allowed, even through a HTTP-only proxy, httptunnel can be combined with other
 tools like SSH (Secure Shell) to reach the outside world.")
     (license l:gpl2+)))
+
+(define-public tidy-html
+  (package
+    (name "tidy-html")
+    (version "5.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/htacg/tidy-html5/archive/"
+                           version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0kbwzh15dlapp3s3vff2qgz0yfcf8hwsnx5q4igwa6pimhak8lw0"))))
+    (build-system cmake-build-system)
+    (outputs '("out"
+               "static")) ; 1.0MiB of .a files
+    (arguments
+     `(#:tests? #f ; No tests available
+       #:configure-flags (list "-DCMAKE_BUILD_TYPE=Release")
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'install 'move-static-libraries
+           (lambda* (#:key outputs #:allow-other-keys)
+             ;; Move static libraries to the "static" output.
+             (let* ((out    (assoc-ref outputs "out"))
+                    (lib    (string-append out "/lib"))
+                    (static (assoc-ref outputs "static"))
+                    (slib   (string-append static "/lib")))
+               (mkdir-p slib)
+               (for-each (lambda (file)
+                           (install-file file slib)
+                           (delete-file file))
+                         (find-files lib "\\.a$"))
+               #t))))))
+    (native-inputs
+     `(("libxslt" ,libxslt)))
+    (home-page "http://www.html-tidy.org/")
+    (synopsis "HTML Tidy with HTML5 support")
+    (description
+     "Tidy is a console application for Mac OS X, Linux, Windows,
+UNIX, and more. It corrects and cleans up HTML and XML documents by
+fixing markup errors and upgrading legacy code to modern standards.
+
+libtidy is a C static and dynamic library that developers can integrate
+into their applications in order to bring all of Tidy’s power to your
+favorite tools. libtidy is used today in desktop applications,
+web servers, and more.")
+    (license l:bsd-3)))
-- 
2.11.0

[PATCH 3/5] gnu: Add libsmf.

[ng0]

* gnu/packages/music.scm (libsmf): New variable.
---
 gnu/packages/music.scm | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 079a07586..bba196eba 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -8,6 +8,7 @@
 ;;; Copyright © 2016 Kei Kebreau <kei@openmailbox.org>
 ;;; Copyright © 2016 John J. Foerch <jjfoerch@earthlink.net>
 ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
+;;; Copyright © 2016 ng0 <ng0@libertad.pw>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2744,3 +2745,51 @@ collections and wantlists, inventory, and orders.")
 
 (define-public python2-discogs-client
   (package-with-python2 python-discogs-client))
+
+(define-public libsmf
+  (package
+    (name "libsmf")
+    (version "1.3")
+    (source
+     (origin
+       (method url-fetch)
+       ;; SF download page says development moved, but the link it points to
+       ;; is gone (https://github.com/nilsgey/libsmf).  Someone else adopted
+       ;; it but made no release so far (https://github.com/stump/libsmf).
+       (uri (string-append "mirror://sourceforge/libsmf/libsmf/"
+                           version "/libsmf-" version ".tar.gz"))
+       (sha256
+        (base32
+         "16c0n40h0r56gzbh5ypxa4dwp296dan3jminml2qkb4lvqarym6k"))))
+    (build-system gnu-build-system)
+    (outputs '("out"
+               "static")) ; 88KiB of .a files
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'install 'move-static-libraries
+           (lambda* (#:key outputs #:allow-other-keys)
+             ;; Move static libraries to the "static" output.
+             (let* ((out    (assoc-ref outputs "out"))
+                    (lib    (string-append out "/lib"))
+                    (static (assoc-ref outputs "static"))
+                    (slib   (string-append static "/lib")))
+               (mkdir-p slib)
+               (for-each (lambda (file)
+                           (install-file file slib)
+                           (delete-file file))
+                         (find-files lib "\\.a$"))
+               #t))))))
+    (inputs
+     `(("readline" ,readline)
+       ("glib" ,glib)))
+    (native-inputs
+     `(("doxygen" ,doxygen)
+       ("pkg-config" ,pkg-config)))
+    (home-page "http://libsmf.sourceforge.net/")
+    (synopsis "Standard MIDI File format library")
+    (description
+     "LibSMF is a C library for handling SMF (\"*.mid\") files.  It transparently handles
+conversions between time and pulses, tempo map handling and more.  The only dependencies
+are a C compiler and glib.  Full API documentation and examples are included.")
+    (license license:bsd-2)))
-- 
2.11.0

[PATCH 4/5] gnu: libextractor: Add dependencies.

[ng0]

* gnu/packages/gnunet.scm (libextractor): Add dependencies:
tidy-html, libmp4v2, libsmf, bzip2.
[arguments](configure-flags): Add "--with-libtidy".
* Adjust the FIXME comment section accordingly.
---
 gnu/packages/gnunet.scm | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
index 5d1baa834..35c751bdf 100644
--- a/gnu/packages/gnunet.scm
+++ b/gnu/packages/gnunet.scm
@@ -5,7 +5,7 @@
 ;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2016 Mark H Weaver <mhw@netris.org>
-;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
+;;; Copyright © 2016 ng0 <ng0@libertad.pw>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -44,7 +44,9 @@
   #:use-module (gnu packages libunistring)
   #:use-module (gnu packages maths)
   #:use-module (gnu packages multiprecision)
+  #:use-module (gnu packages music)
   #:use-module (gnu packages ncurses)
+  #:use-module (gnu packages package-management)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pulseaudio)
@@ -87,13 +89,11 @@
    ;; The following dependencies are all optional, but should be
    ;; available for maximum coverage:
    ;; * libmagic (file)
-   ;; * libmp4v2        ; package it
-   ;; * librpm          ; package it
-   ;; * libsmf          ; package it
-   ;; * libtidy         ; package it
+   ;; * librpm (rpm)    ; investigate failure
    ;; * libgif (giflib) ; investigate failure
    (inputs
     `(("exiv2" ,exiv2)
+      ("bzip2" ,bzip2)
       ("flac" ,flac)
       ("ffmpeg" ,ffmpeg)
       ("file" ,file)                           ;libmagic, for the MIME plug-in
@@ -106,6 +106,9 @@
       ("libjpeg" ,libjpeg)
       ("libltdl" ,libltdl)
       ("libmpeg2" ,libmpeg2)
+      ("libmp4v2" ,libmp4v2)
+      ("libsmf" ,libsmf)
+      ("tidy-html" ,tidy-html)
       ("libogg" ,libogg)
       ("libtiff" ,libtiff)
       ("libvorbis" ,libvorbis)
@@ -115,7 +118,9 @@
    (arguments
     `(#:configure-flags
       (list (string-append "--with-ltdl="
-                           (assoc-ref %build-inputs "libltdl")))
+                           (assoc-ref %build-inputs "libltdl"))
+            (string-append "--with-tidy="
+                           (assoc-ref %build-inputs "tidy-html")))
       #:parallel-tests? #f))
    (synopsis "Library to extract meta-data from media files")
    (description
-- 
2.11.0

[PATCH 5/5] gnu: libextractor: Move .a files to output "static".

[ng0]

* gnu/packages/gnunet.scm (libextractor): Move .a files to "static" output.
[arguments](phases): New phase for moving .a files to output "static".
---
 gnu/packages/gnunet.scm | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
index 35c751bdf..42df9801f 100644
--- a/gnu/packages/gnunet.scm
+++ b/gnu/packages/gnunet.scm
@@ -115,13 +115,30 @@
       ("zlib" ,zlib)))
    (native-inputs
     `(("pkg-config" ,pkg-config)))
+   (outputs '("out"
+              "static")) ; 396 KiB .a files
    (arguments
     `(#:configure-flags
       (list (string-append "--with-ltdl="
                            (assoc-ref %build-inputs "libltdl"))
             (string-append "--with-tidy="
                            (assoc-ref %build-inputs "tidy-html")))
-      #:parallel-tests? #f))
+      #:parallel-tests? #f
+      #:phases
+      (modify-phases %standard-phases
+        (add-after 'install 'move-static-libraries
+          (lambda* (#:key outputs #:allow-other-keys)
+            ;; Move static libraries to the "static" output.
+            (let* ((out    (assoc-ref outputs "out"))
+                   (lib    (string-append out "/lib"))
+                   (static (assoc-ref outputs "static"))
+                   (slib   (string-append static "/lib")))
+              (mkdir-p slib)
+              (for-each (lambda (file)
+                          (install-file file slib)
+                          (delete-file file))
+                        (find-files lib "\\.a$"))
+              #t))))))
    (synopsis "Library to extract meta-data from media files")
    (description
     "GNU libextractor is a library for extracting metadata from files.  It
-- 
2.11.0

[PATCH 2/5] gnu: Add tidy-html.

[contact.ng0]

From: ng0 <ng0@libertad.pw>

* gnu/packages/web.scm (tidy-html): New variable.
---
 gnu/packages/web.scm | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 50 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 67b9797bb..8a29eead1 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -13,7 +13,7 @@
 ;;; Copyright © 2016 Rene Saavedra <rennes@openmailbox.org>
 ;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
 ;;; Copyright © 2016 Clément Lassieur <clement@lassieur.org>
-;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
+;;; Copyright © 2016, 2017 ng0 <contact.ng0@cryptolab.net>
 ;;; Copyright © 2016 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2016 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2016 Bake Timmons <b3timmons@speedymail.org>
@@ -3995,3 +3995,52 @@ programs' code.  Its architecture is optimized for security, portability, and
 scalability (including load-balancing), making it suitable for large
 deployments.")
   (license l:gpl2+)))
+
+(define-public tidy-html
+  (package
+    (name "tidy-html")
+    (version "5.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/htacg/tidy-html5/archive/"
+                           version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0kbwzh15dlapp3s3vff2qgz0yfcf8hwsnx5q4igwa6pimhak8lw0"))))
+    (build-system cmake-build-system)
+    (outputs '("out"
+               "static")) ; 1.0MiB of .a files
+    (arguments
+     `(#:tests? #f ; No tests available
+       #:configure-flags (list "-DCMAKE_BUILD_TYPE=Release")
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'install 'move-static-libraries
+           (lambda* (#:key outputs #:allow-other-keys)
+             ;; Move static libraries to the "static" output.
+             (let* ((out    (assoc-ref outputs "out"))
+                    (lib    (string-append out "/lib"))
+                    (static (assoc-ref outputs "static"))
+                    (slib   (string-append static "/lib")))
+               (mkdir-p slib)
+               (for-each (lambda (file)
+                           (install-file file slib)
+                           (delete-file file))
+                         (find-files lib "\\.a$"))
+               #t))))))
+    (native-inputs
+     `(("libxslt" ,libxslt)))
+    (home-page "http://www.html-tidy.org/")
+    (synopsis "HTML Tidy with HTML5 support")
+    (description
+     "Tidy is a console application for Mac OS X, Linux, Windows,
+UNIX, and more. It corrects and cleans up HTML and XML documents by
+fixing markup errors and upgrading legacy code to modern standards.
+
+libtidy is a C static and dynamic library that developers can integrate
+into their applications in order to bring all of Tidy’s power to your
+favorite tools. libtidy is used today in desktop applications,
+web servers, and more.")
+    (license l:bsd-3)))
-- 
2.11.0

Re: [PATCH 2/5] gnu: Add tidy-html.

[Kei Kebreau]

[-- Attachment #1: Type: text/plain, Size: 3412 bytes --]

contact.ng0@cryptolab.net writes:

> From: ng0 <ng0@libertad.pw>
>
> * gnu/packages/web.scm (tidy-html): New variable.
> ---
>  gnu/packages/web.scm | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
>  1 file changed, 50 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
> index 67b9797bb..8a29eead1 100644
> --- a/gnu/packages/web.scm
> +++ b/gnu/packages/web.scm
> @@ -13,7 +13,7 @@
>  ;;; Copyright © 2016 Rene Saavedra <rennes@openmailbox.org>
>  ;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
>  ;;; Copyright © 2016 Clément Lassieur <clement@lassieur.org>
> -;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
> +;;; Copyright © 2016, 2017 ng0 <contact.ng0@cryptolab.net>
>  ;;; Copyright © 2016 Arun Isaac <arunisaac@systemreboot.net>
>  ;;; Copyright © 2016 Tobias Geerinckx-Rice <me@tobias.gr>
>  ;;; Copyright © 2016 Bake Timmons <b3timmons@speedymail.org>
> @@ -3995,3 +3995,52 @@ programs' code.  Its architecture is optimized for security, portability, and
>  scalability (including load-balancing), making it suitable for large
>  deployments.")
>    (license l:gpl2+)))
> +
> +(define-public tidy-html
> +  (package
> +    (name "tidy-html")
> +    (version "5.2.0")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append "https://github.com/htacg/tidy-html5/archive/"
> +                           version ".tar.gz"))
> +       (file-name (string-append name "-" version ".tar.gz"))
> +       (sha256
> +        (base32
> +         "0kbwzh15dlapp3s3vff2qgz0yfcf8hwsnx5q4igwa6pimhak8lw0"))))
> +    (build-system cmake-build-system)
> +    (outputs '("out"
> +               "static")) ; 1.0MiB of .a files
> +    (arguments
> +     `(#:tests? #f ; No tests available
> +       #:configure-flags (list "-DCMAKE_BUILD_TYPE=Release")
> +       #:phases
> +       (modify-phases %standard-phases
> +         (add-after 'install 'move-static-libraries
> +           (lambda* (#:key outputs #:allow-other-keys)
> +             ;; Move static libraries to the "static" output.
> +             (let* ((out    (assoc-ref outputs "out"))
> +                    (lib    (string-append out "/lib"))
> +                    (static (assoc-ref outputs "static"))
> +                    (slib   (string-append static "/lib")))
> +               (mkdir-p slib)
> +               (for-each (lambda (file)
> +                           (install-file file slib)
> +                           (delete-file file))
> +                         (find-files lib "\\.a$"))
> +               #t))))))
> +    (native-inputs
> +     `(("libxslt" ,libxslt)))
> +    (home-page "http://www.html-tidy.org/")
> +    (synopsis "HTML Tidy with HTML5 support")
> +    (description
> +     "Tidy is a console application for Mac OS X, Linux, Windows,
> +UNIX, and more. It corrects and cleans up HTML and XML documents by
> +fixing markup errors and upgrading legacy code to modern standards.
> +
> +libtidy is a C static and dynamic library that developers can integrate
> +into their applications in order to bring all of Tidy’s power to your
> +favorite tools. libtidy is used today in desktop applications,
> +web servers, and more.")

Sentences in the description should be followed by two spaces.

> +    (license l:bsd-3)))

The rest LGTM.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

Re: [PATCH 2/5] gnu: Add tidy-html.

[Kei Kebreau]

[-- Attachment #1: Type: text/plain, Size: 3412 bytes --]

contact.ng0@cryptolab.net writes:

> From: ng0 <ng0@libertad.pw>
>
> * gnu/packages/web.scm (tidy-html): New variable.
> ---
>  gnu/packages/web.scm | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
>  1 file changed, 50 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
> index 67b9797bb..8a29eead1 100644
> --- a/gnu/packages/web.scm
> +++ b/gnu/packages/web.scm
> @@ -13,7 +13,7 @@
>  ;;; Copyright © 2016 Rene Saavedra <rennes@openmailbox.org>
>  ;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
>  ;;; Copyright © 2016 Clément Lassieur <clement@lassieur.org>
> -;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
> +;;; Copyright © 2016, 2017 ng0 <contact.ng0@cryptolab.net>
>  ;;; Copyright © 2016 Arun Isaac <arunisaac@systemreboot.net>
>  ;;; Copyright © 2016 Tobias Geerinckx-Rice <me@tobias.gr>
>  ;;; Copyright © 2016 Bake Timmons <b3timmons@speedymail.org>
> @@ -3995,3 +3995,52 @@ programs' code.  Its architecture is optimized for security, portability, and
>  scalability (including load-balancing), making it suitable for large
>  deployments.")
>    (license l:gpl2+)))
> +
> +(define-public tidy-html
> +  (package
> +    (name "tidy-html")
> +    (version "5.2.0")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append "https://github.com/htacg/tidy-html5/archive/"
> +                           version ".tar.gz"))
> +       (file-name (string-append name "-" version ".tar.gz"))
> +       (sha256
> +        (base32
> +         "0kbwzh15dlapp3s3vff2qgz0yfcf8hwsnx5q4igwa6pimhak8lw0"))))
> +    (build-system cmake-build-system)
> +    (outputs '("out"
> +               "static")) ; 1.0MiB of .a files
> +    (arguments
> +     `(#:tests? #f ; No tests available
> +       #:configure-flags (list "-DCMAKE_BUILD_TYPE=Release")
> +       #:phases
> +       (modify-phases %standard-phases
> +         (add-after 'install 'move-static-libraries
> +           (lambda* (#:key outputs #:allow-other-keys)
> +             ;; Move static libraries to the "static" output.
> +             (let* ((out    (assoc-ref outputs "out"))
> +                    (lib    (string-append out "/lib"))
> +                    (static (assoc-ref outputs "static"))
> +                    (slib   (string-append static "/lib")))
> +               (mkdir-p slib)
> +               (for-each (lambda (file)
> +                           (install-file file slib)
> +                           (delete-file file))
> +                         (find-files lib "\\.a$"))
> +               #t))))))
> +    (native-inputs
> +     `(("libxslt" ,libxslt)))
> +    (home-page "http://www.html-tidy.org/")
> +    (synopsis "HTML Tidy with HTML5 support")
> +    (description
> +     "Tidy is a console application for Mac OS X, Linux, Windows,
> +UNIX, and more. It corrects and cleans up HTML and XML documents by
> +fixing markup errors and upgrading legacy code to modern standards.
> +
> +libtidy is a C static and dynamic library that developers can integrate
> +into their applications in order to bring all of Tidy’s power to your
> +favorite tools. libtidy is used today in desktop applications,
> +web servers, and more.")

Sentences in the description should be followed by two spaces.

> +    (license l:bsd-3)))

The rest LGTM.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

Re: [PATCH 2/5] gnu: Add tidy-html.

[Kei Kebreau]

[-- Attachment #1: Type: text/plain, Size: 3412 bytes --]

contact.ng0@cryptolab.net writes:

> From: ng0 <ng0@libertad.pw>
>
> * gnu/packages/web.scm (tidy-html): New variable.
> ---
>  gnu/packages/web.scm | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
>  1 file changed, 50 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
> index 67b9797bb..8a29eead1 100644
> --- a/gnu/packages/web.scm
> +++ b/gnu/packages/web.scm
> @@ -13,7 +13,7 @@
>  ;;; Copyright © 2016 Rene Saavedra <rennes@openmailbox.org>
>  ;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
>  ;;; Copyright © 2016 Clément Lassieur <clement@lassieur.org>
> -;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
> +;;; Copyright © 2016, 2017 ng0 <contact.ng0@cryptolab.net>
>  ;;; Copyright © 2016 Arun Isaac <arunisaac@systemreboot.net>
>  ;;; Copyright © 2016 Tobias Geerinckx-Rice <me@tobias.gr>
>  ;;; Copyright © 2016 Bake Timmons <b3timmons@speedymail.org>
> @@ -3995,3 +3995,52 @@ programs' code.  Its architecture is optimized for security, portability, and
>  scalability (including load-balancing), making it suitable for large
>  deployments.")
>    (license l:gpl2+)))
> +
> +(define-public tidy-html
> +  (package
> +    (name "tidy-html")
> +    (version "5.2.0")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append "https://github.com/htacg/tidy-html5/archive/"
> +                           version ".tar.gz"))
> +       (file-name (string-append name "-" version ".tar.gz"))
> +       (sha256
> +        (base32
> +         "0kbwzh15dlapp3s3vff2qgz0yfcf8hwsnx5q4igwa6pimhak8lw0"))))
> +    (build-system cmake-build-system)
> +    (outputs '("out"
> +               "static")) ; 1.0MiB of .a files
> +    (arguments
> +     `(#:tests? #f ; No tests available
> +       #:configure-flags (list "-DCMAKE_BUILD_TYPE=Release")
> +       #:phases
> +       (modify-phases %standard-phases
> +         (add-after 'install 'move-static-libraries
> +           (lambda* (#:key outputs #:allow-other-keys)
> +             ;; Move static libraries to the "static" output.
> +             (let* ((out    (assoc-ref outputs "out"))
> +                    (lib    (string-append out "/lib"))
> +                    (static (assoc-ref outputs "static"))
> +                    (slib   (string-append static "/lib")))
> +               (mkdir-p slib)
> +               (for-each (lambda (file)
> +                           (install-file file slib)
> +                           (delete-file file))
> +                         (find-files lib "\\.a$"))
> +               #t))))))
> +    (native-inputs
> +     `(("libxslt" ,libxslt)))
> +    (home-page "http://www.html-tidy.org/")
> +    (synopsis "HTML Tidy with HTML5 support")
> +    (description
> +     "Tidy is a console application for Mac OS X, Linux, Windows,
> +UNIX, and more. It corrects and cleans up HTML and XML documents by
> +fixing markup errors and upgrading legacy code to modern standards.
> +
> +libtidy is a C static and dynamic library that developers can integrate
> +into their applications in order to bring all of Tidy’s power to your
> +favorite tools. libtidy is used today in desktop applications,
> +web servers, and more.")

Sentences in the description should be followed by two spaces.

> +    (license l:bsd-3)))

The rest LGTM.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

Re: [PATCH 2/5] gnu: Add tidy-html.

[Kei Kebreau]

[-- Attachment #1: Type: text/plain, Size: 3412 bytes --]

contact.ng0@cryptolab.net writes:

> From: ng0 <ng0@libertad.pw>
>
> * gnu/packages/web.scm (tidy-html): New variable.
> ---
>  gnu/packages/web.scm | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
>  1 file changed, 50 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
> index 67b9797bb..8a29eead1 100644
> --- a/gnu/packages/web.scm
> +++ b/gnu/packages/web.scm
> @@ -13,7 +13,7 @@
>  ;;; Copyright © 2016 Rene Saavedra <rennes@openmailbox.org>
>  ;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
>  ;;; Copyright © 2016 Clément Lassieur <clement@lassieur.org>
> -;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
> +;;; Copyright © 2016, 2017 ng0 <contact.ng0@cryptolab.net>
>  ;;; Copyright © 2016 Arun Isaac <arunisaac@systemreboot.net>
>  ;;; Copyright © 2016 Tobias Geerinckx-Rice <me@tobias.gr>
>  ;;; Copyright © 2016 Bake Timmons <b3timmons@speedymail.org>
> @@ -3995,3 +3995,52 @@ programs' code.  Its architecture is optimized for security, portability, and
>  scalability (including load-balancing), making it suitable for large
>  deployments.")
>    (license l:gpl2+)))
> +
> +(define-public tidy-html
> +  (package
> +    (name "tidy-html")
> +    (version "5.2.0")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append "https://github.com/htacg/tidy-html5/archive/"
> +                           version ".tar.gz"))
> +       (file-name (string-append name "-" version ".tar.gz"))
> +       (sha256
> +        (base32
> +         "0kbwzh15dlapp3s3vff2qgz0yfcf8hwsnx5q4igwa6pimhak8lw0"))))
> +    (build-system cmake-build-system)
> +    (outputs '("out"
> +               "static")) ; 1.0MiB of .a files
> +    (arguments
> +     `(#:tests? #f ; No tests available
> +       #:configure-flags (list "-DCMAKE_BUILD_TYPE=Release")
> +       #:phases
> +       (modify-phases %standard-phases
> +         (add-after 'install 'move-static-libraries
> +           (lambda* (#:key outputs #:allow-other-keys)
> +             ;; Move static libraries to the "static" output.
> +             (let* ((out    (assoc-ref outputs "out"))
> +                    (lib    (string-append out "/lib"))
> +                    (static (assoc-ref outputs "static"))
> +                    (slib   (string-append static "/lib")))
> +               (mkdir-p slib)
> +               (for-each (lambda (file)
> +                           (install-file file slib)
> +                           (delete-file file))
> +                         (find-files lib "\\.a$"))
> +               #t))))))
> +    (native-inputs
> +     `(("libxslt" ,libxslt)))
> +    (home-page "http://www.html-tidy.org/")
> +    (synopsis "HTML Tidy with HTML5 support")
> +    (description
> +     "Tidy is a console application for Mac OS X, Linux, Windows,
> +UNIX, and more. It corrects and cleans up HTML and XML documents by
> +fixing markup errors and upgrading legacy code to modern standards.
> +
> +libtidy is a C static and dynamic library that developers can integrate
> +into their applications in order to bring all of Tidy’s power to your
> +favorite tools. libtidy is used today in desktop applications,
> +web servers, and more.")

Sentences in the description should be followed by two spaces.

> +    (license l:bsd-3)))

The rest LGTM.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

[PATCH 2/5] gnu: Add tidy-html.

[contact.ng0]

From: ng0 <ng0@libertad.pw>

* gnu/packages/web.scm (tidy-html): New variable.
---
 gnu/packages/web.scm | 50 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 8cc80a2c4..4d138b79f 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -13,7 +13,7 @@
 ;;; Copyright © 2016 Rene Saavedra <rennes@openmailbox.org>
 ;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
 ;;; Copyright © 2016 Clément Lassieur <clement@lassieur.org>
-;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
+;;; Copyright © 2016, 2017 ng0 <contact.ng0@cryptolab.net>
 ;;; Copyright © 2016 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2016 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2016 Bake Timmons <b3timmons@speedymail.org>
@@ -4018,3 +4018,51 @@ service for that request.  Requests are made using port numbers as identifiers
 and xinetd usually launches another daemon to handle the request.  It can be
 used to start services with both privileged and non-privileged port numbers.")
     (license (l:fsf-free "file://COPYRIGHT"))))
+
+(define-public tidy-html
+  (package
+    (name "tidy-html")
+    (version "5.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/htacg/tidy-html5/archive/"
+                           version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0kbwzh15dlapp3s3vff2qgz0yfcf8hwsnx5q4igwa6pimhak8lw0"))))
+    (build-system cmake-build-system)
+    (outputs '("out"
+               "static")) ; 1.0MiB of .a files
+    (arguments
+     `(#:tests? #f ; No tests available
+       #:configure-flags (list "-DCMAKE_BUILD_TYPE=Release")
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'install 'move-static-libraries
+           (lambda* (#:key outputs #:allow-other-keys)
+             ;; Move static libraries to the "static" output.
+             (let* ((out    (assoc-ref outputs "out"))
+                    (lib    (string-append out "/lib"))
+                    (static (assoc-ref outputs "static"))
+                    (slib   (string-append static "/lib")))
+               (mkdir-p slib)
+               (for-each (lambda (file)
+                           (install-file file slib)
+                           (delete-file file))
+                         (find-files lib "\\.a$"))
+               #t))))))
+    (native-inputs
+     `(("libxslt" ,libxslt)))
+    (home-page "http://www.html-tidy.org/")
+    (synopsis "HTML Tidy with HTML5 support")
+    (description
+     "Tidy is a console application which corrects and cleans up
+HTML and XML documents by fixing markup errors and upgrading
+legacy code to modern standards.
+
+Tidy also provides @code{libtidy}, a C static and dynamic library that
+developers can integrate into their applications to make use of the
+functions of Tidy.")
+    (license l:bsd-3)))
-- 
2.11.1