gjs: 1.84.2 → 1.85.90

https://gitlab.gnome.org/GNOME/gjs/-/compare/1.84.2...1.85.90

Co-authored-by: dish <pyrox@pyrox.dev>
Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>

pkgs/by-name/gj/gjs/disable-introspection-test.patch

@@ -2,7 +2,7 @@ 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
-@@ -123,7 +123,6 @@ jasmine_tests = [
+@@ -34,7 +34,6 @@ jasmine_tests = [
      'GTypeClass',
      'Importer',
      'Importer2',

pkgs/by-name/gj/gjs/fix-paths.patch

@@ -2,7 +2,7 @@ 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
-@@ -3,7 +3,7 @@
+@@ -6,7 +6,7 @@
  if test "$GJS_USE_UNINSTALLED_FILES" = "1"; then
      gjs="$TOP_BUILDDIR/gjs-console"
  else

pkgs/by-name/gj/gjs/installed-tests-path.patch

@@ -11,7 +11,7 @@ index 98475f7d..942d9eca 100644
      ],
      include_directories: top_include,
      install: get_option('installed_tests'), install_dir: installed_tests_execdir)
-@@ -82,7 +82,7 @@ foreach test : jasmine_tests
+@@ -90,7 +90,7 @@ foreach test : jasmine_tests
  
      test_description_subst = {
          'name': 'test@0@.js'.format(test),
@@ -20,16 +20,16 @@ index 98475f7d..942d9eca 100644
      }
      configure_file(configuration: test_description_subst,
          input: '../minijasmine.test.in',
-@@ -125,7 +125,7 @@ foreach test : dbus_tests
+@@ -122,7 +122,7 @@ foreach test : dbus_tests
  
-     dbus_test_description_subst = {
-         'name': 'test@0@.js'.format(test),
--        'installed_tests_execdir': prefix / installed_tests_execdir,
-+        'installed_tests_execdir': installed_tests_execdir,
-     }
-     configure_file(
-         configuration: dbus_test_description_subst,
-@@ -163,7 +163,7 @@ foreach test : modules_tests
+ dbus_test_description_subst = {
+     'name': 'testGDBus.js',
+-    'installed_tests_execdir': prefix / installed_tests_execdir,
++    'installed_tests_execdir': installed_tests_execdir,
+ }
+ configure_file(
+     configuration: dbus_test_description_subst,
+@@ -159,7 +159,7 @@ foreach test : modules_tests
  
      esm_test_description_subst = {
          'name': 'test@0@.js'.format(test),
@@ -42,7 +42,7 @@ diff --git a/installed-tests/meson.build b/installed-tests/meson.build
 index 7a7c48ab..52508c2c 100644
 --- a/installed-tests/meson.build
 +++ b/installed-tests/meson.build
-@@ -30,7 +30,7 @@ foreach test : simple_tests
+@@ -34,7 +34,7 @@ foreach test : simple_tests
  
      test_description_subst = {
          'name': 'test@0@.sh'.format(test),
@@ -51,7 +51,7 @@ index 7a7c48ab..52508c2c 100644
      }
      configure_file(configuration: test_description_subst,
          input: 'script.test.in', output: 'test@0@.sh.test'.format(test),
-@@ -85,7 +85,7 @@ foreach test : debugger_tests
+@@ -123,7 +123,7 @@ foreach test : debugger_tests
  
      test_description_subst = {
          'name': '@0@.debugger'.format(test),

pkgs/by-name/gj/gjs/package.nix

@@ -1,5 +1,6 @@
 {
   fetchurl,
+  fetchpatch,
   lib,
   stdenv,
   meson,
@@ -11,7 +12,7 @@
   gtk4,
   atk,
   gobject-introspection,
-  spidermonkey_128,
+  spidermonkey_140,
   pango,
   cairo,
   readline,
@@ -41,7 +42,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "gjs";
-  version = "1.84.2";
+  version = "1.85.90";
 
   outputs = [
     "out"
@@ -51,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor finalAttrs.version}/gjs-${finalAttrs.version}.tar.xz";
-    hash = "sha256-NRQu3zRXBWNjACkew6fVg/FJaf8/rg/zD0qVseZ0AWY=";
+    hash = "sha256-tFVADxNLEs3MtPO92yPMZOqxlY0cn0hLsKQlk/t4MmU=";
   };
 
   patches = [
@@ -70,6 +71,20 @@ stdenv.mkDerivation (finalAttrs: {
     # not ok 796 Filename tests various types of path existing
     # Message: Error opening file “/build/.UGHEA3/öäü-3”: Invalid or incomplete multibyte or wide character in /build/gjs-1.84.2/build/../installed-tests/js/testGIMarshalling.js (line 2937)
     ./disable-umlaut-test.patch
+
+    # Fix gjs:JS / Package test
+    # https://gitlab.gnome.org/GNOME/gjs/-/issues/711
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/gjs/-/commit/054f78c756b631c347c6f64ab5b7349331f5f420.patch";
+      hash = "sha256-gnOD+WU+JTzetnyGyGJKQZbaLX22yZuBhCmhJd2Hha8=";
+    })
+
+    # Fix gjs:Scripts / Gtk4Warnings test
+    # https://gitlab.gnome.org/GNOME/gjs/-/issues/712
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/gjs/-/commit/48b00ae16d97ae213dbaef6dee8ffd56e1667a64.patch";
+      hash = "sha256-u7P/dV9mtx3AldrnbDhGGMVQ61GmD54TXFhS4FRh4yc=";
+    })
   ];
 
   nativeBuildInputs = [
@@ -90,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: {
     cairo
     readline
     libsysprof-capture
-    spidermonkey_128
+    spidermonkey_140
   ];
 
   nativeCheckInputs = [