From 26e8ead0d0011252ff6e782ae963dd3dd82af0d2 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Thu, 23 Mar 2023 16:57:58 -0700 Subject: [PATCH] gjs: update to 1.76.0. --- ...44573672668e8bc8692afaaa7d8a73365660.patch | 49 +++++++++++++++++++ .../gjs/patches/ignore-encoding-test.patch | 8 +-- srcpkgs/gjs/template | 6 +-- 3 files changed, 56 insertions(+), 7 deletions(-) create mode 100644 srcpkgs/gjs/patches/072d44573672668e8bc8692afaaa7d8a73365660.patch diff --git a/srcpkgs/gjs/patches/072d44573672668e8bc8692afaaa7d8a73365660.patch b/srcpkgs/gjs/patches/072d44573672668e8bc8692afaaa7d8a73365660.patch new file mode 100644 index 000000000000..52743a99f6cf --- /dev/null +++ b/srcpkgs/gjs/patches/072d44573672668e8bc8692afaaa7d8a73365660.patch @@ -0,0 +1,49 @@ +From 83683d093c157828cf7787e53a32c586ae4e85d3 Mon Sep 17 00:00:00 2001 +From: Dominik Opyd +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 + diff --git a/srcpkgs/gjs/patches/ignore-encoding-test.patch b/srcpkgs/gjs/patches/ignore-encoding-test.patch index e0f9390a204c..98c42ad10109 100644 --- a/srcpkgs/gjs/patches/ignore-encoding-test.patch +++ b/srcpkgs/gjs/patches/ignore-encoding-test.patch @@ -1,11 +1,11 @@ broken on musl --- a/installed-tests/js/meson.build --- b/installed-tests/js/meson.build -@@ -243,7 +243,6 @@ - modules_tests = [ +@@ -242,7 +242,6 @@ modules_tests = [ 'Console', 'ESModules', + 'AsyncMainloop', - 'Encoding', 'GLibLogWriter', - ] - if build_cairo + 'Global', + 'Timers', diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template index 968f103d74b8..8e8698e3388a 100644 --- a/srcpkgs/gjs/template +++ b/srcpkgs/gjs/template @@ -1,6 +1,6 @@ # Template file for 'gjs' pkgname=gjs -version=1.74.1 +version=1.76.0 revision=1 build_style=meson build_helper="gir qemu" @@ -13,9 +13,9 @@ maintainer="Enno Boland " license="MIT, LGPL-2.0-or-later" 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-43/NEWS" +changelog="https://gitlab.gnome.org/GNOME/gjs/-/raw/gnome-44/NEWS" distfiles="${GNOME_SITE}/gjs/${version%.*}/gjs-${version}.tar.xz" -checksum=f21f9cd3337a672a44c7e64bf9a8d8ad77c1b88b952b2b6184c7af9b1f3ef459 +checksum=a63f156964b136053eab51ea013114e7d7c193b7518d28c040b6b02c3c933a6d make_check_pre="xvfb-run" if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then