[PATCH] gnu: dillo: New module

[PATCH] gnu: dillo: New module

[Kei Yamashita]

I'm not sure what the process is for a new module. Please guide me in
this if something else needs to be done.

[PATCH] gnu: dillo: New module

[Kei Yamashita]

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



Begin forwarded message:

Date: Sun, 17 Apr 2016 00:04:30 -0400
From: Kei Yamashita <kei@openmailbox.org>
To: Leo Famulari <leo@famulari.name>
Subject: Re: [PATCH] gnu: dillo: New module


Indeed I did. :-P

On Sat, 16 Apr 2016 23:25:57 -0400
Leo Famulari <leo@famulari.name> wrote:

> I think you forgot to attach the patch. We all do that once in a
> while ;)
> 
> 
> -------- Original Message --------
> From: Kei Yamashita <kei@openmailbox.org>
> Sent: April 16, 2016 10:53:43 PM EDT
> To: guix-devel@gnu.org
> Subject: [PATCH] gnu: dillo: New module
> 
> I'm not sure what the process is for a new module. Please guide me in
> this if something else needs to be done.
> 
>   


[-- Attachment #2: 0001-gnu-dillo-New-module.patch --]
[-- Type: application/octet-stream, Size: 3106 bytes --]

From d9adc615831e6ac7d6c9cd8891bb89773fbc2760 Mon Sep 17 00:00:00 2001
From: Kei Yamashita <kei@openmailbox.org>
Date: Sat, 16 Apr 2016 22:51:02 -0400
Subject: [PATCH] gnu: dillo: New module

* gnu/packages/dillo.scm: New file
---
 gnu/packages/dillo.scm | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 gnu/packages/dillo.scm

diff --git a/gnu/packages/dillo.scm b/gnu/packages/dillo.scm
new file mode 100644
index 0000000..d674af3
--- /dev/null
+++ b/gnu/packages/dillo.scm
@@ -0,0 +1,63 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2016 Kei Yamashita <kei@openmailbox.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 (guix packages)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages fltk)
+  #:use-module (gnu packages fontutils)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages image)
+  #:use-module (gnu packages tls)
+  #:use-module (gnu packages xorg)
+  #: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/"
+                                  name "-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "12ql8n1lypv3k5zqgwjxlw1md90ixz3ag6j1gghfnhjq3inf26yv"))))
+    (build-system gnu-build-system)
+    (arguments `(#:configure-flags '("--enable-ssl")))
+    (native-inputs `(("pkg-config" ,pkg-config)))
+    (inputs `(("fltk" ,fltk)
+              ("fontconfig" ,fontconfig)
+              ("libjpeg" ,libjpeg)
+              ("libpng" ,libpng)
+              ("libxcursor" ,libxcursor)
+              ("libxft" ,libxft)
+              ("libxi" ,libxi)
+              ("libxinerama" ,libxinerama)
+              ("openssl" ,openssl)
+              ("perl" ,perl)
+              ("zlib" ,zlib)))
+    (synopsis "Very small and fast graphical web browser")
+    (description "Dillo is a minimalistic web browser particularly intended for
+older or slower computers and embedded systems.")
+    (home-page "http://www.dillo.org")
+    (license license:gpl3+)))
-- 
2.7.3

Re: [PATCH] gnu: dillo: New module

[Alex Kost]

Kei Yamashita (2016-04-17 05:53 +0300) wrote:

> I'm not sure what the process is for a new module. Please guide me in
> this if something else needs to be done.

A new file should also be added to "gnu-system.am" file.  See for
example commit a5e2c9a:

http://git.savannah.gnu.org/cgit/guix.git/commit/?id=a5e2c9a9c5afc599b1cd1551eadb2e70fd01bc7a

-- 
Alex

Re: [PATCH] gnu: dillo: New module

[Kei Yamashita]

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

On Sun, 17 Apr 2016 10:57:21 +0300
Alex Kost <alezost@gmail.com> wrote:

> Kei Yamashita (2016-04-17 05:53 +0300) wrote:
> 
> > I'm not sure what the process is for a new module. Please guide me
> > in this if something else needs to be done.  
> 
> A new file should also be added to "gnu-system.am" file.  See for
> example commit a5e2c9a:
> 
> http://git.savannah.gnu.org/cgit/guix.git/commit/?id=a5e2c9a9c5afc599b1cd1551eadb2e70fd01bc7a
> 

Attached is the corrected patch file!

[-- Attachment #2: 0001-gnu-dillo-New-module.patch --]
[-- Type: application/octet-stream, Size: 3854 bytes --]

From 547e8e2e0fcca2268caf240a0a952af273d25261 Mon Sep 17 00:00:00 2001
From: Kei Yamashita <kei@openmailbox.org>
Date: Sun, 17 Apr 2016 10:12:29 -0400
Subject: [PATCH] gnu: dillo: New module

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

diff --git a/gnu-system.am b/gnu-system.am
index cd1c663..9e8fd9d 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -4,6 +4,7 @@
 # Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
 # Copyright © 2013, 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
 # Copyright © 2016 Chris Marusich <cmmarusich@gmail.com>
+# Copyright © 2016 Kei Yamashita <kei@openmailbox.org>
 #
 # This file is part of GNU Guix.
 #
@@ -89,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..d674af3
--- /dev/null
+++ b/gnu/packages/dillo.scm
@@ -0,0 +1,63 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2016 Kei Yamashita <kei@openmailbox.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 (guix packages)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages fltk)
+  #:use-module (gnu packages fontutils)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages image)
+  #:use-module (gnu packages tls)
+  #:use-module (gnu packages xorg)
+  #: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/"
+                                  name "-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "12ql8n1lypv3k5zqgwjxlw1md90ixz3ag6j1gghfnhjq3inf26yv"))))
+    (build-system gnu-build-system)
+    (arguments `(#:configure-flags '("--enable-ssl")))
+    (native-inputs `(("pkg-config" ,pkg-config)))
+    (inputs `(("fltk" ,fltk)
+              ("fontconfig" ,fontconfig)
+              ("libjpeg" ,libjpeg)
+              ("libpng" ,libpng)
+              ("libxcursor" ,libxcursor)
+              ("libxft" ,libxft)
+              ("libxi" ,libxi)
+              ("libxinerama" ,libxinerama)
+              ("openssl" ,openssl)
+              ("perl" ,perl)
+              ("zlib" ,zlib)))
+    (synopsis "Very small and fast graphical web browser")
+    (description "Dillo is a minimalistic web browser particularly intended for
+older or slower computers and embedded systems.")
+    (home-page "http://www.dillo.org")
+    (license license:gpl3+)))
-- 
2.7.3

Re: [PATCH] gnu: dillo: New module

[Leo Famulari]

On Sun, Apr 17, 2016 at 10:14:55AM -0400, Kei Yamashita wrote:
> On Sun, 17 Apr 2016 10:57:21 +0300
> Alex Kost <alezost@gmail.com> wrote:
> 
> > Kei Yamashita (2016-04-17 05:53 +0300) wrote:
> > 
> > > I'm not sure what the process is for a new module. Please guide me
> > > in this if something else needs to be done.  
> > 
> > A new file should also be added to "gnu-system.am" file.  See for
> > example commit a5e2c9a:
> > 
> > http://git.savannah.gnu.org/cgit/guix.git/commit/?id=a5e2c9a9c5afc599b1cd1551eadb2e70fd01bc7a
> > 
> 
> Attached is the corrected patch file!

Looks good, thank you!

I passed --enable-ipv6 to #:configure-flags, and that works. So, I
applied it as c21a25627 with that change.