bug#26374: [PATCH] gnu: Move dillo to web.scm.

bug#26374: [PATCH] gnu: Move dillo to web.scm.

[Kei Kebreau]

* gnu/packages/dillo.scm: Remove file and move dillo...
* gnu/packages/web.scm: ...here.
* gnu/local.mk: Remove reference to removed file.
---
 gnu/local.mk           |  1 -
 gnu/packages/dillo.scm | 63 --------------------------------------------------
 gnu/packages/web.scm   | 35 ++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 64 deletions(-)
 delete mode 100644 gnu/packages/dillo.scm

diff --git a/gnu/local.mk b/gnu/local.mk
index f54ab2a45..8128cd078 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -105,7 +105,6 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/dejagnu.scm			\
   %D%/packages/dico.scm				\
   %D%/packages/dictionaries.scm			\
-  %D%/packages/dillo.scm			\
   %D%/packages/disk.scm				\
   %D%/packages/display-managers.scm		\
   %D%/packages/django.scm			\
diff --git a/gnu/packages/dillo.scm b/gnu/packages/dillo.scm
deleted file mode 100644
index 6e0c4d17a..000000000
--- a/gnu/packages/dillo.scm
+++ /dev/null
@@ -1,63 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2016 Kei Kebreau <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" "--enable-ipv6")))
-    (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+)))
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 7215dcbed..92e262f79 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -17,6 +17,7 @@
 ;;; Copyright © 2016 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2016 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2016 Bake Timmons <b3timmons@speedymail.org>
+;;; Copyright © 2016 Kei Kebreau <kei@openmailbox.org>
 ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -60,6 +61,8 @@
   #:use-module (gnu packages databases)
   #:use-module (gnu packages bison)
   #:use-module (gnu packages flex)
+  #:use-module (gnu packages fltk)
+  #:use-module (gnu packages fontutils)
   #:use-module (gnu packages kerberos)
   #:use-module (gnu packages gd)
   #:use-module (gnu packages gettext)
@@ -82,6 +85,7 @@
   #:use-module (gnu packages qt)
   #:use-module (gnu packages valgrind)
   #:use-module (gnu packages xml)
+  #:use-module (gnu packages xorg)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages texinfo)
@@ -4531,3 +4535,34 @@ exploit attempts.")
     (description "qutebrowser is a keyboard-focused browser with a minimal
 GUI.  It is based on PyQt5 and QtWebKit.")
     (license l:gpl3+)))
+
+(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" "--enable-ipv6")))
+    (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.12.2

bug#26374: [PATCH] gnu: Move dillo to web.scm.

[Marius Bakke]

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

Kei Kebreau <kei@openmailbox.org> writes:

> * gnu/packages/dillo.scm: Remove file and move dillo...
> * gnu/packages/web.scm: ...here.
> * gnu/local.mk: Remove reference to removed file.

I think it would be good to have a "web-browsers.scm" to try and keep
things organized; web.scm is already a kind of "kitchen sink" for
anything web related. What do others think?

There are a few other modules that could be moved into a
web-browsers.scm as well.

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

bug#26374: [PATCH] gnu: Move dillo to web.scm.

[Kei Kebreau]

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

Marius Bakke <mbakke@fastmail.com> writes:

> Kei Kebreau <kei@openmailbox.org> writes:
>
>> * gnu/packages/dillo.scm: Remove file and move dillo...
>> * gnu/packages/web.scm: ...here.
>> * gnu/local.mk: Remove reference to removed file.
>
> I think it would be good to have a "web-browsers.scm" to try and keep
> things organized; web.scm is already a kind of "kitchen sink" for
> anything web related. What do others think?
>
> There are a few other modules that could be moved into a
> web-browsers.scm as well.

Splitting web.scm into more specific parts could be useful IMO.

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

bug#26374: [PATCH] gnu: Move dillo to web.scm.

[Ludovic Courtès]

Kei Kebreau <kei@openmailbox.org> skribis:

> Marius Bakke <mbakke@fastmail.com> writes:
>
>> Kei Kebreau <kei@openmailbox.org> writes:
>>
>>> * gnu/packages/dillo.scm: Remove file and move dillo...
>>> * gnu/packages/web.scm: ...here.
>>> * gnu/local.mk: Remove reference to removed file.
>>
>> I think it would be good to have a "web-browsers.scm" to try and keep
>> things organized; web.scm is already a kind of "kitchen sink" for
>> anything web related. What do others think?
>>
>> There are a few other modules that could be moved into a
>> web-browsers.scm as well.
>
> Splitting web.scm into more specific parts could be useful IMO.

Introducing web-browsers.scm for a start sounds good to me.

Ludo’.

bug#26374: [PATCH] gnu: Move dillo to web.scm.

[Kei Kebreau]

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

ludo@gnu.org (Ludovic Courtès) writes:

> Kei Kebreau <kei@openmailbox.org> skribis:
>
>> Marius Bakke <mbakke@fastmail.com> writes:
>>
>>> Kei Kebreau <kei@openmailbox.org> writes:
>>>
>>>> * gnu/packages/dillo.scm: Remove file and move dillo...
>>>> * gnu/packages/web.scm: ...here.
>>>> * gnu/local.mk: Remove reference to removed file.
>>>
>>> I think it would be good to have a "web-browsers.scm" to try and keep
>>> things organized; web.scm is already a kind of "kitchen sink" for
>>> anything web related. What do others think?
>>>
>>> There are a few other modules that could be moved into a
>>> web-browsers.scm as well.
>>
>> Splitting web.scm into more specific parts could be useful IMO.
>
> Introducing web-browsers.scm for a start sounds good to me.
>
> Ludo’.

I've opened a new bug (maybe I should have just submitted the new one
here...), so if this can be re-examined that would be great. :-)

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