summary refs log tree commit diff
path: root/gnu/local.mk
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2018-09-21 03:28:03 -0400
committerMark H Weaver <mhw@netris.org>2018-09-21 07:16:02 -0400
commite67ad5532f76b53e955149da2f1e237696ff0893 (patch)
tree179f00c315bc610804b310b17e5a3c60a5f0b7bf /gnu/local.mk
parentc5327efb97208df569b4682ef5bfe4ac825d1c4f (diff)
downloadguix-e67ad5532f76b53e955149da2f1e237696ff0893.tar.gz
gnu: icecat: Update to 60.2.0-gnu1 (pre-release).
* gnu/packages/gnuzilla.scm (icecat): Update to 60.2.0-gnu1.
[source]: Download pre-release from alpha.gnu.org.  Remove obsolete patches.
Comment out the code to delete the bundled copies of libevent, cairo,
harfbuzz, and graphite2.
[inputs]: Use the latest ffmpeg.  Comment out libevent, cairo, harfbuzz, and
graphite2.
[native-inputs]: Add rust and cargo.
[arguments]: Remove --enable-gio and --disable-gnomeui.  Add --disable-stylo.
Comment out --with-system-{libevent,harfbuzz,graphite2}, --enable-system-cairo.
Import %cargo-build-system-modules.  Add 'patch-cargo-checksums' phase.
* gnu/packages/patches/icecat-CVE-2018-5157-and-CVE-2018-5158.patch,
gnu/packages/patches/icecat-bug-1413868-pt1.patch: Delete files.
* gnu/local.mk (dist_patch_DATA): Remove them.
Diffstat (limited to 'gnu/local.mk')
-rw-r--r--gnu/local.mk2
1 files changed, 0 insertions, 2 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index 9c69fd4f35..4097ad5fcd 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -811,8 +811,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/hurd-fix-eth-multiplexer-dependency.patch        \
   %D%/packages/patches/hydra-disable-darcs-test.patch		\
   %D%/packages/patches/icecat-avoid-bundled-libraries.patch	\
-  %D%/packages/patches/icecat-bug-1413868-pt1.patch		\
-  %D%/packages/patches/icecat-CVE-2018-5157-and-CVE-2018-5158.patch	\
   %D%/packages/patches/icecat-use-system-graphite2.patch	\
   %D%/packages/patches/icecat-use-system-harfbuzz.patch		\
   %D%/packages/patches/icedtea-6-hotspot-gcc-segfault-workaround.patch  \