gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gjs: 1.86.0 → 1.88.0

Browse Source 
https://gitlab.gnome.org/GNOME/gjs/-/compare/1.86.0...1.88.0
This commit is contained in:
Vitor Pavan
2026-05-06 23:03:27 +08:00
committed by Bobby Rong
parent e5dee27a64
commit d1a8262825
5 changed files with 26 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/gj/gjs/disable-introspection-test.patch
+6 -8
View File
@@ -1,12 +1,10 @@
diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build
index 07759690..43c87c59 100644
--- a/installed-tests/js/meson.build
+++ b/installed-tests/js/meson.build
@@ -34,7 +34,6 @@ jasmine_tests = [
@@ -37,7 +37,6 @@ jasmine_tests = [
'GObjectInterface',
'GObjectValue',
'GTypeClass',
'Importer',
'Importer2',
- 'Introspection',
'Lang',
'LegacyByteArray',
'LegacyClass',
'Namespace',
'ParamSpec',
'Print',
pkgs/by-name/gj/gjs/disable-umlaut-test.patch
+2 -4
View File
@@ -1,10 +1,8 @@
diff --git a/installed-tests/js/testGIMarshalling.js b/installed-tests/js/testGIMarshalling.js
index b94aa7c8..8f79fe71 100644
--- a/installed-tests/js/testGIMarshalling.js
+++ b/installed-tests/js/testGIMarshalling.js
@@ -2931,7 +2931,7 @@ describe('Filename tests', function () {
@@ -3013,7 +3013,7 @@ describe('Filename tests', function () {
});
it('various types of path existing', function () {
- const paths = ['foo-2', 'öäü-3'];
+ const paths = ['foo-2'];
pkgs/by-name/gj/gjs/fix-paths.patch
+1 -3
View File
@@ -1,12 +1,10 @@
diff --git a/installed-tests/debugger-test.sh b/installed-tests/debugger-test.sh
index 0d118490..54c5507e 100755
--- a/installed-tests/debugger-test.sh
+++ b/installed-tests/debugger-test.sh
@@ -6,7 +6,7 @@
if test "$GJS_USE_UNINSTALLED_FILES" = "1"; then
gjs="$TOP_BUILDDIR/gjs-console"
else
- gjs=gjs-console
- gjs="gjs-console"
+ gjs=@gjsConsole@
fi
pkgs/by-name/gj/gjs/installed-tests-path.patch
+13 -23
View File
@@ -1,5 +1,3 @@
diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build
index 98475f7d..942d9eca 100644
--- a/installed-tests/js/meson.build
+++ b/installed-tests/js/meson.build
@@ -10,7 +10,7 @@ jsunit_resources_files = gnome.compile_resources('jsunit-resources',
@@ -20,7 +18,7 @@ index 98475f7d..942d9eca 100644
}
configure_file(configuration: test_description_subst,
input: '../minijasmine.test.in',
@@ -122,7 +122,7 @@ foreach test : dbus_tests
@@ -122,7 +122,7 @@ endif
dbus_test_description_subst = {
'name': 'testGDBus.js',
@@ -29,7 +27,7 @@ index 98475f7d..942d9eca 100644
}
configure_file(
configuration: dbus_test_description_subst,
@@ -159,7 +159,7 @@ foreach test : modules_tests
@@ -166,7 +166,7 @@ foreach test : modules_tests
esm_test_description_subst = {
'name': 'test@0@.js'.format(test),
@@ -37,9 +35,7 @@ index 98475f7d..942d9eca 100644
+ 'installed_tests_execdir': installed_tests_execdir,
}
configure_file(configuration: esm_test_description_subst,
input: '../minijasmine-module.test.in',
diff --git a/installed-tests/meson.build b/installed-tests/meson.build
index 7a7c48ab..52508c2c 100644
input: '../minijasmine-legacy-importer.test.in',
--- a/installed-tests/meson.build
+++ b/installed-tests/meson.build
@@ -34,7 +34,7 @@ foreach test : simple_tests
@@ -51,7 +47,7 @@ index 7a7c48ab..52508c2c 100644
}
configure_file(configuration: test_description_subst,
input: 'script.test.in', output: 'test@0@.sh.test'.format(test),
@@ -123,7 +123,7 @@ foreach test : debugger_tests
@@ -88,7 +88,7 @@ foreach test : debugger_tests
test_description_subst = {
'name': '@0@.debugger'.format(test),
@@ -60,19 +56,15 @@ index 7a7c48ab..52508c2c 100644
}
configure_file(configuration: test_description_subst,
input: 'debugger.test.in',
diff --git a/installed-tests/script.test.in b/installed-tests/script.test.in
index debefc4c..96a91b88 100644
--- a/installed-tests/script.test.in
+++ b/installed-tests/script.test.in
@@ -3,5 +3,5 @@
@@ -122,7 +122,7 @@ foreach test : module_debugger_tests
[Test]
Type=session
-Exec=sh @prefix@/@installed_tests_execdir@/scripts/@name@
+Exec=sh @installed_tests_execdir@/scripts/@name@
Output=TAP
diff --git a/meson.build b/meson.build
index bbfe8bc8..e6f87dc3 100644
test_description_subst = {
'name': '@0@.debugger'.format(filename),
- 'installed_tests_execdir': prefix / installed_tests_execdir,
+ 'installed_tests_execdir': installed_tests_execdir,
}
configure_file(configuration: test_description_subst,
input: 'debugger.test.in',
--- a/meson.build
+++ b/meson.build
@@ -25,8 +25,8 @@ datadir = get_option('datadir')
@@ -86,7 +78,7 @@ index bbfe8bc8..e6f87dc3 100644
### Check for conflicting build options ########################################
@@ -577,9 +577,9 @@ install_data('installed-tests/extra/gjs.supp', install_dir: gjsjsdir / 'valgrind
@@ -605,9 +605,9 @@ install_data('installed-tests/extra/gjs.supp', install_dir: gjsjsdir / 'valgrind
install_data('installed-tests/extra/lsan.supp', install_dir: gjsjsdir / 'lsan')
if get_option('installed_tests')
@@ -98,8 +90,6 @@ index bbfe8bc8..e6f87dc3 100644
endif
### Generate pkg-config file ###################################################
diff --git a/meson_options.txt b/meson_options.txt
index fe425efd..29325756 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -24,3 +24,5 @@ option('skip_gtk_tests', type: 'boolean', value: false,
pkgs/by-name/gj/gjs/package.nix
+4 -4
View File
@@ -8,7 +8,6 @@
pkg-config,
gnome,
gtk3,
gtk4,
atk,
gobject-introspection,
spidermonkey_140,
@@ -31,7 +30,8 @@
let
testDeps = [
gtk3
gtk4
# FIXME: Gtk4Warnings fails
# gtk4
atk
pango.out
gdk-pixbuf
@@ -41,7 +41,7 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "gjs";
version = "1.86.0";
version = "1.88.0";
outputs = [
"out"
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor finalAttrs.version}/gjs-${finalAttrs.version}.tar.xz";
hash = "sha256-Y0SPeleATUwqjQx/XpDiJNBNTrLVYBQsB2xlqO2gB5k=";
hash = "sha256-MKC58zF+jmCxiW2ykDxw6LDNM9+VPDKHVYA6dRkdxFM=";
};
patches = [