cjs: update to 5.8.0.

This commit is contained in:
triallax 2023-06-19 20:23:12 +01:00 committed by classabbyamp
parent 95d20393e2
commit 8c3deac5f3
3 changed files with 65 additions and 14 deletions

View File

@ -0,0 +1,46 @@
From fb480aae4eff422c3acd275c0108e970eafcdcb9 Mon Sep 17 00:00:00 2001
From: Dominik Opyd <dominik.opyd@gmail.com>
Date: Wed, 8 Mar 2023 15:13:56 +0100
Subject: [PATCH] fix(build, tests): move `have_gtk4` to the appropriate place
---
installed-tests/js/meson.build | 10 +++++++---
meson.build | 4 ----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build
index 62a935d1..877d18df 100644
--- a/installed-tests/js/meson.build
+++ b/installed-tests/js/meson.build
@@ -203,9 +203,13 @@ endif
# during build should be run using dbus-run-session
dbus_tests = ['GDBus']
-if have_gtk4 and not get_option('skip_gtk_tests')
- # FIXME: find out why GTK4 tries to acquire a message bus
- dbus_tests += 'Gtk4'
+if not get_option('skip_gtk_tests')
+ have_gtk4 = dependency('gtk4', required: false).found()
+
+ if have_gtk4
+ # FIXME: find out why GTK4 tries to acquire a message bus
+ dbus_tests += 'Gtk4'
+ endif
endif
bus_config = files('../../test/test-bus.conf')
diff --git a/meson.build b/meson.build
index 7bde6204..2bb38fa5 100644
--- a/meson.build
+++ b/meson.build
@@ -679,10 +679,6 @@ endif
### Tests and test setups ######################################################
-if not get_option('skip_gtk_tests')
- have_gtk4 = dependency('gtk4', required: false).found()
-endif
-
subdir('installed-tests')
# Note: The test program in test/ needs to be ported

View File

@ -0,0 +1,11 @@
broken on musl
--- a/installed-tests/js/meson.build
--- b/installed-tests/js/meson.build
@@ -242,7 +242,6 @@ modules_tests = [
'Console',
'ESModules',
'AsyncMainloop',
- 'Encoding',
'GLibLogWriter',
'Global',
'Timers',

View File

@ -1,26 +1,20 @@
# Template file for 'cjs'
pkgname=cjs
version=5.4.1
version=5.8.0
revision=1
build_style=meson
build_helper=gir
# XXX: disable tests because they need dbus, X and GTK, same as gjs
configure_args="-Dskip_dbus_tests=true -Dskip_gtk_tests=true
-Dprofiler=disabled -Dinstalled_tests=false"
hostmakedepends="pkg-config gobject-introspection glib-devel dbus mozjs78-devel"
makedepends="dbus-glib-devel readline-devel gobject-introspection
gtk+3-devel mozjs78 mozjs78-devel"
build_helper="gir"
configure_args="-Dprofiler=disabled -Dinstalled_tests=false"
hostmakedepends="pkg-config glib-devel dbus xvfb-run gtk+3"
makedepends="readline-devel mozjs102-devel"
depends="gtk+3"
short_desc="Javascript for Cinnamon"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.0-or-later"
homepage="https://github.com/linuxmint/cjs"
distfiles="https://github.com/linuxmint/cjs/archive/refs/tags/${version}.tar.gz"
checksum=212fa302f15ea955af6dc87fdba3898f751d078df91cb84b0e6615d5a2b84e15
# ΧΧ A single test fails on x86_64, meson reports in the configure stage:
# meson.build:663: WARNING: Your libc does not have the C.UTF-8 locale and no
# other suitable UTF-8 fallback locale could be found. You can still build GJS,
# but some tests will fail.
make_check=extended
checksum=04e7c10a0a4d88ba446e6fb4f4788f732984e0318d775c646634a8619dfff7d2
make_check_pre="xvfb-run"
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
LDFLAGS+=" -latomic"