diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-03-09 20:50:12 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-03-10 10:13:38 -0400 |
| commit | 5b17fabca63296e04d35679b92150c1c73d1df53 (patch) | |
| tree | d1b2e08bd30f380603a8e34ae035952c231f2497 /gnu/packages/gnuzilla.scm | |
| parent | a24175ac8d772e714a7cb5796e2da8799d9cf055 (diff) | |
| download | guix-5b17fabca63296e04d35679b92150c1c73d1df53.tar guix-5b17fabca63296e04d35679b92150c1c73d1df53.tar.gz | |
gnu: icecat: Update to 31.5.0.
* gnu/packages/patches/icecat-CVE-2015-0822.patch,
gnu/packages/patches/icecat-CVE-2015-0827-pt-1.patch,
gnu/packages/patches/icecat-CVE-2015-0827-pt-2.patch,
gnu/packages/patches/icecat-CVE-2015-0827-pt-3.patch,
gnu/packages/patches/icecat-CVE-2015-0831-pt-1.patch,
gnu/packages/patches/icecat-CVE-2015-0831-pt-2.patch,
gnu/packages/patches/icecat-CVE-2015-0836-pt-01.patch,
gnu/packages/patches/icecat-CVE-2015-0836-pt-02.patch,
gnu/packages/patches/icecat-CVE-2015-0836-pt-03.patch,
gnu/packages/patches/icecat-CVE-2015-0836-pt-04.patch,
gnu/packages/patches/icecat-CVE-2015-0836-pt-05.patch,
gnu/packages/patches/icecat-CVE-2015-0836-pt-06.patch,
gnu/packages/patches/icecat-CVE-2015-0836-pt-07.patch,
gnu/packages/patches/icecat-CVE-2015-0836-pt-08.patch,
gnu/packages/patches/icecat-CVE-2015-0836-pt-09.patch,
gnu/packages/patches/icecat-CVE-2015-0836-pt-10.patch,
gnu/packages/patches/icecat-CVE-2015-0836-pt-11.patch: Remove files.
* gnu-system.am (dist_patch_DATA): Remove them.
* gnu/packages/gnuzilla.scm (icecat): Update to 31.5.0. Remove patches.
Add 'nspr', 'nss', and 'cairo' to inputs. Add configure flags to use
those system libraries.
Diffstat (limited to 'gnu/packages/gnuzilla.scm')
| -rw-r--r-- | gnu/packages/gnuzilla.scm | 42 |
1 files changed, 11 insertions, 31 deletions
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index bc74fa8d60..1d450cda64 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -216,7 +216,7 @@ standards.") (define-public icecat (package (name "icecat") - (version "31.4.0") + (version "31.5.0") (source (origin (method url-fetch) @@ -224,29 +224,12 @@ standards.") version "/" name "-" version ".tar.bz2")) (sha256 (base32 - "0q5ilgfybcrbwf9hq9zc1cpnlhq1pddnnjmdrxrcrrg8lgx5kkc2")) - (patches (map search-patch - '("icecat-CVE-2015-0822.patch" - "icecat-CVE-2015-0827-pt-1.patch" - "icecat-CVE-2015-0827-pt-2.patch" - "icecat-CVE-2015-0827-pt-3.patch" - "icecat-CVE-2015-0831-pt-1.patch" - "icecat-CVE-2015-0831-pt-2.patch" - "icecat-CVE-2015-0836-pt-01.patch" - "icecat-CVE-2015-0836-pt-02.patch" - "icecat-CVE-2015-0836-pt-03.patch" - "icecat-CVE-2015-0836-pt-04.patch" - "icecat-CVE-2015-0836-pt-05.patch" - "icecat-CVE-2015-0836-pt-06.patch" - "icecat-CVE-2015-0836-pt-07.patch" - "icecat-CVE-2015-0836-pt-08.patch" - "icecat-CVE-2015-0836-pt-09.patch" - "icecat-CVE-2015-0836-pt-10.patch" - "icecat-CVE-2015-0836-pt-11.patch"))))) + "1rr4axghaypdkrf60i1qp6dz4cd29ya02fs3vyffvp4x9kgcq2dd")))) (build-system gnu-build-system) (inputs `(("alsa-lib" ,alsa-lib) ("bzip2" ,bzip2) + ("cairo" ,cairo) ("dbus" ,dbus) ("dbus-glib" ,dbus-glib) ("glib" ,glib) @@ -264,6 +247,8 @@ standards.") ("pixman" ,pixman) ("pulseaudio" ,pulseaudio) ("mesa" ,mesa) + ("nspr" ,nspr) + ("nss" ,nss) ("unzip" ,unzip) ("yasm" ,yasm) ("zip" ,zip) @@ -290,19 +275,15 @@ standards.") "--with-system-libevent" "--with-system-libvpx" "--with-system-icu" + "--with-system-nspr" + "--with-system-nss" "--enable-system-pixman" - - ;; XXX unsure whether to use these. - ;; "--with-system-nspr" - ;; "--with-system-nss" - - ;; Fails with "configure: error: Library requirements - ;; (cairo-tee >= 1.10) not met". - ;; "--enable-system-cairo" + "--enable-system-cairo" + "--enable-system-ffi" ;; Fails with "configure: error: System ;; SQLite library is not compiled with - ;; SQLITE_SECURE_DELETE." + ;; SQLITE_ENABLE_UNLOCK_NOTIFY." ;; "--enable-system-sqlite" ;; Fails with "--with-system-png won't work because @@ -324,8 +305,7 @@ standards.") ;; to accelerate baseline JPEG compression/ ;; decompression", so we had better not use it ;; "--with-system-jpeg" - - "--enable-system-ffi") + ) #:phases (alist-replace |