gjs: update to 1.78.4.

This commit is contained in:
oreo639 2024-02-05 05:30:30 -08:00 committed by oreo639
parent 0ac525a24c
commit c091f26a84
2 changed files with 4 additions and 53 deletions

View file

@ -1,49 +0,0 @@
From 83683d093c157828cf7787e53a32c586ae4e85d3 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 6db887d22..1e953ceb7 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 3ac372a16..5c7703935 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
--
GitLab

View file

@ -1,12 +1,12 @@
# Template file for 'gjs'
pkgname=gjs
version=1.76.0
version=1.78.4
revision=1
build_style=meson
build_helper="gir qemu"
configure_args="-Dprofiler=disabled -Dinstalled_tests=false"
hostmakedepends="glib-devel pkg-config icu-libs"
makedepends="dbus-glib-devel mozjs102-devel readline-devel sysprof-devel"
makedepends="dbus-glib-devel mozjs115-devel readline-devel sysprof-devel"
checkdepends="xvfb-run cantarell-fonts"
short_desc="Mozilla-based javascript bindings for the GNOME platform"
maintainer="Enno Boland <gottox@voidlinux.org>"
@ -15,7 +15,7 @@ homepage="https://gitlab.gnome.org/GNOME/gjs"
#changelog="https://gitlab.gnome.org/GNOME/gjs/-/raw/master/NEWS"
changelog="https://gitlab.gnome.org/GNOME/gjs/-/raw/gnome-44/NEWS"
distfiles="${GNOME_SITE}/gjs/${version%.*}/gjs-${version}.tar.xz"
checksum=a63f156964b136053eab51ea013114e7d7c193b7518d28c040b6b02c3c933a6d
checksum=9aec7ab872c2050404907ae94f0ae7abec8a54bd9c894ddb5c2d0f51e932b9a1
make_check_pre="xvfb-run"
if [ "$XBPS_CHECK_PKGS" ]; then
@ -29,7 +29,7 @@ post_install() {
}
gjs-devel_package() {
depends="libgirepository-devel mozjs102-devel ${sourcepkg}>=${version}_${revision}"
depends="libgirepository-devel mozjs115-devel ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include