cjs: update to 6.4.0
This commit is contained in:
parent
d59696191e
commit
5f4e34531a
2 changed files with 3 additions and 49 deletions
|
@ -1,46 +0,0 @@
|
||||||
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
|
|
|
@ -1,19 +1,19 @@
|
||||||
# Template file for 'cjs'
|
# Template file for 'cjs'
|
||||||
pkgname=cjs
|
pkgname=cjs
|
||||||
version=5.8.0
|
version=6.4.0
|
||||||
revision=1
|
revision=1
|
||||||
build_style=meson
|
build_style=meson
|
||||||
build_helper="gir"
|
build_helper="gir"
|
||||||
configure_args="-Dprofiler=disabled -Dinstalled_tests=false"
|
configure_args="-Dprofiler=disabled -Dinstalled_tests=false"
|
||||||
hostmakedepends="pkg-config glib-devel dbus xvfb-run gtk+3"
|
hostmakedepends="pkg-config glib-devel dbus xvfb-run gtk+3"
|
||||||
makedepends="readline-devel mozjs102-devel"
|
makedepends="readline-devel mozjs115-devel"
|
||||||
depends="gtk+3"
|
depends="gtk+3"
|
||||||
short_desc="Javascript for Cinnamon"
|
short_desc="Javascript for Cinnamon"
|
||||||
maintainer="Orphaned <orphan@voidlinux.org>"
|
maintainer="Orphaned <orphan@voidlinux.org>"
|
||||||
license="LGPL-2.0-or-later"
|
license="LGPL-2.0-or-later"
|
||||||
homepage="https://github.com/linuxmint/cjs"
|
homepage="https://github.com/linuxmint/cjs"
|
||||||
distfiles="https://github.com/linuxmint/cjs/archive/refs/tags/${version}.tar.gz"
|
distfiles="https://github.com/linuxmint/cjs/archive/refs/tags/${version}.tar.gz"
|
||||||
checksum=04e7c10a0a4d88ba446e6fb4f4788f732984e0318d775c646634a8619dfff7d2
|
checksum=55d730fdb331a9778a0d569e45c968ac68c8f218876e5d2d475cb5af21b6935a
|
||||||
make_check_pre="xvfb-run"
|
make_check_pre="xvfb-run"
|
||||||
|
|
||||||
pre_configure() {
|
pre_configure() {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue