From mboxrd@z Thu Jan 1 00:00:00 1970 From: Cyril Roelandt Subject: Re: [PATCH] gnu: Add IceCat. Date: Mon, 11 Nov 2013 21:33:44 +0100 Message-ID: <52813F28.8040007@gmail.com> References: <20131111194739.GA27236@debian> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:49520) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VfyWm-0006Mt-V1 for guix-devel@gnu.org; Mon, 11 Nov 2013 15:56:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VfyWh-0005Gw-Q4 for guix-devel@gnu.org; Mon, 11 Nov 2013 15:56:08 -0500 Received: from mail-we0-x235.google.com ([2a00:1450:400c:c03::235]:46284) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VfyWh-0005Gm-FU for guix-devel@gnu.org; Mon, 11 Nov 2013 15:56:03 -0500 Received: by mail-we0-f181.google.com with SMTP id w61so1808615wes.12 for ; Mon, 11 Nov 2013 12:56:02 -0800 (PST) Received: from [192.168.0.10] (tal33-3-82-233-82-24.fbx.proxad.net. [82.233.82.24]) by mx.google.com with ESMTPSA id ma3sm37742041wic.1.2013.11.11.12.56.00 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 11 Nov 2013 12:56:00 -0800 (PST) In-Reply-To: <20131111194739.GA27236@debian> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org On 11/11/2013 08:47 PM, Andreas Enge wrote: > See the attached patch. Comments welcome. Do I miss any interesting inputs? > > Andreas > > > 0001-gnu-Add-IceCat.patch > > > From 49c9ac9aabfed238654ea0e0439b1ddad66f46a6 Mon Sep 17 00:00:00 2001 > From: Andreas Enge > Date: Mon, 11 Nov 2013 20:44:34 +0100 > Subject: [PATCH] gnu: Add IceCat. > > * gnu/packages/gnuzilla.scm: New file. > * gnu-system.am (GNU_SYSTEM_MODULES): Add it. > --- > gnu-system.am | 1 + > gnu/packages/gnuzilla.scm | 97 +++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 98 insertions(+) > create mode 100644 gnu/packages/gnuzilla.scm > > diff --git a/gnu-system.am b/gnu-system.am > index 3497bf1..834ce5f 100644 > --- a/gnu-system.am > +++ b/gnu-system.am > @@ -77,6 +77,7 @@ GNU_SYSTEM_MODULES = \ > gnu/packages/gnunet.scm \ > gnu/packages/gnupg.scm \ > gnu/packages/gnutls.scm \ > + gnu/packages/gnuzilla.scm \ > gnu/packages/gperf.scm \ > gnu/packages/gprolog.scm \ > gnu/packages/graphviz.scm \ > diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm > new file mode 100644 > index 0000000..0b69462 > --- /dev/null > +++ b/gnu/packages/gnuzilla.scm > @@ -0,0 +1,97 @@ > +;;; GNU Guix --- Functional package management for GNU > +;;; Copyright © 2013 Andreas Enge > +;;; > +;;; 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. > + > +(define-module (gnu packages gnuzilla) > + #:use-module (gnu packages) > + #:use-module ((guix licenses) > + #:renamer (symbol-prefix-proc 'license:)) > + #:use-module (guix packages) > + #:use-module (guix download) > + #:use-module (guix build-system gnu) > + #:use-module (gnu packages glib) > + #:use-module (gnu packages gstreamer) > + #:use-module (gnu packages gtk) > + #:use-module (gnu packages linux) > + #:use-module (gnu packages perl) > + #:use-module (gnu packages pkg-config) > + #:use-module (gnu packages python) > + #:use-module (gnu packages xorg) > + #:use-module (gnu packages yasm) > + #:use-module (gnu packages zip)) > + > +(define-public icecat > + (package > + (name "icecat") > + (version "24.0") > + (source > + (origin > + (method url-fetch) > + (uri (string-append "mirror://gnu/gnuzilla/" > + (string-copy version 0 (string-index version #\.)) > + "/icecat-" version ".tar.gz")) > + (sha256 > + (base32 > + "1vxzjwmhad6yxx4sk9zvapjgv5salcv10id061q0991ii3dycy9a")))) > + (build-system gnu-build-system) > + (inputs > + `(("alsa-lib" ,alsa-lib) > + ("dbus" ,dbus) > + ("dbus-glib" ,dbus-glib) > + ("glib" ,glib) > + ("gstreamer" ,gstreamer-0.10) > + ("gst-plugins-base" ,gst-plugins-base-0.10) > + ("gtk+" ,gtk+-2) > + ("libxt" ,libxt) > + ("mesa" ,mesa) > + ("perl" ,perl) > + ("pkg-config" ,pkg-config) > + ("python" ,python-2) ; Python 3 not supported > + ("python2-pysqlite" ,python2-pysqlite) > + ("unzip" ,unzip) > + ("yasm" ,yasm) > + ("zip" ,zip))) > + (arguments > + `(#:tests? #f ; no check target > + #:phases > + (alist-cons-before > + 'patch-source-shebangs 'sanitise > + (lambda* (#:key #:allow-other-keys) > + ;; delete dangling symlinks > + (delete-file "browser/base/content/.#aboutDialog.xul") > + (delete-file "browser/base/content/abouthome/.#aboutHome.xhtml") > + (delete-file "browser/branding/unofficial/content/.#aboutHome.xhtml") > + (delete-file "toolkit/crashreporter/google-breakpad/autotools/compile")) > + (alist-replace > + 'configure > + ;; configure does not work followed by both "SHELL=..." and > + ;; "CONFIG_SHELL=..."; set environment variables instead > + (lambda* (#:key outputs configure-flags #:allow-other-keys) > + (let ((out (assoc-ref outputs "out"))) > + (setenv "SHELL" (which "bash")) > + (setenv "CONFIG_SHELL" (which "bash")) > + (zero? (system* "./configure" > + (string-append "--prefix=" out) > + "--disable-webrtc")))) ; webrtc creates an error Can't you use #:configure-flags here ? Btw, I think you should include more details about the errors created by WebRTC, so someone can try and fix them. > + %standard-phases)))) > + (home-page"http://www.gnu.org/software/gnuzilla/") > + (synopsis "Entirely free browser derived from Mozilla Firefox") > + (description > + "IceCat is the GNU version of the Firefox browser. It is entirely free > +software, which does not recommend non-free plugins and addons. It also > +features extra privacy-protecting features built in.") > + (license license:mpl2.0))) ; and others, see toolkit/content/license.html > -- 1.8.4 Cyril.