From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52847) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cvqOY-0001vO-7L for guix-patches@gnu.org; Wed, 05 Apr 2017 15:15:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cvqOU-0006EG-FG for guix-patches@gnu.org; Wed, 05 Apr 2017 15:15:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:35803) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cvqOU-0006E9-B7 for guix-patches@gnu.org; Wed, 05 Apr 2017 15:15:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cvqOU-0007Up-2S for guix-patches@gnu.org; Wed, 05 Apr 2017 15:15:02 -0400 Subject: bug#26374: [PATCH] gnu: Move dillo to web.scm. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:52581) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cvqNu-0001Ys-Nv for guix-patches@gnu.org; Wed, 05 Apr 2017 15:14:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cvqNr-00062t-1r for guix-patches@gnu.org; Wed, 05 Apr 2017 15:14:26 -0400 Received: from lb1.openmailbox.org ([5.79.108.160]:39652 helo=mail.openmailbox.org) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cvqNq-000610-NN for guix-patches@gnu.org; Wed, 05 Apr 2017 15:14:23 -0400 From: Kei Kebreau Date: Wed, 5 Apr 2017 15:14:11 -0400 Message-Id: <20170405191411.32328-1-kei@openmailbox.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 26374@debbugs.gnu.org Cc: 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 =3D \ %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 =C2=A9 2016 Kei Kebreau -;;; -;;; 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 (a= t -;;; 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 . - -(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 inten= ded 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 =C2=A9 2016 Arun Isaac ;;; Copyright =C2=A9 2016 Tobias Geerinckx-Rice ;;; Copyright =C2=A9 2016 Bake Timmons +;;; Copyright =C2=A9 2016 Kei Kebreau ;;; Copyright =C2=A9 2017 Thomas Danckaert ;;; ;;; 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 minim= al 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 inten= ded for +older or slower computers and embedded systems.") + (home-page "http://www.dillo.org") + (license license:gpl3+))) --=20 2.12.2