[PATCH 1/2] gnu: Add dillo.

[PATCH 1/2] gnu: Add dillo.

[John Darrington]

* gnu/packages/dillo.scm: New file.
* gnu-system.am: Add it.
---
 gnu-system.am          |  1 +
 gnu/packages/dillo.scm | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+)
 create mode 100644 gnu/packages/dillo.scm

diff --git a/gnu-system.am b/gnu-system.am
index 40c566c..1d859bf 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -90,6 +90,7 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/dejagnu.scm			\
   gnu/packages/dico.scm				\
   gnu/packages/dictionaries.scm			\
+  gnu/packages/dillo.scm			\
   gnu/packages/disk.scm				\
   gnu/packages/djvu.scm				\
   gnu/packages/dns.scm				\
diff --git a/gnu/packages/dillo.scm b/gnu/packages/dillo.scm
new file mode 100644
index 0000000..14e6f14
--- /dev/null
+++ b/gnu/packages/dillo.scm
@@ -0,0 +1,56 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright 2016 John Darrington <jmd@gnu.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 dillo)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (gnu packages fltk)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages image)
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages base)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu))
+
+(define-public dillo
+  (package
+    (name "dillo")
+    (version "3.0.5")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "http://www.dillo.org/download/dillo-"
+                          version ".tar.bz2"))
+      (sha256
+       (base32 "12ql8n1lypv3k5zqgwjxlw1md90ixz3ag6j1gghfnhjq3inf26yv"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("fltk" ,fltk)
+       ("libx11" ,libx11)
+       ("libxfixes" ,libxfixes)
+       ("libxext" ,libxext)
+       ("libjpeg" ,libjpeg)
+       ("libpng" ,libpng)
+       ("zlib" ,zlib)))
+    (native-inputs
+     `(("which" ,which)))
+    (home-page "http://www.dillo.org/")
+    (synopsis "Lightweight graphical web browser")
+    (description "Dillo is a multi-platform, lightweight graphical web browser 
+with a small footprint.") 
+    (license license:gpl3+)))
-- 
2.1.4

Re: [PATCH 1/2] gnu: Add dillo.

[Kei Yamashita]

On Sat, 23 Apr 2016 20:10:01 +0200
John Darrington <jmd@gnu.org> wrote:

> * gnu/packages/dillo.scm: New file.
> * gnu-system.am: Add it.
> ---
>  gnu-system.am          |  1 +
>  gnu/packages/dillo.scm | 56
> ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed,
> 57 insertions(+) create mode 100644 gnu/packages/dillo.scm
> 
> diff --git a/gnu-system.am b/gnu-system.am
> index 40c566c..1d859bf 100644
> --- a/gnu-system.am
> +++ b/gnu-system.am
> @@ -90,6 +90,7 @@ GNU_SYSTEM_MODULES =
> \ gnu/packages/dejagnu.scm			\
>    gnu/packages/dico.scm				\
>    gnu/packages/dictionaries.scm			\
> +  gnu/packages/dillo.scm			\
>    gnu/packages/disk.scm				\
>    gnu/packages/djvu.scm				\
>    gnu/packages/dns.scm				\
> diff --git a/gnu/packages/dillo.scm b/gnu/packages/dillo.scm
> new file mode 100644
> index 0000000..14e6f14
> --- /dev/null
> +++ b/gnu/packages/dillo.scm
> @@ -0,0 +1,56 @@
> +;;; GNU Guix --- Functional package management for GNU
> +;;; Copyright 2016 John Darrington <jmd@gnu.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 dillo)
> +  #:use-module ((guix licenses) #:prefix license:)
> +  #:use-module (gnu packages fltk)
> +  #:use-module (gnu packages compression)
> +  #:use-module (gnu packages image)
> +  #:use-module (gnu packages xorg)
> +  #:use-module (gnu packages base)
> +  #:use-module (guix packages)
> +  #:use-module (guix download)
> +  #:use-module (guix build-system gnu))
> +
> +(define-public dillo
> +  (package
> +    (name "dillo")
> +    (version "3.0.5")
> +    (source
> +     (origin
> +      (method url-fetch)
> +      (uri (string-append "http://www.dillo.org/download/dillo-"
> +                          version ".tar.bz2"))
> +      (sha256
> +       (base32
> "12ql8n1lypv3k5zqgwjxlw1md90ixz3ag6j1gghfnhjq3inf26yv"))))
> +    (build-system gnu-build-system)
> +    (inputs
> +     `(("fltk" ,fltk)
> +       ("libx11" ,libx11)
> +       ("libxfixes" ,libxfixes)
> +       ("libxext" ,libxext)
> +       ("libjpeg" ,libjpeg)
> +       ("libpng" ,libpng)
> +       ("zlib" ,zlib)))
> +    (native-inputs
> +     `(("which" ,which)))
> +    (home-page "http://www.dillo.org/")
> +    (synopsis "Lightweight graphical web browser")
> +    (description "Dillo is a multi-platform, lightweight graphical
> web browser +with a small footprint.") 
> +    (license license:gpl3+)))

I'm a bit confused, as I've already submitted and added this to the
tree. Are you working with a slightly older copy of the Guix tree?

Re: [PATCH 1/2] gnu: Add dillo.

[Leo Famulari]

On Sat, Apr 23, 2016 at 07:16:40PM -0400, Kei Yamashita wrote:
> On Sat, 23 Apr 2016 20:10:01 +0200
> John Darrington <jmd@gnu.org> wrote:
> 
> > * gnu/packages/dillo.scm: New file.
> > * gnu-system.am: Add it.

> I'm a bit confused, as I've already submitted and added this to the
> tree. Are you working with a slightly older copy of the Guix tree?

Indeed, I applied Kei's patch as c21a25627.

Re: [PATCH 1/2] gnu: Add dillo.

[John Darrington]

On Sat, Apr 23, 2016 at 07:16:40PM -0400, Kei Yamashita wrote:
> 
> . Are you working with a slightly older copy of the Guix tree?

Indeed I was.

Next time I should git pull before I decide that a something is absent from Guix.

Thanks for pointing it out.

J'