From 7be8ab8ab8495df0229677cace3727e22d3f02f4 Mon Sep 17 00:00:00 2001
From: streaksu <assemblyislaw@gmail.com>
Date: Sun, 22 Mar 2020 15:03:09 +0100
Subject: [PATCH] gjs: update to 1.63.3

Closes: #20283 [via git-merge-pr]
---
 common/shlibs        |  6 +++---
 srcpkgs/gjs/template | 34 ++++++++++++++--------------------
 2 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 767166a1026..1a3a3acf45c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -830,9 +830,9 @@ libtotem.so.0 libtotem-3.6.2_1
 libclutter-1.0.so.0 clutter-1.14.0_1
 libavfs.so.0 libavfs-1.0.5_1
 libdmr.so.0.1 deepin-movie-reborn-3.2.5_1
-libgjs.so.0 gjs-0.7.11_1
-libgjs-gi.so gjs-0.7.11_1
-libgjs-dbus.so.0 gjs-0.7.11_1
+libgjs.so.0 gjs-1.63.3_1
+libgjs-gi.so gjs-1.63.3_1
+libgjs-dbus.so.0 gjs-1.63.3_1
 libtelepathy-glib.so.0 telepathy-glib-0.15.5_1
 libaccountsservice.so.0 accountsservice-0.6.4_1
 libfolks.so.25 folks-0.9.5_1
diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template
index f17eac8a1f2..4964711bdb7 100644
--- a/srcpkgs/gjs/template
+++ b/srcpkgs/gjs/template
@@ -1,34 +1,28 @@
 # Template file for 'gjs'
 pkgname=gjs
-version=1.58.1
+version=1.63.3
 revision=1
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--without-dbus-tests"
+build_style=meson
+build_helper="gir qemu"
+configure_args="-Dskip_dbus_tests=true -Dskip_gtk_tests=true
+ -Dprofiler=disabled" # Disable test because they need X and GTK.
 hostmakedepends="glib-devel pkg-config"
-makedepends="dbus-glib-devel mozjs60-devel readline-devel"
+makedepends="dbus-glib-devel mozjs60-devel readline-devel sysprof-devel"
 short_desc="Mozilla-based javascript bindings for the GNOME platform"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT, LGPL-2.0-or-later"
 homepage="https://wiki.gnome.org/action/show/Projects/Gjs"
 changelog="https://gitlab.gnome.org/GNOME/gjs/blob/gnome-3-30/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b4df16ea87dc78c0df5412f9134efb14f7c510773aee117d5ad4cda75646c6f5
+checksum=09f232c20e986c368e93394b2c10dc21b6fedacfff7de926f0b221ea5b933b5f
 
-case "$XBPS_TARGET_MACHINE" in
-	*-musl) configure_args+=" --disable-profiler" # https://gitlab.gnome.org/GNOME/gjs/issues/132
-esac
-
-post_configure() {
-	# Cross compilation gets this result wrong
-	vsed -e "s|^#define HAVE_DEBUG_SPIDERMONKEY.*|/* #undef HAVE_DEBUG_SPIDERMONKEY */|g" \
-		 -i config.h
-}
-
-
-do_check() {
-	# GJS's test try to use Cairo and GTK+ which need X
-	:
+pre_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		vsed -i meson.build -e"/subdir('installed-tests')/d"
+	fi
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		grep -rlw "<sys/signal.h>" | xargs sed -i -e"s;<sys/signal.h>;<signal.h>;"
+	fi
 }
 
 post_install() {