From 8d284413687183a1eb71eafa066f43f1b3fc7101 Mon Sep 17 00:00:00 2001
From: Rasmus Thomsen <rasmus.thomsen@protonmail.com>
Date: Tue, 8 Jan 2019 19:01:30 +0100
Subject: [PATCH] mozjs60: update to 60.4.0.

---
 .../patches/add-exposeToActiveJS.patch        | 24 -------------------
 srcpkgs/mozjs60/template                      | 15 ++++--------
 2 files changed, 4 insertions(+), 35 deletions(-)
 delete mode 100644 srcpkgs/mozjs60/patches/add-exposeToActiveJS.patch

diff --git a/srcpkgs/mozjs60/patches/add-exposeToActiveJS.patch b/srcpkgs/mozjs60/patches/add-exposeToActiveJS.patch
deleted file mode 100644
index 7736e4ce689..00000000000
--- a/srcpkgs/mozjs60/patches/add-exposeToActiveJS.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Upstream: Yes
-Reason: Required for GJS
-# HG changeset patch
-# User Philip Chimento <philip.chimento@gmail.com>
-# Date 1527544053 25200
-#      Mon May 28 14:47:33 2018 -0700
-# Node ID a50e7374d0952b893f843e9d21d13d5b7ec8564c
-# Parent  a466172aed4bc2afc21169b749b8068a4b98c93f
-Bug 1464912 - Add exposeToActiveJS specialization for JSString. r=sfink
-
-diff --git a/js/public/RootingAPI.h b/js/public/RootingAPI.h
---- a/js/public/RootingAPI.h
-+++ b/js/public/RootingAPI.h
-@@ -719,6 +719,10 @@ struct BarrierMethods<JSString*>
-     static void postBarrier(JSString** vp, JSString* prev, JSString* next) {
-         JS::HeapStringPostBarrier(vp, prev, next);
-     }
-+    static void exposeToJS(JSString* v) {
-+        if (v)
-+            js::gc::ExposeGCThingToActiveJS(JS::GCCellPtr(v));
-+    }
- };
- 
- // Provide hash codes for Cell kinds that may be relocated and, thus, not have
diff --git a/srcpkgs/mozjs60/template b/srcpkgs/mozjs60/template
index 61a51029426..ca3ea884bb0 100644
--- a/srcpkgs/mozjs60/template
+++ b/srcpkgs/mozjs60/template
@@ -1,19 +1,18 @@
 # Template file for 'mozjs60'
 pkgname=mozjs60
-reverts="60.2.2_1"
-version=60.0.2
-revision=6
+version=60.4.0
+revision=1
 wrksrc="firefox-${version}"
 build_wrksrc=js/src
 build_style=gnu-configure
 hostmakedepends="perl python pkg-config automake autoconf213 autoconf-archive"
 makedepends="icu-devel libffi-devel nspr-devel python-devel readline-devel zlib-devel"
 short_desc="Mozilla JavaScript interpreter and library (60.x series)"
+maintainer="Rasmus Thomsen <rasmus.thomsen@protonmail.com>"
 license="MPL-2.0"
-maintainer="Rasmus Thomsen <cogitri@exherbo.org>"
 homepage="https://www.mozilla.org/js/"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=4c629edac14e15c41b04320b0f66a46f25537661324cdc0ed30dc0799d7708a0
+checksum=205258548c3f245d42377b338f0db1272df39489d61305c39b83e52750ebff85
 patch_args="-Np1"
 
 case "$XBPS_TARGET_MACHINE" in
@@ -46,12 +45,6 @@ do_check() {
 	dist/bin/jsapi-tests
 }
 
-post_install() {
-	# temp fix for mozjs60 not installing headers into the right place
-	mkdir $DESTDIR/usr/include/mozjs-60
-	mv $DESTDIR/usr/include/{double-conversion,js,mozilla,*.h} $DESTDIR/usr/include/mozjs-60/
-}
-
 mozjs60-devel_package() {
 	depends="nspr-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"