GNOME.org
 

[gtk-osx] Update gtk-osx-javascript.modules

commit 34e053e5f8480aeecec97d940ad8bcf333330b68
Author: John Ralls <jralls ceridwen us>
Date:   Mon Apr 12 11:58:23 2021 -0700

    Update gtk-osx-javascript.modules

 jhbuildrc-gtk-osx                                 |  1 +
 modulesets-stable/gtk-osx-javascript.modules      | 45 ++++++++++++-----------
 patches/firefox78-rust-manifest-and-max-sdk.patch | 26 +++++++++++++
 patches/gjs-remove-js::CodeCoverage.patch         | 21 +++++++++++
 4 files changed, 72 insertions(+), 21 deletions(-)
---
diff --git a/jhbuildrc-gtk-osx b/jhbuildrc-gtk-osx
index f6903a7c..97255caf 100644
--- a/jhbuildrc-gtk-osx
+++ b/jhbuildrc-gtk-osx
@@ -622,6 +622,7 @@ else:
 
 module_extra_env["pygtk"] = {'PYTHON':os.path.join(prefix, 'bin', 'python2')}
 module_extra_env["pygobject2"] = {'PYTHON':os.path.join(prefix, 'bin', 'python2')}
+module_extra_env["spidermonkey"] = {'AUTOCONF':'autoconf'}
 # Unset this so we don't mess with the check for not starting
 # recursively.
 os.unsetenv("JHB")
diff --git a/modulesets-stable/gtk-osx-javascript.modules b/modulesets-stable/gtk-osx-javascript.modules
index fcab60b3..39e096d7 100644
--- a/modulesets-stable/gtk-osx-javascript.modules
+++ b/modulesets-stable/gtk-osx-javascript.modules
@@ -5,7 +5,8 @@
 
   <repository type="tarball" name="ftp.gnome.org" default="yes"
               href="http://ftp.gnome.org/pub/GNOME/sources/"/>
-  <repository type="tarball" name="mozilla" href="ftp://ftp.mozilla.org/pub/"/>
+  <repository type="tarball" name="mozilla"
+              href="https://ftp.mozilla.org/pub/"/>
 
   <metamodule id="meta-gtk-osx-javascript">
     <dependencies>
@@ -18,38 +19,40 @@
     </after>
   </metamodule>
 
-  <autotools id="gjs" autogenargs="--enable-installed-tests">
-    <branch version="1.48.1" module="gjs/1.48/gjs-1.48.1.tar.xz"
-            hash="sha256:21198950472c3c8f4a4679b0292c663faed04b07ee5de026bfd19eaa4ed15a84">
+  <meson id="gjs" mesonargs="-Dinstalled_tests=true -Dskip_dbus_tests=true -Dskip_gtk_tests=true" >
+    <branch version="1.68.0" module="gjs/1.68/gjs-1.68.0.tar.xz"
+            hash="sha256:f00e74a00e81ab61bb92669e0f1c8bb613cc019586097f06aed0572efcaf1aef">
+      <!-- Code coverage depends on a non-existant function in a non-existant header. -->
+      <patch 
file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/gjs-remove-js::CodeCoverage.patch"; strip="1"/>
+
     </branch>
     <dependencies>
       <dep package="gobject-introspection"/>
-      <dep package="js24"/>
+      <dep package="spidermonkey"/>
     </dependencies>
-  </autotools>
+  </meson>
 
-  <autotools id="js24" autogen-sh="configure"
-             autogenargs="--with-system-nspr --with-system-zlib --enable-system-ffi --enable-threadsafe">
-    <branch repo="mozilla" module="js/mozjs-24.2.0.tar.bz2" version="24.2.0"
-            checkoutdir="js24-24.2.0" source-subdir="js/src"
-            hash="sha1:ce779081cc11bd0c871c6f303fc4a0091cf4fe66"/>
+  <autotools id="spidermonkey" autogen-sh="configure"
+             autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s %(autogenargs)s"
+             autogenargs="--with-system-nspr --with-system-icu --disable-jemalloc --with-intl-api 
--enable-optimize --enable-coverage">
+    <branch repo="mozilla" version="78.1.0" 
+            checkoutdir="firefox-78.1.0" source-subdir="js/src"
+            module="firefox/releases/78.1.0esr/firefox-78.1.0esr.source.tar.xz" 
+            hash="sha256:3600a396d9312c5e9f637b267926ca4771d84a56b26b960cc7d72e98683b64a2">
+      <patch 
file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/firefox78-rust-manifest-and-max-sdk.patch"; 
strip="1"/>
+    </branch>
     <dependencies>
       <dep package="libffi"/>
+      <dep package="icu"/>
       <dep package="nspr"/>
     </dependencies>
-    <after>
-      <dep package="python2"/>
-      <dep package="zlib"/>
-    </after>
   </autotools>
 
-  <autotools id="nspr" autogen-sh="mozilla/nsprpub/configure"
+  <autotools id="nspr" autogen-sh="configure"
              autogenargs="--enable-64bit" check-target="false">
-    <branch repo="mozilla" version="4.14"
-            module="nspr/releases/v4.14/src/nspr-4.14.tar.gz">
-      <patch file="nspr.autogen.patch" strip="1"/>
-      <patch file="nspr.config_64bits.patch" strip="1"/>
-      <patch file="nspr.hostcompiler.patch" strip="1"/>
+    <branch repo="mozilla" version="4.30" source-subdir="nspr"
+            module="nspr/releases/v4.30/src/nspr-4.30.tar.gz"
+            href="sha256:8d4cd8f8409484dc4c3d31e180354bfc506573eccf86cd691106a1ef7edc913b">
     </branch>
   </autotools>
 
diff --git a/patches/firefox78-rust-manifest-and-max-sdk.patch 
b/patches/firefox78-rust-manifest-and-max-sdk.patch
new file mode 100644
index 00000000..7823a1fe
--- /dev/null
+++ b/patches/firefox78-rust-manifest-and-max-sdk.patch
@@ -0,0 +1,26 @@
+--- a/Cargo.toml       2020-07-22 10:56:54.000000000 -0700
++++ b/Cargo.toml       2021-04-06 09:49:37.000000000 -0700
+@@ -68,8 +68,8 @@
+ libudev-sys = { path = "dom/webauthn/libudev-sys" }
+ packed_simd = { git = "https://github.com/hsivonen/packed_simd";, 
rev="3541e3818fdc7c2a24f87e3459151a4ce955a67a" }
+ rlbox_lucet_sandbox = { git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/";, 
rev="d510da5999a744c563b0acd18056069d1698273f" }
+-nix = { git = "https://github.com/shravanrn/nix/";, branch = "r0.13.1", 
rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
+-spirv_cross = { git = "https://github.com/kvark/spirv_cross";, branch = "wgpu3", rev = 
"20191ad2f370afd6d247edcb9ff9da32d3bedb9c" }
++nix = { git = "https://github.com/shravanrn/nix/";, rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
++spirv_cross = { git = "https://github.com/kvark/spirv_cross";, rev = 
"20191ad2f370afd6d247edcb9ff9da32d3bedb9c" }
+ # failure's backtrace feature might break our builds, see bug 1608157.
+ failure = { git = "https://github.com/badboy/failure";, rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
+ failure_derive = { git = "https://github.com/badboy/failure";, rev = 
"64af847bc5fdcb6d2438bec8a6030812a80519a5" }
+--- a/build/moz.configure/toolchain.configure  2020-07-22 10:56:54.000000000 -0700
++++ b/build/moz.configure/toolchain.configure  2021-04-05 17:53:37.000000000 -0700
+@@ -141,7 +141,7 @@
+     @imports(_from='biplist', _import='readPlist')
+     def macos_sdk(sdk, host):
+         sdk_min_version = Version('10.11')
+-        sdk_max_version = Version('10.15.4')
++        sdk_max_version = Version('11.1')
+ 
+         if sdk:
+             sdk = sdk[0]
+
+
diff --git a/patches/gjs-remove-js::CodeCoverage.patch b/patches/gjs-remove-js::CodeCoverage.patch
new file mode 100644
index 00000000..f33da6fe
--- /dev/null
+++ b/patches/gjs-remove-js::CodeCoverage.patch
@@ -0,0 +1,21 @@
+diff -u /Users/john/Development/gtk-build/gtk-stable-10.13-x86_64/src/gjs-1.68.0/gjs/coverage.cpp\~ 
/Users/john/Development/gtk-build/gtk-stable-10.13-x86_64/src/gjs-1.68.0/gjs/coverage.cpp
+--- a/gjs/coverage.cpp 2021-03-20 09:28:52.000000000 -0700
++++ b/gjs/coverage.cpp 2021-04-12 11:51:39.000000000 -0700
+@@ -19,7 +19,6 @@
+ #include <js/TypeDecls.h>
+ #include <js/Utility.h>  // for UniqueChars
+ #include <js/Value.h>
+-#include <js/experimental/CodeCoverage.h>  // for EnableCodeCoverage
+ #include <jsapi.h>        // for JSAutoRealm, JS_SetPropertyById
+ #include <jsfriendapi.h>  // for GetCodeCoverageSummary
+ 
+@@ -496,6 +495,5 @@
+  * Since: 1.66
+  */
+ void gjs_coverage_enable() {
+-    js::EnableCodeCoverage();
+-    s_coverage_enabled = true;
++    s_coverage_enabled = false;
+ }
+
+Diff finished.  Mon Apr 12 11:53:49 2021
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]