[gnome-build-meta/alatiera/43-alpha: 1/2] patch polkit to build against mozjs again

[Jordan Petridis <jpetridis src gnome org>]

commit 63ff4af69ce2f70dc4f06264997df9e03c355c8f
Author: Jordan Petridis <jordan centricular com>
Date:   Tue Jul 19 10:26:10 2022 +0300

    patch polkit to build against mozjs again
    
    The duktape backend is causing regressions with
    rules that have been accidently using es5+ js
    syntax.

 elements/freedesktop-sdk.bst                       |   2 +
 elements/sdk/gjs.bst                               |   2 +-
 elements/sdk/mozjs.bst                             |  60 --------
 ...onents-polkit.bst-build-with-duktape-inst.patch | 155 +++++++++++++++++++++
 4 files changed, 158 insertions(+), 61 deletions(-)
---
diff --git a/elements/freedesktop-sdk.bst b/elements/freedesktop-sdk.bst
index 0d30a27f1..b0dc185c3 100644
--- a/elements/freedesktop-sdk.bst
+++ b/elements/freedesktop-sdk.bst
@@ -4,6 +4,8 @@ sources:
   url: gitlab:freedesktop-sdk/freedesktop-sdk.git
   track: master
   track-tags: true
+- kind: patch
+  path: files/freedesktop-sdk/0001-Revert-components-polkit.bst-build-with-duktape-inst.patch
 config:
   options:
     target_arch: '%{arch}'
diff --git a/elements/sdk/gjs.bst b/elements/sdk/gjs.bst
index ef46c2f7a..d0299457e 100644
--- a/elements/sdk/gjs.bst
+++ b/elements/sdk/gjs.bst
@@ -12,9 +12,9 @@ build-depends:
 depends:
 - sdk/gobject-introspection.bst
 - sdk/gtk+-3.bst
-- sdk/mozjs.bst
 - freedesktop-sdk.bst:components/cairo.bst
 - freedesktop-sdk.bst:components/dbus.bst
+- freedesktop-sdk.bst:components/mozjs.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
 variables:
   meson-local: >-
diff --git a/files/freedesktop-sdk/0001-Revert-components-polkit.bst-build-with-duktape-inst.patch 
b/files/freedesktop-sdk/0001-Revert-components-polkit.bst-build-with-duktape-inst.patch
new file mode 100644
index 000000000..012ca5ba6
--- /dev/null
+++ b/files/freedesktop-sdk/0001-Revert-components-polkit.bst-build-with-duktape-inst.patch
@@ -0,0 +1,155 @@
+From 56f20188379a613cf99825b8e31819fc207bd526 Mon Sep 17 00:00:00 2001
+From: Jordan Petridis <jordan centricular com>
+Date: Mon, 18 Jul 2022 05:46:27 +0300
+Subject: [PATCH] Revert "components/polkit.bst: build with duktape instead of
+ mozjs"
+
+This reverts commit 23a0823ae61b557408f1f92a40cd1b36c6d3118a.
+---
+ elements/components.bst         |  2 +-
+ elements/components/duktape.bst | 17 ---------
+ elements/components/mozjs.bst   | 66 +++++++++++++++++++++++++++++++++
+ elements/components/polkit.bst  |  4 +-
+ 4 files changed, 69 insertions(+), 20 deletions(-)
+ delete mode 100644 elements/components/duktape.bst
+ create mode 100644 elements/components/mozjs.bst
+
+diff --git a/elements/components.bst b/elements/components.bst
+index c65afad1a..abd4f8b27 100644
+--- a/elements/components.bst
++++ b/elements/components.bst
+@@ -63,7 +63,6 @@ depends:
+ - components/dosfstools.bst
+ - components/doxygen.bst
+ - components/dracut.bst
+-- components/duktape.bst
+ - components/dummy-gbm.bst
+ - components/e2fsprogs.bst
+ - components/ed.bst
+@@ -253,6 +252,7 @@ depends:
+ - components/mesa-headers.bst
+ - components/meson.bst
+ - components/mogwai.bst
++- components/mozjs.bst
+ - components/mpfr.bst
+ - components/mpg123.bst
+ - components/mtdev.bst
+diff --git a/elements/components/duktape.bst b/elements/components/duktape.bst
+deleted file mode 100644
+index ccaa75f5f..000000000
+--- a/elements/components/duktape.bst
++++ /dev/null
+@@ -1,17 +0,0 @@
+-kind: make
+-
+-depends:
+-- bootstrap-import.bst
+-
+-variables:
+-  make-args: >-
+-    -f Makefile.sharedlibrary
+-    INSTALL_PREFIX=%{prefix}
+-    LIBDIR=/%{lib}
+-  make: make %{make-args}
+-  make-install: make -j1 %{make-args} DESTDIR="%{install-root}" install
+-
+-sources:
+-- kind: tar
+-  url: github_files:svaarala/duktape/releases/download/v2.7.0/duktape-2.7.0.tar.xz
+-  ref: 90f8d2fa8b5567c6899830ddef2c03f3c27960b11aca222fa17aa7ac613c2890
+diff --git a/elements/components/mozjs.bst b/elements/components/mozjs.bst
+new file mode 100644
+index 000000000..788980129
+--- /dev/null
++++ b/elements/components/mozjs.bst
+@@ -0,0 +1,66 @@
++kind: manual
++
++build-depends:
++- components/autoconf.bst
++- components/pkg-config.bst
++- components/python3.bst
++- components/which.bst
++- components/perl.bst
++- components/rust.bst
++- enable-shm.bst
++
++depends:
++- components/nspr.bst
++- components/icu.bst
++
++environment-nocache:
++- MAXJOBS
++
++environment:
++  MACH_USE_SYSTEM_PYTHON: '1'
++  MAXJOBS: '%{max-jobs}'
++  PATH: /usr/bin:/usr/lib/sdk/rust/bin
++  CC: gcc
++  CXX: g++
++  AUTOCONF: autoconf
++
++variables:
++  optimize-debug: "false"
++
++config:
++  configure-commands:
++  - |
++    cat >mozconfig <<EOF
++    ac_add_options --prefix="%{prefix}"
++    ac_add_options --libdir="%{libdir}"
++    ac_add_options --host="%{build-triplet}"
++    ac_add_options --target="%{host-triplet}"
++    ac_add_options --enable-application=js
++    ac_add_options --enable-release
++    ac_add_options --with-system-nspr
++    ac_add_options --with-system-zlib
++    ac_add_options --with-system-icu
++    ac_add_options --enable-readline
++    ac_add_options --disable-jemalloc
++    mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/build-dir
++    EOF
++
++  - |
++    ./mach configure
++
++  build-commands:
++  - |
++    ./mach build -j${MAXJOBS} --verbose
++
++  install-commands:
++  - |
++    cd build-dir && make -j1 install DESTDIR="%{install-root}"
++
++  - rm -rf "%{install-root}%{bindir}"
++  - rm "%{install-root}%{libdir}/libjs_static.ajs"
++
++sources:
++- kind: tar
++  url: tar_https:ftp.mozilla.org/pub/firefox/releases/91.5.0esr/source/firefox-91.5.0esr.source.tar.xz
++  base-dir: 'firefox-91.5.0'
++  ref: f45cd9c96227e3e6eabe37962ce924b7a7ca86b6c191326c1bab18e082b4c813
+diff --git a/elements/components/polkit.bst b/elements/components/polkit.bst
+index 79ee6490f..82a2d4f1f 100644
+--- a/elements/components/polkit.bst
++++ b/elements/components/polkit.bst
+@@ -8,14 +8,14 @@ build-depends:
+ - components/strace.bst
+ 
+ depends:
+-- components/duktape.bst
++- components/mozjs.bst
+ - components/linux-pam.bst
+ - components/systemd.bst
+ 
+ variables:
+   meson-local: >-
+     -Dsession_tracking=libsystemd-login
+-    -Djs_engine=duktape
++    -Djs_engine=mozjs
+   local_flags: -std=gnu++17
+ 
+ environment:
+-- 
+2.36.1
+