;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
-;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2013
, 2015 Andreas Enge <andreas@enge.fr>
+;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
+;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
;;;
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages gnuzilla)
+ #:use-module ((srfi srfi-1) #:hide (zip))
#:use-module (gnu packages)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (gnu packages glib)
#:use-module (gnu packages gstreamer)
#:use-module (gnu packages gtk)
+ #:use-module (gnu packages gnome)
+ #:use-module (gnu packages libcanberra)
+ #:use-module (gnu packages cups)
+ #:use-module (gnu packages mit-krb5)
#:use-module (gnu packages linux)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages compression)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages libevent)
+ #:use-module (gnu packages libreoffice) ;for hunspell
#:use-module (gnu packages image)
#:use-module (gnu packages libffi)
#:use-module (gnu packages pulseaudio)
#:use-module (gnu packages xorg)
#:use-module (gnu packages gl)
#:use-module (gnu packages yasm)
+ #:use-module (gnu packages icu4c)
+ #:use-module (gnu packages video)
+ #:use-module (gnu packages xdisorg)
#:use-module (gnu packages zip))
(define-public mozjs
name version ".tar.gz"))
(sha256
(base32
- "1fig2wf4f10v43mqx67y68z6h77sy900d1w0pz9qarrqx57rc7ij"))))
+ "1fig2wf4f10v43mqx67y68z6h77sy900d1w0pz9qarrqx57rc7ij"))
+ (modules '((guix build utils)))
+ (snippet
+ ;; Fix incompatibility with Perl 5.22+.
+ '(substitute* '("js/src/config/milestone.pl")
+ (("defined\\(@TEMPLATE_FILE)") "@TEMPLATE_FILE")))))
(build-system gnu-build-system)
(native-inputs
- `(("perl", perl)
+ `(("perl" ,perl)
("python" ,python-2)))
(arguments
`(#:phases
in C/C++.")
(license license:mpl2.0))) ; and others for some files
+(define-public mozjs-24
+ (package (inherit mozjs)
+ (name "mozjs")
+ (version "24.2.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://ftp.mozilla.org/pub/mozilla.org/js/"
+ name "-" version ".tar.bz2"))
+ (sha256
+ (base32
+ "1n1phk8r3l8icqrrap4czplnylawa0ddc2cc4cgdz46x3lrkybz6"))
+ (modules '((guix build utils)))
+ (snippet
+ ;; Fix incompatibility with Perl 5.22+.
+ '(substitute* '("js/src/config/milestone.pl")
+ (("defined\\(@TEMPLATE_FILE)") "@TEMPLATE_FILE")))))
+ (arguments
+ '(#:phases
+ (modify-phases %standard-phases
+ (replace
+ 'configure
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (chdir "js/src")
+ ;; configure fails if it is follwed by SHELL and CONFIG_SHELL
+ (setenv "SHELL" (which "sh"))
+ (setenv "CONFIG_SHELL" (which "sh"))
+ (zero? (system* "./configure"
+ (string-append "--prefix=" out)
+ "--with-system-nspr"
+ "--enable-system-ffi"
+ "--enable-threadsafe"))))))))
+ (native-inputs
+ `(("perl" ,perl)
+ ("pkg-config" ,pkg-config)
+ ("python" ,python-2)))
+ (propagated-inputs
+ `(("nspr" ,nspr))) ; in the Requires.private field of mozjs-24.pc
+ (inputs
+ `(("libffi" ,libffi)
+ ("zlib" ,zlib)))))
+
(define-public nspr
(package
(name "nspr")
- (version "4.10.7")
+ (version "4.12")
(source (origin
(method url-fetch)
(uri (string-append
version "/src/nspr-" version ".tar.gz"))
(sha256
(base32
- "0f1ri51yzjikigf6z31g03cdv6sgi9gw2c3vvv39psk3m37zb6iq"))))
+ "1pk98bmc5xzbl62q5wf2d6mryf0v95z6rsmxz27nclwiaqg0mcg0"))))
(build-system gnu-build-system)
(native-inputs
- `(("perl", perl)))
+ `(("perl" ,perl)))
(arguments
- `(#:tests? #f ; no check target
- #:configure-flags
- `("--enable-64bit")
- #:phases
- (alist-cons-before
- 'configure 'chdir
- (lambda _
- (chdir "nspr"))
- %standard-phases)))
+ `(#:tests? #f ; no check target
+ #:configure-flags (list "--enable-64bit"
+ (string-append "LDFLAGS=-Wl,-rpath="
+ (assoc-ref %outputs "out")
+ "/lib"))
+ #:phases (alist-cons-before
+ 'configure 'chdir
+ (lambda _
+ (chdir "nspr"))
+ %standard-phases)))
(home-page
"https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSPR")
(synopsis "Netscape API for system level and libc-like functions")
(define-public nss
(package
(name "nss")
- (version "3.17.3")
+ (version "3.23")
(source (origin
(method url-fetch)
- (uri (string-append
- "ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/"
- "releases/NSS_3_17_3_RTM/src/nss-3.17.3.tar.gz"))
+ (uri (let ((version-with-underscores
+ (string-join (string-split version #\.) "_")))
+ (string-append
+ "https://ftp.mozilla.org/pub/mozilla.org/security/nss/"
+ "releases/NSS_" version-with-underscores "_RTM/src/"
+ "nss-" version ".tar.gz")))
(sha256
(base32
- "1m91z80x4zh1mxgf53bl33lp43gn1wxxx0y26mgz511gb81ykmgl"))
+ "1kqidv91icq96m9m8zx50n7px08km2l88458rkgyjwcn3kiq7cwl"))
;; Create nss.pc and nss-config.
- (patches (list (search-patch "nss-pkgconfig.patch")))))
+ (patches (search-patches "nss-pkgconfig.patch"))))
(build-system gnu-build-system)
(outputs '("out" "bin"))
(arguments
(ice-9 ftw)
(ice-9 match)
(srfi srfi-26))
- #:imported-modules ((guix build gnu-build-system)
- (guix build utils))
#:phases
(alist-replace
'configure
(lambda* (#:key system inputs #:allow-other-keys)
+ (setenv "CC" "gcc")
;; Tells NSS to build for the 64-bit ABI if we are 64-bit system.
(when (string-prefix? "x86_64" system)
(setenv "USE_64" "1"))
(obj (match (scandir "dist" (cut string-suffix? "OBJ" <>))
((obj) (string-append "dist/" obj)))))
;; Install nss-config to $out/bin.
- (mkdir-p (string-append out "/bin"))
- (copy-file (string-append obj "/bin/nss-config")
- (string-append out "/bin/nss-config"))
+ (install-file (string-append obj "/bin/nss-config")
+ (string-append out "/bin"))
(delete-file (string-append obj "/bin/nss-config"))
;; Install nss.pc to $out/lib/pkgconfig.
- (mkdir-p (string-append out "/lib/pkgconfig"))
- (copy-file (string-append obj "/lib/pkgconfig/nss.pc")
- (string-append out "/lib/pkgconfig/nss.pc"))
+ (install-file (string-append obj "/lib/pkgconfig/nss.pc")
+ (string-append out "/lib/pkgconfig"))
(delete-file (string-append obj "/lib/pkgconfig/nss.pc"))
(rmdir (string-append obj "/lib/pkgconfig"))
;; Install other files.
(copy-recursively "dist/public/nss" inc)
(copy-recursively (string-append obj "/bin") bin)
- (copy-recursively (string-append obj "/lib") lib)))
+ (copy-recursively (string-append obj "/lib") lib)
+
+ ;; FIXME: libgtest1.so is installed in the above step, and it's
+ ;; (unnecessarily) linked with several NSS libraries, but
+ ;; without the needed rpaths, causing the 'validate-runpath'
+ ;; phase to fail. Here we simply delete libgtest1.so, since it
+ ;; seems to be used only during the tests.
+ (delete-file (string-append lib "/libgtest1.so"))
+
+ #t))
%standard-phases)))))
(inputs
`(("sqlite" ,sqlite)
("zlib" ,zlib)))
(propagated-inputs `(("nspr" ,nspr))) ; required by nss.pc.
(native-inputs `(("perl" ,perl)))
+
+ ;; The NSS test suite takes over 28 hours on Loongson 3A (MIPS), and
+ ;; possibly longer when another build is happening concurrently on the
+ ;; same machine.
+ (properties '((timeout . 144000))) ; 40 hours
+
(home-page
"https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS")
(synopsis "Network Security Services")
(define-public icecat
(package
(name "icecat")
- (version "31.2.0")
+ (version "38.7.1-gnu1")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://gnu/gnuzilla/"
- version "/" name "-" version ".tar.xz"))
+ (first (string-split version #\-)) "/"
+ name "-" version ".tar.bz2"))
(sha256
(base32
- "02r9klfc0z26w270inq652249hq0wfzvwhzvwmk0n8v8nzkk5idh"))
- (patches (map search-patch
- '("icecat-CVE-2014-1587-bug-1042567.patch"
- "icecat-CVE-2014-1587-bug-1072847.patch"
- "icecat-CVE-2014-1587-bug-1079729.patch"
- "icecat-CVE-2014-1587-bug-1080312.patch"
- "icecat-CVE-2014-1587-bug-1089207.patch"
- "icecat-CVE-2014-1590.patch"
- "icecat-CVE-2014-1592.patch"
- "icecat-CVE-2014-1593.patch"
- "icecat-CVE-2014-1594.patch"
- "icecat-armhf-xpcom.patch"
- "icecat-CVE-2014-8639.patch"
- "icecat-CVE-2014-8634-pt1.patch"
- "icecat-CVE-2014-8634-pt2.patch"
- "icecat-CVE-2014-8641.patch"
- "icecat-CVE-2014-8638-pt1.patch"
- "icecat-CVE-2014-8638-pt2.patch")))))
+ "1wdmd6hasra36g86ha1dw8sl7a5mvr7c4jbjx4zyg9629y5gqr8g"))
+ (patches (search-patches
+ "icecat-avoid-bundled-includes.patch"
+ "icecat-re-enable-DHE-cipher-suites.patch"
+ "icecat-update-bundled-graphite2.patch"
+ "icecat-CVE-2016-2805.patch"
+ "icecat-CVE-2016-2807-pt1.patch"
+ "icecat-CVE-2016-2807-pt2.patch"
+ "icecat-CVE-2016-2807-pt3.patch"
+ "icecat-CVE-2016-2807-pt4.patch"
+ "icecat-CVE-2016-2807-pt5.patch"
+ "icecat-CVE-2016-2808.patch"
+ "icecat-CVE-2016-2814.patch"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Remove bundled libraries that we don't use, since they may
+ ;; contain unpatched security flaws, they waste disk space and
+ ;; network bandwidth, and may cause confusion.
+ (for-each delete-file-recursively
+ '(;; FIXME: Removing the bundled icu breaks configure.
+ ;; * The bundled icu headers are used in some places.
+ ;; * The version number is taken from the bundled copy.
+ ;;"intl/icu"
+ ;;
+ ;; FIXME: A script from the bundled nspr is used.
+ ;;"nsprpub"
+ ;;
+ ;; TODO: Use system media libraries. Waiting for:
+ ;; <https://bugzilla.mozilla.org/show_bug.cgi?id=517422>
+ ;; * libogg
+ ;; * libtheora
+ ;; * libvorbis
+ ;; * libtremor (not yet in guix)
+ ;; * libopus
+ ;; * speex
+ ;; * soundtouch (not yet in guix)
+ ;;
+ ;; TODO: Use system harfbuzz. Waiting for:
+ ;; <https://bugzilla.mozilla.org/show_bug.cgi?id=847568>
+ ;;
+ ;; TODO: Use system graphite2.
+ ;;
+ "modules/freetype2"
+ "modules/zlib"
+ "modules/libbz2"
+ "ipc/chromium/src/third_party/libevent"
+ "media/libvpx"
+ "security/nss"
+ "gfx/cairo"
+ "js/src/ctypes/libffi"
+ "db/sqlite3"))
+ #t))))
(build-system gnu-build-system)
(inputs
`(("alsa-lib" ,alsa-lib)
("bzip2" ,bzip2)
- ("dbus" ,dbus)
+ ("cairo" ,cairo)
+ ("cups" ,cups)
("dbus-glib" ,dbus-glib)
+ ("gdk-pixbuf" ,gdk-pixbuf)
("glib" ,glib)
- ("gstreamer" ,gstreamer-0.10)
- ("gst-plugins-base" ,gst-plugins-base-0.10)
+ ("gstreamer" ,gstreamer)
+ ("gst-plugins-base" ,gst-plugins-base)
("gtk+" ,gtk+-2)
("pango" ,pango)
("freetype" ,freetype)
+ ("hunspell" ,hunspell)
+ ("libcanberra" ,libcanberra)
+ ("libgnome" ,libgnome)
("libxft" ,libxft)
("libevent" ,libevent)
+ ("libxinerama" ,libxinerama)
+ ("libxscrnsaver" ,libxscrnsaver)
+ ("libxcomposite" ,libxcomposite)
("libxt" ,libxt)
("libffi" ,libffi)
+ ("libvpx" ,libvpx)
+ ("icu4c" ,icu4c)
+ ("pixman" ,pixman)
("pulseaudio" ,pulseaudio)
("mesa" ,mesa)
+ ("mit-krb5" ,mit-krb5)
+ ("nspr" ,nspr)
+ ("nss" ,nss)
+ ("sqlite" ,sqlite)
+ ("startup-notification" ,startup-notification)
("unzip" ,unzip)
("yasm" ,yasm)
("zip" ,zip)
`(#: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
+
+ ;; XXX: There are RUNPATH issues such as
+ ;; $prefix/lib/icecat-31.6.0/plugin-container NEEDing libmozalloc.so,
+ ;; which is not in its RUNPATH, but they appear to be harmless in
+ ;; practice somehow. See <http://hydra.gnu.org/build/378133>.
+ #:validate-runpath? #f
+
+ #:configure-flags '("--enable-default-toolkit=cairo-gtk2"
+ "--enable-pango"
+ "--enable-gio"
+ "--enable-svg"
+ "--enable-canvas"
+ "--enable-mathml"
+ "--enable-startup-notification"
+ "--enable-pulseaudio"
+ "--enable-gstreamer=1.0"
+
+ "--disable-gnomevfs"
+ "--disable-gconf"
+ "--disable-gnomeui"
+
+ ;; Building with debugging symbols takes ~5GiB, so
;; disable it.
"--disable-debug"
"--disable-debug-symbols"
- "--enable-pulseaudio"
- "--disable-webrtc" ; webrtc fails to build
-
+ ;; Avoid bundled libraries.
"--with-system-zlib"
- "--with-system-bz2" ; FIXME: not used
+ "--with-system-bz2"
"--with-system-libevent"
+ "--with-system-libvpx"
+ "--with-system-icu"
+ "--with-system-nspr"
+ "--with-system-nss"
+ "--enable-system-pixman"
+ "--enable-system-cairo"
+ "--enable-system-ffi"
+ "--enable-system-hunspell"
+ "--enable-system-sqlite"
;; Fails with "--with-system-png won't work because
;; the system's libpng doesn't have APNG support".
;; to accelerate baseline JPEG compression/
;; decompression", so we had better not use it
;; "--with-system-jpeg"
+ )
- "--enable-system-ffi")
-
+ #:modules ((ice-9 ftw)
+ ,@%gnu-build-system-modules)
#:phases
- (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"))
- (bash (which "bash"))
- (abs-srcdir (getcwd))
- (srcdir (string-append "../" (basename abs-srcdir)))
- (flags `(,(string-append "--prefix=" out)
- ,(string-append "--with-l10n-base="
- 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)))
+ (modify-phases %standard-phases
+ (add-after
+ 'unpack 'ensure-no-mtimes-pre-1980
+ (lambda _
+ ;; Without this, the 'source/test/addons/packed.xpi' and
+ ;; 'source/test/addons/simple-prefs.xpi' targets fail while trying
+ ;; to create zip archives.
+ (let ((early-1980 315619200)) ; 1980-01-02 UTC
+ (ftw "." (lambda (file stat flag)
+ (unless (<= early-1980 (stat:mtime stat))
+ (utime file early-1980 early-1980))
+ #t))
+ #t)))
+ (add-after
+ 'unpack 'remove-h264parse-from-blacklist
+ (lambda _
+ ;; Remove h264parse from gstreamer format helper blacklist. It
+ ;; was put there to work around a bug in a pre-1.0 version of
+ ;; gstreamer. See:
+ ;; https://www.mozilla.org/en-US/security/advisories/mfsa2015-47/
+ (substitute* "dom/media/gstreamer/GStreamerFormatHelper.cpp"
+ (("^ \"h264parse\",\n") ""))
+ #t))
+ (add-after
+ 'unpack 'arrange-to-link-libxul-with-libraries-it-might-dlopen
+ (lambda _
+ ;; libxul.so dynamically opens libraries, so here we explicitly
+ ;; link them into libxul.so instead.
+ ;;
+ ;; TODO: It might be preferable to patch in absolute file names in
+ ;; calls to dlopen or PR_LoadLibrary, but that didn't seem to
+ ;; work. More investigation is needed.
+ (substitute* "toolkit/library/moz.build"
+ (("^# This needs to be last")
+ "OS_LIBS += [
+ 'GL', 'gnome-2', 'canberra', 'Xss', 'cups', 'gssapi_krb5',
+ 'gstreamer-1.0', 'gstapp-1.0', 'gstvideo-1.0' ]\n\n"))
+ #t))
+ (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"))
+ (bash (which "bash"))
+ (abs-srcdir (getcwd))
+ (srcdir (string-append "../" (basename abs-srcdir)))
+ (flags `(,(string-append "--prefix=" out)
+ ,(string-append "--with-l10n-base="
+ 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))))))))
(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 built-in privacy-protecting features.")
- (license license:mpl2.0))) ; and others, see toolkit/content/license.html
+ (license license:mpl2.0) ;and others, see toolkit/content/license.html
+ (properties '((ftp-directory . "/gnu/gnuzilla")))))
HCoop / jackhill / guix / guix.git / blobdiff