nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: icecat: Update to 31.1.1. 

* gnu/packages/gnuzilla.scm (icecat): Update to 31.1.1.  Add 'pango',
  'freetype', 'libxft' and 'pulseaudio' as inputs.  Set
  'out-of-source?' to #t.  Remove 'sanitise' phase.  Adapt customized
  'configure' phase to handle 'out-of-source?' build.  Add
  '--with-l10n-base' argument to configure.
This commit is contained in:
Mark H Weaver 2014-10-08 23:37:37 -04:00
parent 405a9d4ec9
commit 74c7af9fb8
1 changed files with 35 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
gnu/packages/gnuzilla.scm
View File

@ -30,9 +30,11 @@
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages libevent) #:use-module (gnu packages libevent)
#:use-module (gnu packages image) #:use-module (gnu packages image)
#:use-module (gnu packages libffi) #:use-module (gnu packages libffi)
#:use-module (gnu packages pulseaudio)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages xorg) #:use-module (gnu packages xorg)
#:use-module (gnu packages gl) #:use-module (gnu packages gl)
@ -42,16 +44,15 @@
(define-public icecat (define-public icecat
(package (package
(name "icecat") (name "icecat")
(version "24.0") (version "31.1.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/gnuzilla/" (uri (string-append "http://gnuzilla.gnu.org/releases/"
(substring version 0 (string-index version #\.)) version "/" name "-" version ".tar.xz"))
"/icecat-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1vxzjwmhad6yxx4sk9zvapjgv5salcv10id061q0991ii3dycy9a")))) "033p5b6akjbg33prqg57mhp5zx3svryqzbjb3k58ql6939bfmad8"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("alsa-lib" ,alsa-lib) `(("alsa-lib" ,alsa-lib)
@ -62,9 +63,13 @@
("gstreamer" ,gstreamer-0.10) ("gstreamer" ,gstreamer-0.10)
("gst-plugins-base" ,gst-plugins-base-0.10) ("gst-plugins-base" ,gst-plugins-base-0.10)
("gtk+" ,gtk+-2) ("gtk+" ,gtk+-2)
("pango" ,pango)
("freetype" ,freetype)
("libxft" ,libxft)
("libevent" ,libevent) ("libevent" ,libevent)
("libxt" ,libxt) ("libxt" ,libxt)
("libffi" ,libffi) ("libffi" ,libffi)
("pulseaudio" ,pulseaudio)
("mesa" ,mesa) ("mesa" ,mesa)
("unzip" ,unzip) ("unzip" ,unzip)
("yasm" ,yasm) ("yasm" ,yasm)
@ -77,6 +82,7 @@
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(arguments (arguments
`(#:tests? #f ; no check target `(#:tests? #f ; no check target
#:out-of-source? #t ; must be built outside of the source directory
#:configure-flags '(;; Building with debugging symbols takes ~5GiB, so #:configure-flags '(;; Building with debugging symbols takes ~5GiB, so
;; disable it. ;; disable it.
@ -112,26 +118,29 @@
"--enable-system-ffi") "--enable-system-ffi")
#:phases #:phases
(alist-cons-before
'patch-source-shebangs 'sanitise
(lambda _
;; 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 (alist-replace
'configure 'configure
;; configure does not work followed by both "SHELL=..." and ;; configure does not work followed by both "SHELL=..." and
;; "CONFIG_SHELL=..."; set environment variables instead ;; "CONFIG_SHELL=..."; set environment variables instead
(lambda* (#:key outputs configure-flags #:allow-other-keys) (lambda* (#:key outputs configure-flags #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let* ((out (assoc-ref outputs "out"))
(setenv "SHELL" (which "bash")) (bash (which "bash"))
(setenv "CONFIG_SHELL" (which "bash")) (abs-srcdir (getcwd))
(zero? (apply system* "./configure" (srcdir (string-append "../" (basename abs-srcdir)))
(string-append "--prefix=" out) (flags `(,(string-append "--prefix=" out)
configure-flags)))) ,(string-append "--with-l10n-base="
%standard-phases)))) abs-srcdir "/l10n")
,@configure-flags)))
(setenv "SHELL" bash)
(setenv "CONFIG_SHELL" bash)
(mkdir "../build")
(chdir "../build")
(format #t "build directory: ~s~%" (getcwd))
(format #t "configure flags: ~s~%" flags)
(zero? (apply system* bash
(string-append srcdir "/configure")
flags))))
%standard-phases)))
(home-page "http://www.gnu.org/software/gnuzilla/") (home-page "http://www.gnu.org/software/gnuzilla/")
(synopsis "Entirely free browser derived from Mozilla Firefox") (synopsis "Entirely free browser derived from Mozilla Firefox")
(description (description