[PATCH] gnu: Add IceCat.

[PATCH] gnu: Add IceCat.

[Andreas Enge]

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

See the attached patch. Comments welcome. Do I miss any interesting inputs?

Andreas


[-- Attachment #2: 0001-gnu-Add-IceCat.patch --]
[-- Type: text/plain, Size: 5063 bytes --]

From 49c9ac9aabfed238654ea0e0439b1ddad66f46a6 Mon Sep 17 00:00:00 2001
From: Andreas Enge <andreas@enge.fr>
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 <andreas@enge.fr>
+;;;
+;;; 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 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
+          %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

Re: [PATCH] gnu: Add IceCat.

[Cyril Roelandt]

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<andreas@enge.fr>
> 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<andreas@enge.fr>
> +;;;
> +;;; 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 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.

Re: [PATCH] gnu: Add IceCat.

[Ludovic Courtès]

Andreas Enge <andreas@enge.fr> skribis:

> See the attached patch. Comments welcome. Do I miss any interesting inputs?

Excellent!

> +(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 #\.))

Perhaps ‘substring’ instead of ‘string-copy’ (does pretty much the same
thing, but the meaning is clearer IMO.)

> +          (lambda* (#:key #:allow-other-keys)

(lambda _ ...) is enough (where ‘_’ is a convention to suggest that we
don’t care about the arguments.)

> +            ;; delete dangling symlinks

Do they cause problem with one of the patch-everything passes?

Other than that, it looks good to me.

Thanks for this brave endeavor!

Ludo’.

Re: [PATCH] gnu: Add IceCat.

[Andreas Enge]

On Mon, Nov 11, 2013 at 10:34:36PM +0100, Ludovic Courtès wrote:
> Perhaps ‘substring’ instead of ‘string-copy’ (does pretty much the same
> thing, but the meaning is clearer IMO.)

Okay. I have no preference.

> (lambda _ ...) is enough (where ‘_’ is a convention to suggest that we
> don’t care about the arguments.)

Thanks, that is interesting to know!

> > +            ;; delete dangling symlinks
> Do they cause problem with one of the patch-everything passes?

Yes.

> Other than that, it looks good to me.

Okay, I will push in a moment without trying to compile again, and let hydra
pick up any error.

Andreas

Re: [PATCH] gnu: Add IceCat.

[Andreas Enge]

On Mon, Nov 11, 2013 at 09:33:44PM +0100, Cyril Roelandt wrote:
> >+            (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 ?

This is the same problem as encountered also for other packages, such as
ffmpeg and bigloo.

> Btw, I think you should
> include more details about the errors created by WebRTC, so someone
> can try and fix them.

For the record, I am posting the error message here:

generating WebRTC Makefiles...
Updating projects from gyp files...
Traceback (most recent call last):
  File "./media/webrtc/trunk/build/gyp_chromium", line 175, in <module>
    sys.exit(gyp.main(args))
  File "/tmp/nix-build-icecat-24.0.drv-0/icecat-24.0/media/webrtc/trunk/tools/gyp/pylib/gyp/__init__.py", line 526, in main
    return gyp_main(args)
  File "/tmp/nix-build-icecat-24.0.drv-0/icecat-24.0/media/webrtc/trunk/tools/gyp/pylib/gyp/__init__.py", line 502, in gyp_main
    options.circular_check)
  File "/tmp/nix-build-icecat-24.0.drv-0/icecat-24.0/media/webrtc/trunk/tools/gyp/pylib/gyp/__init__.py", line 132, in Load
    params['parallel'])
  File "/tmp/nix-build-icecat-24.0.drv-0/icecat-24.0/media/webrtc/trunk/tools/gyp/pylib/gyp/input.py", line 2556, in Load
    variables, includes, depth, check, True)
  File "/tmp/nix-build-icecat-24.0.drv-0/icecat-24.0/media/webrtc/trunk/tools/gyp/pylib/gyp/input.py", line 391, in LoadTargetBuildFile
    build_file_data, PHASE_EARLY, variables, build_file_path)
  File "/tmp/nix-build-icecat-24.0.drv-0/icecat-24.0/media/webrtc/trunk/tools/gyp/pylib/gyp/input.py", line 1142, in ProcessVariablesAndConditionsInDict
    variables, build_file, 'variables')
  File "/tmp/nix-build-icecat-24.0.drv-0/icecat-24.0/media/webrtc/trunk/tools/gyp/pylib/gyp/input.py", line 1142, in ProcessVariablesAndConditionsInDict
    variables, build_file, 'variables')
  File "/tmp/nix-build-icecat-24.0.drv-0/icecat-24.0/media/webrtc/trunk/tools/gyp/pylib/gyp/input.py", line 1142, in ProcessVariablesAndConditionsInDict
    variables, build_file, 'variables')
  File "/tmp/nix-build-icecat-24.0.drv-0/icecat-24.0/media/webrtc/trunk/tools/gyp/pylib/gyp/input.py", line 1194, in ProcessVariablesAndConditionsInDict
    ProcessConditionsInDict(the_dict, phase, variables, build_file)
  File "/tmp/nix-build-icecat-24.0.drv-0/icecat-24.0/media/webrtc/trunk/tools/gyp/pylib/gyp/input.py", line 1071, in ProcessConditionsInDict
    variables, build_file)
  File "/tmp/nix-build-icecat-24.0.drv-0/icecat-24.0/media/webrtc/trunk/tools/gyp/pylib/gyp/input.py", line 1149, in ProcessVariablesAndConditionsInDict
    expanded = ExpandVariables(value, phase, variables, build_file)
  File "/tmp/nix-build-icecat-24.0.drv-0/icecat-24.0/media/webrtc/trunk/tools/gyp/pylib/gyp/input.py", line 872, in ExpandVariables
    cwd=build_file_dir)
  File "/nix/store/a1x98y7y83j4x4d4pk21w9m4f60dgs9r-python-2.7.5/lib/python2.7/subprocess.py", line 711, in __init__
    errread, errwrite)
  File "/nix/store/a1x98y7y83j4x4d4pk21w9m4f60dgs9r-python-2.7.5/lib/python2.7/subprocess.py", line 1308, in _execute_child
    raise child_exception
OSError: [Errno 2] No such file or directory
configure: error: failed to generate WebRTC Makefiles
------ config.log ------
configure:26044: gcc -c  -std=gnu99 -fgnu89-inline -fno-strict-aliasing -ffunction-sections -fdata-sections -pthread -pipe  -I/nix/store/b3c1z47c201gz8gnx5553kw2qb4qdq3b-freetype-2.4.11/include/freetype2 -I/nix/store/b3c1z47c201gz8gnx5553kw2qb4qdq3b-freetype-2.4.11/include    conftest.c 1>&5
configure:26134: checking for fontconfig
configure:26141: checking _FONTCONFIG_CFLAGS
configure:26146: checking _FONTCONFIG_LIBS
configure:26340: checking for stdint.h
configure:26353: gcc -c  -std=gnu99 -fgnu89-inline -fno-strict-aliasing -ffunction-sections -fdata-sections -pthread -pipe  conftest.c 1>&5
configure:26340: checking for inttypes.h
configure:26353: gcc -c  -std=gnu99 -fgnu89-inline -fno-strict-aliasing -ffunction-sections -fdata-sections -pthread -pipe  conftest.c 1>&5
configure:26340: checking for sys/int_types.h
configure:26353: gcc -c  -std=gnu99 -fgnu89-inline -fno-strict-aliasing -ffunction-sections -fdata-sections -pthread -pipe  conftest.c 1>&5
configure:26347:27: fatal error: sys/int_types.h: No such file or directory
compilation terminated.
configure: failed program was:
#line 26345 "configure"
#include "confdefs.h"

#include <sys/int_types.h>
int main() {

; return 0; }
configure:27696: checking for posix_fallocate
configure:27706: gcc -o conftest -Wall -Wpointer-arith -Wdeclaration-after-statement -Werror=return-type -Wtype-limits -Wempty-body -Wsign-compare -Wno-unused -Wcast-align -std=gnu99 -fgnu89-inline -fno-strict-aliasing -ffunction-sections -fdata-sections -pthread -pipe  -lpthread  -Wl,-z,noexecstack -Wl,--build-id conftest.c -ldl  1>&5
configure:27757: gcc -c -Wall -Wpointer-arith -Wdeclaration-after-statement -Werror=return-type -Wtype-limits -Wempty-body -Wsign-compare -Wno-unused -Wcast-align -std=gnu99 -fgnu89-inline -fno-strict-aliasing -ffunction-sections -fdata-sections -pthread -pipe   conftest.c 1>&5
configure:27777: checking for GL/glx.h
configure:27790: gcc -c -Wall -Wpointer-arith -Wdeclaration-after-statement -Werror=return-type -Wtype-limits -Wempty-body -Wsign-compare -Wno-unused -Wcast-align -std=gnu99 -fgnu89-inline -fno-strict-aliasing -ffunction-sections -fdata-sections -pthread -pipe  conftest.c 1>&5
phase `configure' failed after 29 seconds

Andreas

Re: [PATCH] gnu: Add IceCat.

[Ludovic Courtès]

Andreas Enge <andreas@enge.fr> skribis:

> Okay, I will push in a moment without trying to compile again, and let hydra
> pick up any error.

It succeeded on i686 but failed on x86_64 for unclear reasons (the log
doesn’t show any error, but dmesg shows a couple of OOMs...), so I’ve
just restarted it.

Thanks,
Ludo’.

Re: [PATCH] gnu: Add IceCat.

[Jason Self]

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

Ludovic Courtès said:
> It succeeded on i686 but failed on x86_64 for unclear reasons
> (the log doesn't show any error, but dmesg shows a couple of
> OOMs...), so I’ve just restarted it.

Lots of memory is probably needed. I haven't tried to compile
IceCat but I recall the Mozilla instructions for Firefox saying
that 4GB was required and that less may give memory errors during
compile. I'm not sure how much RAM Hydra has.

Re: [PATCH] gnu: Add IceCat.

[Ludovic Courtès]

"Jason Self" <jason@bluehome.net> skribis:

> Ludovic Courtès said:
>> It succeeded on i686 but failed on x86_64 for unclear reasons
>> (the log doesn't show any error, but dmesg shows a couple of
>> OOMs...), so I’ve just restarted it.
>
> Lots of memory is probably needed. I haven't tried to compile
> IceCat but I recall the Mozilla instructions for Firefox saying
> that 4GB was required and that less may give memory errors during
> compile. I'm not sure how much RAM Hydra has.

As discussed on IRC, hydra.gnu.org has only 2 GiB of RAM.  I asked the
FSF sysadmins if they could increase it, but that’s not currently
possible.

I think we must really work towards connecting additional slaves now.

Ludo’.