.gitignore

@@ -1 +1,2 @@
-SOURCES/gjs-1.56.2.tar.xz
+SOURCES/firefox-78.10.0esr.source.tar.xz
+SOURCES/gjs-1.68.6.tar.xz

.gjs.metadata

@@ -0,0 +1,2 @@
+547bac33732774993bd8223de9acfeedcc69a10d SOURCES/firefox-78.10.0esr.source.tar.xz
+41c958f71b9c390de11b0cce955e3c6b6d8f174c SOURCES/gjs-1.68.6.tar.xz

SOURCES/0001-Skip-failing-tests-on-ppc64-and-s390x.patch

@@ -0,0 +1,30 @@
+From db3a0a25b97377b388532b23e73a10d246f66496 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
+Date: Mon, 3 Aug 2020 10:27:00 +0200
+Subject: [PATCH] Skip failing tests on ppc64 and s390x
+
+ppc64 and s390x: non262/extensions/clone-errors.js
+s390x: test262/built-ins/TypedArray/prototype/set/typedarray-arg-set-values-same-buffer-other-type.js
+---
+ js/src/tests/jstests.list | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/js/src/tests/jstests.list b/js/src/tests/jstests.list
+index 4085ce3..4f014f5 100644
+--- a/js/src/tests/jstests.list
++++ b/js/src/tests/jstests.list
+@@ -56,6 +56,11 @@ skip-if(!this.hasOwnProperty('addIntlExtras')) include test262/intl402/DisplayNa
+ skip-if(!this.hasOwnProperty("Atomics")) include test262/built-ins/Atomics/jstests.list
+ skip-if(!this.hasOwnProperty("SharedArrayBuffer")) include test262/built-ins/SharedArrayBuffer/jstests.list
+ 
++# Crashes on s390x and ppc64, avoid it
++skip-if(xulRuntime.XPCOMABI.match(/s390x|ppc64-/)) script non262/extensions/clone-errors.js
++
++# Crashes on s390x, avoid it
++skip-if(xulRuntime.XPCOMABI.match(/s390x/)) script test262/built-ins/TypedArray/prototype/set/typedarray-arg-set-values-same-buffer-other-type.js
+ 
+ #####################################
+ # Test262 tests disabled on browser #
+-- 
+2.26.2
+

SOURCES/0001-function-Always-initialize-callback-return-value.patch

@@ -1,4 +1,4 @@
-From bc58c3127fc6b1a2c8450b47d4dda52298cf217e Mon Sep 17 00:00:00 2001
+From 4cbaa23f1f4a3510176a1f38489834203f71b2b6 Mon Sep 17 00:00:00 2001
 From: Sebastian Keller <skeller@gnome.org>
 Date: Thu, 16 Mar 2023 22:35:49 +0100
 Subject: [PATCH] function: Always initialize callback return value
@@ -16,45 +16,52 @@ neutral value.
 
 Related: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/1868
 ---
- gi/function.cpp | 11 ++++++-----
+ gi/function.cpp | 18 +++++++++---------
- 1 file changed, 6 insertions(+), 5 deletions(-)
+ 1 file changed, 9 insertions(+), 9 deletions(-)
 
 diff --git a/gi/function.cpp b/gi/function.cpp
-index ef708f0c..551c1732 100644
+index 7c0064c8..5d69ed8a 100644
 --- a/gi/function.cpp
 +++ b/gi/function.cpp
-@@ -200,6 +200,12 @@ gjs_callback_closure(ffi_cif *cif,
+@@ -308,6 +308,15 @@ void GjsCallbackTrampoline::callback_closure(GIArgument** args, void* result) {
-     g_assert(trampoline);
+     JSContext *context;
-     gjs_callback_trampoline_ref(trampoline);
+     GITypeInfo ret_type;
  
-+    context = gjs_closure_get_context(trampoline->js_function);
++    g_callable_info_load_return_type(m_info, &ret_type);
 +
-+    /* Fill in the result with some hopefully neutral value */
++    // Fill in the result with some hopefully neutral value
-+    g_callable_info_load_return_type(trampoline->info, &ret_type);
++    if (g_type_info_get_tag(&ret_type) != GI_TYPE_TAG_VOID) {
-+    gjs_g_argument_init_default (context, &ret_type, (GArgument *) result);
++        GIArgument argument = {};
++        gjs_gi_argument_init_default(&ret_type, &argument);
++        set_return_ffi_arg_from_giargument(&ret_type, result, &argument);
++    }
 +
-     if (G_UNLIKELY(!gjs_closure_is_valid(trampoline->js_function))) {
+     if (G_UNLIKELY(!gjs_closure_is_valid(m_js_function))) {
-         warn_about_illegal_js_callback(trampoline, "during shutdown",
+         warn_about_illegal_js_callback(
-             "destroying a Clutter actor or GTK widget with ::destroy signal "
+             "during shutdown",
-@@ -208,7 +214,6 @@ gjs_callback_closure(ffi_cif *cif,
+@@ -382,7 +391,6 @@ void GjsCallbackTrampoline::callback_closure(GIArgument** args, void* result) {
-         return;
-     }
  
--    context = gjs_closure_get_context(trampoline->js_function);
+     JS::RootedValue rval(context);
-     GjsContextPrivate* gjs = GjsContextPrivate::from_cx(context);
+ 
-     if (G_UNLIKELY(gjs->sweeping())) {
+-    g_callable_info_load_return_type(m_info, &ret_type);
-         warn_about_illegal_js_callback(trampoline, "during garbage collection",
+     GIArgument* error_argument = nullptr;
-@@ -445,10 +450,6 @@ out:
+ 
-                     g_base_info_get_name(trampoline->info));
+     if (g_callable_info_can_throw_gerror(m_info))
+@@ -406,14 +414,6 @@ void GjsCallbackTrampoline::callback_closure(GIArgument** args, void* result) {
+                     m_info.ns(), m_info.name());
          }
  
--        /* Fill in the result with some hopefully neutral value */
+-        // Fill in the result with some hopefully neutral value
--        g_callable_info_load_return_type(trampoline->info, &ret_type);
+-        if (g_type_info_get_tag(&ret_type) != GI_TYPE_TAG_VOID) {
--        gjs_g_argument_init_default (context, &ret_type, (GArgument *) result);
+-            GIArgument argument = {};
+-            g_callable_info_load_return_type(m_info, &ret_type);
+-            gjs_gi_argument_init_default(&ret_type, &argument);
+-            set_return_ffi_arg_from_giargument(&ret_type, result, &argument);
+-        }
 -
-         /* If the callback has a GError** argument and invoking the closure
+         // If the callback has a GError** argument and invoking the closure
-          * returned an error, try to make a GError from it */
+         // returned an error, try to make a GError from it
-         if (can_throw_gerror && rval.isObject()) {
+         if (error_argument && rval.isObject()) {
 -- 
-2.40.0
+2.35.1
 

SOURCES/0001-gobject-Guard-against-null-JS-wrapper-in-set-get-pro.patch

@@ -0,0 +1,91 @@
+From cf128c8d52a3b86177d5231f32c2e156837fa8e7 Mon Sep 17 00:00:00 2001
+From: Philip Chimento <philip.chimento@gmail.com>
+Date: Mon, 14 Nov 2022 22:01:59 -0800
+Subject: [PATCH] gobject: Guard against null JS wrapper in set/get property
+
+The wrapper object may be disassociated from the GObject if dispose has
+been run. In that case, the pointers in the get/set property vfuncs may
+be null. Handle that case with a warning and don't get or set the
+property.
+
+Closes: #510
+---
+ gi/gobject.cpp                          | 12 ++++++++++
+ installed-tests/js/testIntrospection.js | 31 +++++++++++++++++++++++++
+ 2 files changed, 43 insertions(+)
+
+diff --git a/gi/gobject.cpp b/gi/gobject.cpp
+index b86872c2..881c06f8 100644
+--- a/gi/gobject.cpp
++++ b/gi/gobject.cpp
+@@ -171,6 +171,12 @@ static void gjs_object_set_gproperty(GObject* object,
+                                      unsigned property_id [[maybe_unused]],
+                                      const GValue* value, GParamSpec* pspec) {
+     auto* priv = ObjectInstance::for_gobject(object);
++    if (!priv) {
++        g_warning("Wrapper for GObject %p was disposed, cannot set property %s",
++                  object, g_param_spec_get_name(pspec));
++        return;
++    }
++
+     JSContext *cx = current_context();
+ 
+     JS::RootedObject js_obj(cx, priv->wrapper());
+@@ -184,6 +190,12 @@ static void gjs_object_get_gproperty(GObject* object,
+                                      unsigned property_id [[maybe_unused]],
+                                      GValue* value, GParamSpec* pspec) {
+     auto* priv = ObjectInstance::for_gobject(object);
++    if (!priv) {
++        g_warning("Wrapper for GObject %p was disposed, cannot get property %s",
++                  object, g_param_spec_get_name(pspec));
++        return;
++    }
++
+     JSContext *cx = current_context();
+ 
+     JS::RootedObject js_obj(cx, priv->wrapper());
+diff --git a/installed-tests/js/testIntrospection.js b/installed-tests/js/testIntrospection.js
+index 5e2ee7df..a0ffeefe 100644
+--- a/installed-tests/js/testIntrospection.js
++++ b/installed-tests/js/testIntrospection.js
+@@ -140,6 +140,37 @@ describe('Garbage collection of introspected objects', function () {
+         System.gc();
+         GLib.idle_add(GLib.PRIORITY_LOW, () => done());
+     });
++
++    // This tests a race condition that would crash; it should warn instead
++    it('handles setting a property from C on an object whose JS wrapper has been collected', function (done) {
++        const SomeObject = GObject.registerClass({
++            Properties: {
++                'screenfull': GObject.ParamSpec.boolean('screenfull', '', '',
++                    GObject.ParamFlags.READWRITE,
++                    false),
++            },
++        }, class SomeObject extends GObject.Object {});
++
++        GLib.test_expect_message('Gjs', GLib.LogLevelFlags.LEVEL_WARNING,
++            '*property screenfull*');
++
++        const settings = new Gio.Settings({schema: 'org.gnome.GjsTest'});
++        let obj = new SomeObject();
++        settings.bind('fullscreen', obj, 'screenfull', Gio.SettingsBindFlags.DEFAULT);
++        const handler = settings.connect('changed::fullscreen', () => {
++            obj.run_dispose();
++            obj = null;
++            settings.disconnect(handler);
++            GLib.idle_add(GLib.PRIORITY_LOW, () => {
++                GLib.test_assert_expected_messages_internal('Gjs',
++                    'testIntrospection.js', 0,
++                    'Warn about setting property on disposed JS object');
++                done();
++            });
++        });
++        settings.set_boolean('fullscreen', !settings.get_boolean('fullscreen'));
++        settings.reset('fullscreen');
++    });
+ });
+ 
+ describe('Gdk.Atom', function () {
+-- 
+2.39.1
+

SOURCES/0003-D94538-autoconf2.diff

@@ -0,0 +1,118 @@
+diff -up firefox-78.8.0/python/mozboot/mozboot/archlinux.py.D94538-autoconf2.diff firefox-78.8.0/python/mozboot/mozboot/archlinux.py
+--- firefox-78.8.0/python/mozboot/mozboot/archlinux.py.D94538-autoconf2.diff	2021-02-25 13:53:04.963982705 +0100
++++ firefox-78.8.0/python/mozboot/mozboot/archlinux.py	2021-02-25 13:53:25.713053151 +0100
+@@ -26,7 +26,6 @@ class ArchlinuxBootstrapper(
+     '''Archlinux experimental bootstrapper.'''
+ 
+     SYSTEM_PACKAGES = [
+-        'autoconf2.13',
+         'base-devel',
+         'nodejs',
+         'python2',
+diff -up firefox-78.8.0/python/mozboot/mozboot/centosfedora.py.D94538-autoconf2.diff firefox-78.8.0/python/mozboot/mozboot/centosfedora.py
+--- firefox-78.8.0/python/mozboot/mozboot/centosfedora.py.D94538-autoconf2.diff	2021-02-17 08:49:42.000000000 +0100
++++ firefox-78.8.0/python/mozboot/mozboot/centosfedora.py	2021-02-25 13:53:04.963982705 +0100
+@@ -26,7 +26,6 @@ class CentOSFedoraBootstrapper(
+         # For CentOS 7, later versions of nodejs come from nodesource
+         # and include the npm package.
+         self.packages = [
+-            'autoconf213',
+             'nodejs',
+             'which',
+         ]
+diff -up firefox-78.8.0/python/mozboot/mozboot/debian.py.D94538-autoconf2.diff firefox-78.8.0/python/mozboot/mozboot/debian.py
+--- firefox-78.8.0/python/mozboot/mozboot/debian.py.D94538-autoconf2.diff	2021-02-25 13:53:04.963982705 +0100
++++ firefox-78.8.0/python/mozboot/mozboot/debian.py	2021-02-25 13:53:42.874111415 +0100
+@@ -32,7 +32,6 @@ class DebianBootstrapper(
+     # These are common packages for all Debian-derived distros (such as
+     # Ubuntu).
+     COMMON_PACKAGES = [
+-        'autoconf2.13',
+         'build-essential',
+         'nodejs',
+         'python-setuptools',
+diff -up firefox-78.8.0/python/mozboot/mozboot/freebsd.py.D94538-autoconf2.diff firefox-78.8.0/python/mozboot/mozboot/freebsd.py
+--- firefox-78.8.0/python/mozboot/mozboot/freebsd.py.D94538-autoconf2.diff	2021-02-17 08:49:42.000000000 +0100
++++ firefox-78.8.0/python/mozboot/mozboot/freebsd.py	2021-02-25 13:53:04.963982705 +0100
+@@ -15,7 +15,6 @@ class FreeBSDBootstrapper(BaseBootstrapp
+         self.flavor = flavor.lower()
+ 
+         self.packages = [
+-            'autoconf213',
+             'gmake',
+             'gtar',
+             'pkgconf',
+diff -up firefox-78.8.0/python/mozboot/mozboot/gentoo.py.D94538-autoconf2.diff firefox-78.8.0/python/mozboot/mozboot/gentoo.py
+--- firefox-78.8.0/python/mozboot/mozboot/gentoo.py.D94538-autoconf2.diff	2021-02-17 08:49:38.000000000 +0100
++++ firefox-78.8.0/python/mozboot/mozboot/gentoo.py	2021-02-25 13:53:04.963982705 +0100
+@@ -36,7 +36,6 @@ class GentooBootstrapper(
+     def ensure_system_packages(self):
+         self.run_as_root(['emerge', '--noreplace', '--quiet',
+                           'app-arch/zip',
+-                          'sys-devel/autoconf:2.1'
+                           ])
+ 
+     def ensure_browser_packages(self, artifact_mode=False):
+diff -up firefox-78.8.0/python/mozboot/mozboot/openbsd.py.D94538-autoconf2.diff firefox-78.8.0/python/mozboot/mozboot/openbsd.py
+--- firefox-78.8.0/python/mozboot/mozboot/openbsd.py.D94538-autoconf2.diff	2021-02-17 08:49:15.000000000 +0100
++++ firefox-78.8.0/python/mozboot/mozboot/openbsd.py	2021-02-25 13:53:04.964982709 +0100
+@@ -12,7 +12,6 @@ class OpenBSDBootstrapper(BaseBootstrapp
+         BaseBootstrapper.__init__(self, **kwargs)
+ 
+         self.packages = [
+-            'autoconf-2.13',
+             'gmake',
+             'gtar',
+             'rust',
+diff -up firefox-78.8.0/python/mozboot/mozboot/opensuse.py.D94538-autoconf2.diff firefox-78.8.0/python/mozboot/mozboot/opensuse.py
+--- firefox-78.8.0/python/mozboot/mozboot/opensuse.py.D94538-autoconf2.diff	2021-02-17 08:49:42.000000000 +0100
++++ firefox-78.8.0/python/mozboot/mozboot/opensuse.py	2021-02-25 13:53:04.964982709 +0100
+@@ -13,7 +13,6 @@ class OpenSUSEBootstrapper(
+     '''openSUSE experimental bootstrapper.'''
+ 
+     SYSTEM_PACKAGES = [
+-        'autoconf213',
+         'nodejs',
+         'npm',
+         'which',
+diff -up firefox-78.8.0/python/mozboot/mozboot/osx.py.D94538-autoconf2.diff firefox-78.8.0/python/mozboot/mozboot/osx.py
+--- firefox-78.8.0/python/mozboot/mozboot/osx.py.D94538-autoconf2.diff	2021-02-25 13:53:04.964982709 +0100
++++ firefox-78.8.0/python/mozboot/mozboot/osx.py	2021-02-25 13:54:07.162193882 +0100
+@@ -353,7 +353,6 @@ class OSXBootstrapper(BaseBootstrapper):
+         # least on 10.8) and because the build system wants a version
+         # newer than what Apple ships.
+         packages = [
+-            'autoconf@2.13',
+             'git',
+             'gnu-tar',
+             'node',
+@@ -428,7 +427,6 @@ class OSXBootstrapper(BaseBootstrapper):
+             'python27',
+             'python36',
+             'py27-gnureadline',
+-            'autoconf213',
+             'gnutar',
+             'watchman',
+             'nodejs8'
+diff -up firefox-78.8.0/python/mozboot/mozboot/solus.py.D94538-autoconf2.diff firefox-78.8.0/python/mozboot/mozboot/solus.py
+--- firefox-78.8.0/python/mozboot/mozboot/solus.py.D94538-autoconf2.diff	2021-02-25 13:53:04.964982709 +0100
++++ firefox-78.8.0/python/mozboot/mozboot/solus.py	2021-02-25 13:53:32.090074802 +0100
+@@ -23,7 +23,6 @@ class SolusBootstrapper(
+     '''Solus experimental bootstrapper.'''
+ 
+     SYSTEM_PACKAGES = [
+-        'autoconf213',
+         'nodejs',
+         'python',
+         'python3',
+diff -up firefox-78.8.0/python/mozboot/mozboot/windows.py.D94538-autoconf2.diff firefox-78.8.0/python/mozboot/mozboot/windows.py
+--- firefox-78.8.0/python/mozboot/mozboot/windows.py.D94538-autoconf2.diff	2021-02-17 08:49:34.000000000 +0100
++++ firefox-78.8.0/python/mozboot/mozboot/windows.py	2021-02-25 13:53:04.978982756 +0100
+@@ -48,7 +48,6 @@ class WindowsBootstrapper(BaseBootstrapp
+         'patch',
+         'patchutils',
+         'diffutils',
+-        'autoconf2.13',
+         'tar',
+         'zip',
+         'unzip',

SOURCES/FixSharedArray.diff

@@ -0,0 +1,12 @@
+--- a/js/public/StructuredClone.h
++++ b/js/public/StructuredClone.h
+@@ -381,7 +381,7 @@ enum OwnTransferablePolicy {
+ namespace js {
+ class SharedArrayRawBuffer;
+
+-class SharedArrayRawBufferRefs {
++class JS_PUBLIC_API SharedArrayRawBufferRefs {
+  public:
+   SharedArrayRawBufferRefs() = default;
+   SharedArrayRawBufferRefs(SharedArrayRawBufferRefs&& other) = default;
+--

SOURCES/copy-headers.patch

@@ -0,0 +1,38 @@
+From 3b3c8e37cca418e07bdeceaf3a601805df28d925 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
+Date: Wed, 15 Jul 2020 08:27:39 +0200
+Subject: [PATCH] build: Copy headers on install instead of symlinking
+
+Patch by Philip Chimento ported forward to mozjs78
+---
+ python/mozbuild/mozbuild/backend/recursivemake.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild/mozbuild/backend/recursivemake.py
+index e3fc8fe..bed5ae9 100644
+--- a/python/mozbuild/mozbuild/backend/recursivemake.py
++++ b/python/mozbuild/mozbuild/backend/recursivemake.py
+@@ -1457,9 +1457,9 @@ class RecursiveMakeBackend(MakeBackend):
+                                 raise Exception("Wildcards are only supported in the filename part"
+                                                 " of srcdir-relative or absolute paths.")
+ 
+-                            install_manifest.add_pattern_link(basepath, wild, path)
++                            install_manifest.add_pattern_copy(basepath, wild, path)
+                         else:
+-                            install_manifest.add_pattern_link(f.srcdir, f, path)
++                            install_manifest.add_pattern_copy(f.srcdir, f, path)
+                     elif isinstance(f, AbsolutePath):
+                         if not f.full_path.lower().endswith(('.dll', '.pdb', '.so')):
+                             raise Exception("Absolute paths installed to FINAL_TARGET_FILES must"
+@@ -1468,7 +1468,7 @@ class RecursiveMakeBackend(MakeBackend):
+                         install_manifest.add_optional_exists(dest)
+                         absolute_files.append(f.full_path)
+                     else:
+-                        install_manifest.add_link(f.full_path, dest)
++                        install_manifest.add_copy(f.full_path, dest)
+                 else:
+                     install_manifest.add_optional_exists(dest)
+                     objdir_files.append(self._pretty_path(f, backend_file))
+-- 
+2.26.2
+

SOURCES/definitions_for_user_vfp.patch

@@ -0,0 +1,35 @@
+From fd6847c9416f9eebde636e21d794d25d1be8791d Mon Sep 17 00:00:00 2001
+From: Mike Hommey <mh@glandium.org>
+Date: Sat, 1 Jun 2019 09:06:01 +0900
+Subject: [PATCH] Bug 1526653 - Include struct definitions for user_vfp and
+ user_vfp_exc.
+
+---
+ js/src/wasm/WasmSignalHandlers.cpp | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/js/src/wasm/WasmSignalHandlers.cpp b/js/src/wasm/WasmSignalHandlers.cpp
+index 636537f8478..383c380f04c 100644
+--- a/js/src/wasm/WasmSignalHandlers.cpp
++++ b/js/src/wasm/WasmSignalHandlers.cpp
+@@ -249,7 +249,16 @@ using mozilla::DebugOnly;
+ #endif
+
+ #ifdef WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
+-#  include <sys/user.h>
++struct user_vfp {
++  unsigned long long fpregs[32];
++  unsigned long fpscr;
++};
++
++struct user_vfp_exc {
++  unsigned long fpexc;
++  unsigned long fpinst;
++  unsigned long fpinst2;
++};
+ #endif
+
+ #if defined(ANDROID)
+--
+2.30.2
+

SOURCES/emitter.patch

@@ -0,0 +1,61 @@
+From d1d785c169345b81c76213f6dd9be32b4db60294 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
+Date: Wed, 15 Jul 2020 08:39:47 +0200
+Subject: [PATCH] Build: allow LOCAL_INCLUDES paths with topsrcdir or topobjdir
+
+---
+ python/mozbuild/mozbuild/frontend/emitter.py  |  6 ------
+ .../mozbuild/test/frontend/test_emitter.py    | 20 -------------------
+ 2 files changed, 26 deletions(-)
+
+diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbuild/frontend/emitter.py
+index 8d5ab8e..65c43ff 100644
+--- a/python/mozbuild/mozbuild/frontend/emitter.py
++++ b/python/mozbuild/mozbuild/frontend/emitter.py
+@@ -1239,12 +1239,6 @@ class TreeMetadataEmitter(LoggingMixin):
+                                                  'is a filename, but a directory is required: %s '
+                                                  '(resolved to %s)' % (local_include, full_path),
+                                                  context)
+-            if (full_path == context.config.topsrcdir or
+-                    full_path == context.config.topobjdir):
+-                raise SandboxValidationError(
+-                    'Path specified in LOCAL_INCLUDES '
+-                    '(%s) resolves to the topsrcdir or topobjdir (%s), which is '
+-                    'not allowed' % (local_include, full_path), context)
+             include_obj = LocalInclude(context, local_include)
+             local_includes.append(include_obj.path.full_path)
+             yield include_obj
+diff --git a/python/mozbuild/mozbuild/test/frontend/test_emitter.py b/python/mozbuild/mozbuild/test/frontend/test_emitter.py
+index e8cbd81..d45ccee 100644
+--- a/python/mozbuild/mozbuild/test/frontend/test_emitter.py
++++ b/python/mozbuild/mozbuild/test/frontend/test_emitter.py
+@@ -1040,26 +1040,6 @@ class TestEmitterBasic(unittest.TestCase):
+ 
+         self.assertEqual(local_includes, expected)
+ 
+-    def test_local_includes_invalid(self):
+-        """Test that invalid LOCAL_INCLUDES are properly detected."""
+-        reader = self.reader('local_includes-invalid/srcdir')
+-
+-        with six.assertRaisesRegex(
+-                self,
+-                SandboxValidationError,
+-                'Path specified in LOCAL_INCLUDES.*resolves to the '
+-                'topsrcdir or topobjdir'):
+-            self.read_topsrcdir(reader)
+-
+-        reader = self.reader('local_includes-invalid/objdir')
+-
+-        with six.assertRaisesRegex(
+-                self,
+-                SandboxValidationError,
+-                'Path specified in LOCAL_INCLUDES.*resolves to the '
+-                'topsrcdir or topobjdir'):
+-            self.read_topsrcdir(reader)
+-
+     def test_local_includes_file(self):
+         """Test that a filename can't be used in LOCAL_INCLUDES."""
+         reader = self.reader('local_includes-filename')
+-- 
+2.26.2
+

SOURCES/fix-undefined-property-warning.patch

@@ -1,67 +0,0 @@
-From 69498c30904c4769de2f7b6a36eb70a8409643d0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
-Date: Thu, 29 Oct 2020 13:05:23 +0100
-Subject: [PATCH 1/2] gi/object: Check property before access
-
-... to avoid a harmless but annoying "access to undefined property"
-warning in case the property doesn't exist (namely the first time
-a non-introspected gtype is accessed).
----
- gi/object.cpp | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/gi/object.cpp b/gi/object.cpp
-index e9eba75a..ee66c6f3 100644
---- a/gi/object.cpp
-+++ b/gi/object.cpp
-@@ -1599,8 +1599,12 @@ JSObject* gjs_lookup_object_constructor_from_info(JSContext* context,
-     if (G_UNLIKELY (!in_object))
-         return NULL;
- 
-+    bool found;
-+    if (!JS_HasProperty(context, in_object, constructor_name, &found))
-+        return NULL;
-+
-     JS::RootedValue value(context);
--    if (!JS_GetProperty(context, in_object, constructor_name, &value))
-+    if (found && !JS_GetProperty(context, in_object, constructor_name, &value))
-         return NULL;
- 
-     JS::RootedObject constructor(context);
--- 
-2.28.0
-
-
-From 23093ef99411a35d8eeedb74948e6c15ed19ba10 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
-Date: Thu, 29 Oct 2020 15:29:59 +0100
-Subject: [PATCH 2/2] gi/fundamental: Check property before access
-
-... to avoid a harmless but annoying "access to undefined property"
-warning in case the property doesn't exist (namely the first time
-a non-introspected gtype is accessed).
----
- gi/fundamental.cpp | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/gi/fundamental.cpp b/gi/fundamental.cpp
-index 0d5d3f6d..426c7db9 100644
---- a/gi/fundamental.cpp
-+++ b/gi/fundamental.cpp
-@@ -322,8 +322,12 @@ gjs_lookup_fundamental_prototype(JSContext    *context,
-     if (G_UNLIKELY (!in_object))
-         return NULL;
- 
-+    bool found;
-+    if (!JS_HasProperty(context, in_object, constructor_name, &found))
-+        return nullptr;
-+
-     JS::RootedValue value(context);
--    if (!JS_GetProperty(context, in_object, constructor_name, &value))
-+    if (found && !JS_GetProperty(context, in_object, constructor_name, &value))
-         return NULL;
- 
-     JS::RootedObject constructor(context);
--- 
-2.28.0
-

SOURCES/icu_sources_data-Write-command-output-to-our-stderr.patch

@@ -0,0 +1,34 @@
+From: Simon McVittie <smcv@debian.org>
+Date: Mon, 9 Oct 2017 09:23:14 +0100
+Subject: icu_sources_data: Write command output to our stderr
+
+Saying "See output in /tmp/foobar" is all very well for a developer
+build, but on a buildd our /tmp is going to get thrown away after
+the build. Just log the usual way instead.
+---
+ intl/icu_sources_data.py | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/intl/icu_sources_data.py b/intl/icu_sources_data.py
+index 8cf9290..7d2d983 100644
+--- a/intl/icu_sources_data.py
++++ b/intl/icu_sources_data.py
+@@ -190,16 +190,13 @@ def update_sources(topsrcdir):
+
+ def try_run(name, command, cwd=None, **kwargs):
+     try:
+-        with tempfile.NamedTemporaryFile(prefix=name, delete=False) as f:
+-            subprocess.check_call(command, cwd=cwd, stdout=f,
+-                                  stderr=subprocess.STDOUT, **kwargs)
++        subprocess.check_call(command, cwd=cwd, stdout=sys.stderr,
++                                stderr=subprocess.STDOUT, **kwargs)
+     except subprocess.CalledProcessError:
+-        print('''Error running "{}" in directory {}
+-    See output in {}'''.format(' '.join(command), cwd, f.name),
+-              file=sys.stderr)
++        print('''Error running "{}" in directory {}'''.format(' '.join(command), cwd),
++            file=sys.stderr)
+         return False
+     else:
+-        os.unlink(f.name)
+         return True

SOURCES/icu_sources_data.py-Decouple-from-Mozilla-build-system.patch

@@ -0,0 +1,26 @@
+From: Simon McVittie <smcv@debian.org>
+Date: Mon, 9 Oct 2017 09:22:12 +0100
+Subject: icu_sources_data.py: Decouple from Mozilla build system
+
+mozpack.path is a wrapper around os.path that normalizes path
+separators on Windows, but on Unix we only have one path separator
+so there's nothing to normalize. Avoid needing to import all of it.
+---
+ intl/icu_sources_data.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/intl/icu_sources_data.py b/intl/icu_sources_data.py
+index 98c0ccb..8cf9290 100644
+--- a/intl/icu_sources_data.py
++++ b/intl/icu_sources_data.py
+@@ -22,7 +22,9 @@ import subprocess
+ import sys
+ import tempfile
+
+-from mozpack import path as mozpath
++# Close enough
++import os.path as mozpath
++mozpath.normsep = lambda p: p
+
+ # The following files have been determined to be dead/unused by a
+ # semi-automated analysis. You can just remove any of the files below

SOURCES/init_patch.patch

@@ -0,0 +1,12 @@
+--- a/python/mozbuild/mozbuild/configure/__init__.py
++++ b/python/mozbuild/mozbuild/configure/__init__.py
+@@ -491,7 +491,8 @@ class ConfigureSandbox(dict):
+             if self._help:
+                 self._logger.warning(msg)
+             else:
+-                raise InvalidOptionError(msg)
++                #raise InvalidOptionError(msg)
++                pass
+
+         # Run the execution queue
+         for func, args in self._execution_queue:

SOURCES/spidermonkey_checks_disable.patch

@@ -0,0 +1,9 @@
+--- a/config/run_spidermonkey_checks.py
++++ b/config/run_spidermonkey_checks.py
+@@ -13,4 +13,5 @@ def main(output, lib_file, *scripts):
+         retcode = subprocess.call(
+             [sys.executable, script], cwd=buildconfig.topsrcdir)
+         if retcode != 0:
+-            raise Exception(script + " failed")
++            #raise Exception(script + " failed")
++            pass

SOURCES/spidermonkey_style_check_disable_s390x.patch

@@ -0,0 +1,11 @@
+--- a/config/check_spidermonkey_style.py
++++ b/config/check_spidermonkey_style.py
+
+@@ -779,6 +779,7 @@ def tarjan(V, E):
+
+
+ def main():
++    sys.exit(0)
+     if sys.argv[1:] == ["--fixup"]:
+         # Sort #include directives in-place.  Fixup mode doesn't solve
+         # all possible silliness that the script checks for; it's just a

SOURCES/tests-increase-timeout.patch

@@ -0,0 +1,26 @@
+From 9be85b155c6df0454c5faef9e850f572c99e3615 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
+Date: Wed, 15 Jul 2020 08:32:44 +0200
+Subject: [PATCH] Increase the test timeout for slower buildds
+
+Ported forward from Debian: https://bugs.debian.org/878284
+---
+ js/src/Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/js/src/Makefile.in b/js/src/Makefile.in
+index b86aeed..d68655a 100644
+--- a/js/src/Makefile.in
++++ b/js/src/Makefile.in
+@@ -53,7 +53,7 @@ check:: check-js-msg
+ 
+ check-jstests:
+ 	$(wildcard $(RUN_TEST_PROGRAM)) $(PYTHON3) -u $(srcdir)/tests/jstests.py \
+-		--no-progress --format=automation --timeout 300 \
++		--no-progress --format=automation --timeout 600 \
+ 		$(JSTESTS_EXTRA_ARGS) \
+ 		$(DIST)/bin/$(JS_SHELL_NAME)$(BIN_SUFFIX)
+ 
+-- 
+2.26.2
+

SPECS/gjs.spec

@@ -1,45 +1,128 @@
-%global glib2_version 2.54.0
+%global glib2_version 2.66.0
-%global gobject_introspection_version 1.41.4
+%global gobject_introspection_version 1.66.0
-%global gtk3_version 3.20
+%global mozjs78_version 78.10.0-1
-%global mozjs60_version 60.9.0-4
 
-Name:          gjs
+%global bundled_mozjs 1
-Version:       1.56.2
+
-Release:       6%{?dist}
+%if 0%{?bundled_mozjs}
-Summary:       Javascript Bindings for GNOME
+%global mozjs_major 78
+%global mozjs_version 78.10.0
+
+# Big endian platforms
+%ifarch ppc ppc64 s390 s390x
+%global big_endian 1
+%endif
+
+# Make sure we don't add requires/provides for private libraries
+%global __provides_exclude_from ^%{_libdir}/gjs/
+%global __requires_exclude ^libmozjs-%{mozjs_major}\\.so.*
+%endif
+
+Name:           gjs
+Version:        1.68.6
+Release:        4%{?dist}
+Summary:        Javascript Bindings for GNOME
 
 # The following files contain code from Mozilla which
 # is triple licensed under MPL1.1/LGPLv2+/GPLv2+:
 # The console module (modules/console.c)
 # Stack printer (gjs/stack.c)
-License:       MIT and (MPLv1.1 or GPLv2+ or LGPLv2+)
+%if 0%{?bundled_mozjs}
-URL:           https://wiki.gnome.org/Projects/Gjs
+License:        MIT and (MPLv1.1 or GPLv2+ or LGPLv2+) and MPLv2.0 and MPLv1.1 and BSD and GPLv2+ and GPLv3+ and LGPLv2+ and AFL and ASL 2.0
-Source0:       https://download.gnome.org/sources/%{name}/1.56/%{name}-%{version}.tar.xz
+%else
+License:        MIT and (MPLv1.1 or GPLv2+ or LGPLv2+)
+%endif
+URL:            https://wiki.gnome.org/Projects/Gjs
+Source0:        https://download.gnome.org/sources/%{name}/1.68/%{name}-%{version}.tar.xz
 
-Patch0:        0001-gi-Include-missing-glib-bits.patch
+%if 0%{?bundled_mozjs}
-Patch1:        fix-undefined-property-warning.patch
+Source1:        https://ftp.mozilla.org/pub/firefox/releases/%{mozjs_version}esr/source/firefox-%{mozjs_version}esr.source.tar.xz
-Patch2:        0001-function-Always-initialize-callback-return-value.patch
+Provides:       bundled(mozjs) = %{mozjs_version}
 
-BuildRequires: cairo-gobject-devel
+# Patches from mozjs68, rebased for mozjs78:
-BuildRequires: chrpath
+Patch02:        copy-headers.patch
-BuildRequires: dbus-daemon
+Patch03:        tests-increase-timeout.patch
-BuildRequires: dbus-glib-devel
+Patch09:        icu_sources_data.py-Decouple-from-Mozilla-build-system.patch
-BuildRequires: gcc-c++
+Patch10:        icu_sources_data-Write-command-output-to-our-stderr.patch
-BuildRequires: gettext
+
-BuildRequires: glib2-devel >= %{glib2_version}
+# Build fixes - https://hg.mozilla.org/mozilla-central/rev/ca36a6c4f8a4a0ddaa033fdbe20836d87bbfb873
-BuildRequires: gobject-introspection-devel >= %{gobject_introspection_version}
+Patch12:        emitter.patch
-BuildRequires: gtk3-devel >= %{gtk3_version}
+
-BuildRequires: mozjs60-devel >= %{mozjs60_version}
+# Build fixes
-BuildRequires: pkgconfig
+Patch14:        init_patch.patch
-BuildRequires: readline-devel
+# TODO: Check with mozilla for cause of these fails and re-enable spidermonkey compile time checks if needed
+Patch15:        spidermonkey_checks_disable.patch
+
+# armv7 fixes
+Patch17:        definitions_for_user_vfp.patch
+
+# s390x/ppc64 fixes, TODO: file bug report upstream?
+Patch18:        spidermonkey_style_check_disable_s390x.patch
+Patch19:        0001-Skip-failing-tests-on-ppc64-and-s390x.patch
+
+# Fix for https://bugzilla.mozilla.org/show_bug.cgi?id=1644600 ( SharedArrayRawBufferRefs is not exported )
+# https://github.com/0ad/0ad/blob/83e81362d850cc6f2b3b598255b873b6d04d5809/libraries/source/spidermonkey/FixSharedArray.diff
+Patch30:        FixSharedArray.diff
+
+# Avoid autoconf213 dependency, backported from upstream
+# https://bugzilla.mozilla.org/show_bug.cgi?id=1663863
+Patch31:        0002-D89554-autoconf1.diff
+Patch32:        0003-D94538-autoconf2.diff
+
+%endif
+
+Patch40:        0001-gobject-Guard-against-null-JS-wrapper-in-set-get-pro.patch
+Patch41:        0001-function-Always-initialize-callback-return-value.patch
+
+BuildRequires:  cairo-gobject-devel
+BuildRequires:  dbus-daemon
+BuildRequires:  dbus-glib-devel
+BuildRequires:  gcc-c++
+BuildRequires:  meson
+BuildRequires:  gettext
+BuildRequires:  glib2-devel >= %{glib2_version}
+BuildRequires:  gobject-introspection-devel >= %{gobject_introspection_version}
+BuildRequires:  gtk3-devel
+BuildRequires:  gtk4-devel
+%if 0%{?bundled_mozjs}
+BuildRequires:  cargo
+BuildRequires:  clang-devel
+BuildRequires:  gcc
+BuildRequires:  gcc-c++
+BuildRequires:  m4
+BuildRequires:  make
+%if !0%{?rhel}
+BuildRequires:  nasm
+%endif
+BuildRequires:  llvm
+BuildRequires:  llvm-devel
+BuildRequires:  rust
+BuildRequires:  perl-devel
+BuildRequires:  pkgconfig(libffi)
+BuildRequires:  pkgconfig(zlib)
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
+BuildRequires:  python3-six
+BuildRequires:  readline-devel
+BuildRequires:  zip
+%if 0%{?big_endian}
+BuildRequires:  icu
+%endif
+%else
+BuildRequires:  mozjs78-devel >= %{mozjs78_version}
+%endif
+BuildRequires:  pkgconfig
+BuildRequires:  readline-devel
+BuildRequires:  sysprof-capture-devel
+
+# xvfb for test suite
+BuildRequires:  xorg-x11-server-Xvfb
 
 Requires: glib2%{?_isa} >= %{glib2_version}
 Requires: gobject-introspection%{?_isa} >= %{gobject_introspection_version}
-Requires: gtk3%{?_isa} >= %{gtk3_version}
+%if !0%{?bundled_mozjs}
-Requires: mozjs60%{?_isa} >= %{mozjs60_version}
+Requires: mozjs78%{?_isa} >= %{mozjs78_version}
-
+%endif
-# Filter provides for private libraries
-%global __provides_exclude_from ^%{_libdir}/gjs/
 
 %description
 Gjs allows using GNOME libraries from Javascript. It's based on the
@@ -62,81 +145,459 @@ The gjs-tests package contains tests that can be used to verify
 the functionality of the installed gjs package.
 
 %prep
-%autosetup -p1
+%setup -q
+
+%if 0%{?bundled_mozjs}
+# Extract mozjs archive
+tar -xf %{S:1}
+
+# Apply mozjs patches
+pushd firefox-%{mozjs_version}
+%patch02 -p1
+%patch03 -p1
+%patch09 -p1
+%patch10 -p1
+
+%patch12 -p1
+
+%patch14 -p1
+%patch15 -p1
+
+%ifarch armv7hl
+# Include definitions for user vfp on armv7 as it causes the compilation to fail without them
+# https://bugzilla.mozilla.org/show_bug.cgi?id=1526653
+%patch17 -p1
+%endif
+
+%ifarch s390x
+%patch18 -p1
+%endif
+
+# Fixes for ppc64 and s390x, there is no need to keep it in ifarch here since mozilla tests support ifarch conditions
+%patch19 -p1
+
+# Export SharedArrayRawBufferRefs
+%patch30 -p1
+
+# Avoid autoconf213 dependency
+%patch31 -p1 -b .autoconf213
+%patch32 -p1 -b .autoconf213-2
+
+# Remove zlib directory (to be sure using system version)
+rm -rf modules/zlib
+popd
+%endif
+
+%patch40 -p1
+%patch41 -p1
 
 %build
-%configure --disable-static --enable-installed-tests
+%if 0%{?bundled_mozjs}
+pushd firefox-%{mozjs_version}/js/src
+# Prefer GCC for now
+export CC=gcc
+export CXX=g++
 
-make %{?_smp_mflags} V=1
+# Workaround
+# error: options `-C embed-bitcode=no` and `-C lto` are incompatible
+# error: could not compile `jsrust`.
+# https://github.com/japaric/cargo-call-stack/issues/25
+export RUSTFLAGS="-C embed-bitcode"
+
+# https://github.com/ptomato/mozjs/commit/36bb7982b41e0ef9a65f7174252ab996cd6777bd
+export CARGO_PROFILE_RELEASE_LTO=true
+
+export LINKFLAGS="%{?__global_ldflags}"
+export PYTHON="%{__python3}"
+
+%configure \
+  --without-system-icu \
+  --with-system-zlib \
+  --disable-tests \
+  --disable-strip \
+  --with-intl-api \
+  --enable-readline \
+  --enable-shared-js \
+  --enable-optimize \
+  --disable-debug \
+  --enable-pie \
+  --disable-jemalloc
+
+%if 0%{?big_endian}
+echo "Generate big endian version of config/external/icu/data/icud67l.dat"
+pushd ../..
+  icupkg -tb config/external/icu/data/icudt67l.dat config/external/icu/data/icudt67b.dat
+  rm -f config/external/icu/data/icudt*l.dat
+popd
+%endif
+
+%make_build
+popd
+
+cat > mozjs-%{mozjs_major}.pc << EOF
+Name: SpiderMonkey %{mozjs_version}
+Description: The Mozilla library for JavaScript
+Version: %{mozjs_version}
+
+Libs: -L`pwd`/firefox-%{mozjs_version}/js/src/dist/bin -Wl,-rpath=%{_libdir}/gjs -lmozjs-%{mozjs_major}
+Cflags: -include `pwd`/firefox-%{mozjs_version}/js/src/dist/include/js/RequiredDefines.h -I`pwd`/firefox-%{mozjs_version}/js/src/dist/include
+EOF
+%endif
+
+%if 0%{?bundled_mozjs}
+export PKG_CONFIG_PATH=`pwd`
+export LD_LIBRARY_PATH=`pwd`/firefox-%{mozjs_version}/js/src/dist/bin
+%endif
+
+%meson
+%meson_build
 
 %install
-%make_install
+%if 0%{?bundled_mozjs}
+mkdir -p %{buildroot}%{_libdir}/gjs
+cp -p firefox-%{mozjs_version}/js/src/dist/bin/libmozjs-%{mozjs_major}.so %{buildroot}%{_libdir}/gjs/
+%endif
 
-# Remove lib64 rpaths
+%meson_install
-chrpath --delete %{buildroot}%{_bindir}/gjs-console
-chrpath --delete %{buildroot}%{_libexecdir}/gjs/installed-tests/minijasmine
 
-find %{buildroot} -name '*.la' -exec rm -f {} ';'
+%if 0%{?bundled_mozjs}
+sed -i -e 's/, mozjs-%{mozjs_major}//g' %{buildroot}%{_libdir}/pkgconfig/gjs-1.0.pc
+%endif
 
 %check
-#make check
+%if 0%{?bundled_mozjs}
+export LD_LIBRARY_PATH=`pwd`/firefox-%{mozjs_version}/js/src/dist/bin
+
+pushd firefox-%{mozjs_version}/js/src
+# Run SpiderMonkey tests
+PYTHONPATH=tests/lib %{__python3} tests/jstests.py -d -s -t 1800 --no-progress --wpt=disabled ../../js/src/dist/bin/js
+
+# Run basic JIT tests
+PYTHONPATH=tests/lib %{__python3} jit-test/jit_test.py -s -t 1800 --no-progress ../../js/src/dist/bin/js basic
+popd
+%endif
+
+%{shrink:xvfb-run -s "-screen 0 1600x1200x24" %meson_test --timeout-multiplier=5}
 
 %files
 %license COPYING
-%doc NEWS README
+%doc NEWS README.md
 %{_bindir}/gjs
 %{_bindir}/gjs-console
-%{_libdir}/*.so.*
+%{_libdir}/gjs/
-%{_libdir}/gjs
+%{_libdir}/libgjs.so.0*
 
 %files devel
 %doc examples/*
 %{_includedir}/gjs-1.0
 %{_libdir}/pkgconfig/gjs-1.0.pc
-%{_libdir}/*.so
+%{_libdir}/libgjs.so
 %dir %{_datadir}/gjs-1.0
 %{_datadir}/gjs-1.0/lsan/
 %{_datadir}/gjs-1.0/valgrind/
 
 %files tests
-%{_libexecdir}/gjs/installed-tests
+%{_libexecdir}/installed-tests/
-%{_datadir}/installed-tests
+%{_datadir}/glib-2.0/schemas/org.gnome.GjsTest.gschema.xml
+%{_datadir}/installed-tests/
 
 %changelog
-* Wed May 10 2023 Florian Müllner <fmuellner@redhat.com> - 1.56.2-6
+* Tue May 16 2023 Florian Müllner <fmuellner@redhat.com> - 1.68.6-4
 - Always initialize callback return value
-  Resolves: #2182508
+Resolves: #2196877
 
-* Tue Nov 17 2020 Florian Müllner <fmuellner@redhat.co> - 1.56.2-5
+* Wed Feb 15 2023 Florian Müllner <fmuellner@redhat.com> - 1.68.6-2
-- Fix undefined property warnings
+- Guard against invalid gobject property access
-  Related: #1845660
+Resolves: #2170044
 
-* Tue Feb 18 2020 Kalev Lember <klember@redhat.com> - 1.56.2-4
+* Tue Apr 05 2022 Florian Müllner <fmuellner@redhat.com> - 1.68.6-1
-- Rebuild for mozjs60 s390x fixes
+- Update to 1.68.6
-- Related: #1803824
+Resolves: #2066167
 
-* Tue Sep 10 2019 Kalev Lember <klember@redhat.com> - 1.56.2-3
+* Tue Feb 22 2022 Florian Müllner <fmuellner@redhat.com> - 1.68.5-1
-- Rebuild for mozjs60 s390x fixes
+- Update to 1.68.5
-- Related: #1746889
+Resolves: #2054085
 
-* Thu May 23 2019 Florian Müllner <fmuellner@redhat.com> - 1.56.2-1
+* Thu Nov 04 2021 Florian Müllner <fmuellner@redhat.com> - 1.68.4-1
+- Update to 1.68.4
+- Increate test timeouts to make it more reliable on armv7
+Resolves: #2005774
+
+* Wed Aug 18 2021 Carlos O'Donell <codonell@redhat.com> - 1.68.3-2
+- Rebuilt for libffi 3.4.2 SONAME transition. Related: rhbz#1891914
+
+* Wed Aug 18 2021 Florian Müllner <fmuellner@redhat.com> - 1.68.3-1
+- Update to 1.68.3
+  Resolves: #1993764
+
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.68.1-3
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Mon May 17 2021 Kalev Lember <klember@redhat.com> - 1.68.1-2
+- Bundle mozjs (#1958111)
+
+* Thu May 06 2021 Kalev Lember <klember@redhat.com> - 1.68.1-1
+- Update to 1.68.1
+
+* Tue Apr 20 2021 Frantisek Zatloukal <fzatlouk@redhat.com> - 1.68.0-7
+- Rebuild against mozjs78-78.10.0-1
+
+* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1.68.0-6
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Tue Apr 13 2021 Ray Strode <rstrode@redhat.com> - 1.68.0-5
+- Rebuild
+  Related: #1940618
+
+* Mon Mar 29 2021 Adam Williamson <awilliam@redhat.com> - 1.68.0-4
+- Backport several bugfixes from upstream main branch
+
+* Fri Mar 26 2021 Kalev Lember <klember@redhat.com> - 1.68.0-3
+- Rebuild to fix sysprof-capture symbols leaking into libraries consuming it
+
+* Thu Mar 25 2021 Frantisek Zatloukal <fzatlouk@redhat.com> - 1.68.0-2
+- Rebuild against mozjs78-78.9.0-1
+
+* Mon Mar 22 2021 Kalev Lember <klember@redhat.com> - 1.68.0-1
+- Update to 1.68.0
+- Tighten soname globs
+
+* Fri Mar 19 2021 Adam Williamson <awilliam@redhat.com> - 1.67.3-3
+- Replace MR #585 reversion with MR #588, hopefully correct fix
+
+* Thu Mar 18 2021 Adam Williamson <awilliam@redhat.com> - 1.67.3-2
+- Patches to revert MR #585 to work around frequent crash on unlock
+
+* Mon Mar 15 2021 Kalev Lember <klember@redhat.com> - 1.67.3-1
+- Update to 1.67.3
+
+* Tue Feb 23 2021 Frantisek Zatloukal <fzatlouk@redhat.com> - 1.67.2-2
+- Rebuild against mozjs78-78.8.0-1
+
+* Wed Feb 17 2021 Kalev Lember <klember@redhat.com> - 1.67.2-1
+- Update to 1.67.2
+
+* Tue Jan 26 2021 Kalev Lember <klember@redhat.com> - 1.67.1-3
+- Simplify xvfb-run invocation
+
+* Tue Jan 26 2021 Frantisek Zatloukal <fzatlouk@redhat.com> - 1.67.1-2
+- Enable tests during rpmbuild
+
+* Tue Jan 26 2021 Frantisek Zatloukal <fzatlouk@redhat.com> - 1.67.1-1
+- Update to 1.67.1
+- Rebuild against mozjs78-78.7.0-1
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.66.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Sat Jan 16 2021 Kalev Lember <klember@redhat.com> - 1.66.2-1
+- Update to 1.66.2
+
+* Tue Dec 15 2020 Frantisek Zatloukal <fzatlouk@redhat.com> - 1.66.1-5
+- Rebuild against mozjs78-78.6.0-1
+
+* Wed Nov 18 2020 Frantisek Zatloukal <fzatlouk@redhat.com> - 1.66.1-4
+- Rebuild against mozjs78-78.5.0-1
+
+* Sat Oct 31 2020 Jeff Law <law@redhat.com> - 1.66.1-3
+- Fix bogus volatiles caught by gcc-11
+
+* Mon Oct 19 2020 Frantisek Zatloukal <fzatlouk@redhat.com> - 1.66.1-2
+- Rebuild against mozjs78-78.4.0-1
+
+* Fri Oct  9 2020 Kalev Lember <klember@redhat.com> - 1.66.1-1
+- Update to 1.66.1
+
+* Tue Sep 22 2020 Frantisek Zatloukal <fzatlouk@redhat.com> - 1.66.0-2
+- Rebuild against mozjs78-78.3.0-1
+
+* Sat Sep 12 2020 Kalev Lember <klember@redhat.com> - 1.66.0-1
+- Update to 1.66.0
+
+* Sun Sep 06 2020 Kalev Lember <klember@redhat.com> - 1.65.92-1
+- Update to 1.65.92
+
+* Fri Aug 28 2020 Adam Williamson <awilliam@redhat.com> - 1.65.91-3
+- Backport MR #483 to fix frequent g_variant_unref errors in journal
+
+* Mon Aug 24 2020 Frantisek Zatloukal <fzatlouk@redhat.com> - 1.65.91-2
+- Rebuild against mozjs78-78.2.0-1
+
+* Sun Aug 23 2020 Kalev Lember <klember@redhat.com> - 1.65.91-1
+- Update to 1.65.91
+
+* Mon Aug 17 2020 Frantisek Zatloukal <fzatlouk@redhat.com> - 1.65.90-1
+- Update to 1.65.90
+- Switch over from mozjs68 to mozjs78
+
+* Fri Jul 31 2020 Frantisek Zatloukal <fzatlouk@redhat.com> - 1.65.4-3
+- Rebuild against mozjs68-68.11.0-1
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.65.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jul 20 2020 Kalev Lember <klember@redhat.com> - 1.65.4-1
+- Update to 1.65.4
+
+* Tue Jun 30 2020 Frantisek Zatloukal <fzatlouk@redhat.com> - 1.65.3-2
+- Rebuild against mozjs68-68.10.0-1
+
+* Fri Jun 05 2020 Kalev Lember <klember@redhat.com> - 1.65.3-1
+- Update to 1.65.3
+
+* Tue Jun 02 2020 Frantisek Zatloukal <fzatlouk@redhat.com> - 1.65.2-3
+- Rebuild against mozjs68-68.9.0-1
+
+* Tue May 12 2020 Frantisek Zatloukal <fzatlouk@redhat.com> - 1.65.2-2
+- Rebuild against mozjs68-68.8.0-1
+
+* Tue May 05 2020 Kalev Lember <klember@redhat.com> - 1.65.2-1
+- Update to 1.65.2
+
+* Tue Apr 07 2020 Frantisek Zatloukal <fzatlouk@redhat.com> - 1.65.1-2
+- Rebuild against mozjs68-68.7.0-1
+
+* Sat Mar 28 2020 Kalev Lember <klember@redhat.com> - 1.65.1-1
+- Update to 1.65.1
+
+* Sat Mar 28 2020 Kalev Lember <klember@redhat.com> - 1.64.1-1
+- Update to 1.64.1
+
+* Tue Mar 17 2020 Frantisek Zatloukal <fzatlouk@redhat.com> - 1.64.0-2
+- Rebuild against mozjs68-68.6.0-2 (built with gcc 10)
+
+* Sun Mar 08 2020 Kalev Lember <klember@redhat.com> - 1.64.0-1
+- Update to 1.64.0
+
+* Mon Mar 02 2020 Kalev Lember <klember@redhat.com> - 1.63.92-1
+- Update to 1.63.92
+
+* Tue Feb 18 2020 Kalev Lember <klember@redhat.com> - 1.63.91-1
+- Update to 1.63.91
+
+* Mon Feb 03 2020 Kalev Lember <klember@redhat.com> - 1.63.90-1
+- Update to 1.63.90
+- Switch to building with mozjs68
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.63.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Wed Jan 08 2020 Kalev Lember <klember@redhat.com> - 1.63.3-1
+- Update to 1.63.3
+
+* Wed Dec 11 2019 Florian Müllner <fmuellner@redhat.com> - 1.63.2-1
+- Update to 1.63.2
+
+* Wed Nov 27 2019 Kalev Lember <klember@redhat.com> - 1.58.3-1
+- Update to 1.58.3
+
+* Mon Oct 07 2019 Kalev Lember <klember@redhat.com> - 1.58.1-1
+- Update to 1.58.1
+
+* Sun Sep 08 2019 Kalev Lember <klember@redhat.com> - 1.58.0-1
+- Update to 1.58.0
+
+* Wed Sep 04 2019 Kalev Lember <klember@redhat.com> - 1.57.92-2
+- Rebuild against mozjs60 60.9.0
+
+* Tue Sep 03 2019 Kalev Lember <klember@redhat.com> - 1.57.92-1
+- Update to 1.57.92
+
+* Mon Aug 19 2019 Kalev Lember <klember@redhat.com> - 1.57.91-1
+- Update to 1.57.91
+
+* Mon Aug 12 2019 Kalev Lember <klember@redhat.com> - 1.57.90-1
+- Update to 1.57.90
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.57.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Jul 19 2019 Kalev Lember <klember@redhat.com> - 1.57.4-1
+- Update to 1.57.4
+- Enable sysprof capture support
+
+* Tue Jul 09 2019 Frantisek Zatloukal <fzatlouk@redhat.com> - 1.57.3-3
+- Rebuild against mozjs60 60.8.0
+
+* Sat Jun 22 2019 Frantisek Zatloukal <fzatlouk@redhat.com> - 1.57.3-2
+- Rebuild against mozjs60 60.7.2
+
+* Thu Jun 20 2019 Kalev Lember <klember@redhat.com> - 1.57.3-1
+- Update to 1.57.3
+
+* Wed Jun 19 2019 Frantisek Zatloukal <fzatlouk@redhat.com> - 1.57.2-3
+- Rebuild against mozjs60 60.7.1
+
+* Tue May 21 2019 Kalev Lember <klember@redhat.com> - 1.57.2-2
+- Rebuild against mozjs60 60.7.0
+
+* Tue May 21 2019 Kalev Lember <klember@redhat.com> - 1.57.2-1
+- Update to 1.57.2
+
+* Thu May 09 2019 Kalev Lember <klember@redhat.com> - 1.57.1-1
+- Update to 1.57.1
+
+* Wed May 08 2019 Kalev Lember <klember@redhat.com> - 1.56.2-1
 - Update to 1.56.2
-  Resolves: #1698923
 
-* Fri Feb 22 2019 Florian Müllner <fmuellner@redhat.com> - 1.52.5-2
+* Mon Apr 15 2019 Frantisek Zatloukal <fzatlouk@redhat.com> - 1.56.1-2
-- Fix crash in cairo support module
+- Rebuild against mozjs60-60.6.1
-  Resolves: #1678869
 
-* Mon Jan 21 2019 Ray Strode <rstrode@redhat.com> - 1.52.5-1
+* Mon Apr 08 2019 Kalev Lember <klember@redhat.com> - 1.56.1-1
-- Update to 1.52.5
+- Update to 1.56.1
-- Fixes delayed garbage collection problem
-  Resolves: #1666809
 
-* Wed Dec 12 2018 Ray Strode <rstrode@redhat.com> - 1.52.4-2
+* Tue Mar 12 2019 Kalev Lember <klember@redhat.com> - 1.56.0-1
-- rebuild
+- Update to 1.56.0
 
-* Tue Oct 16 2018 Kalev Lember <klember@redhat.com> - 1.52.4-1
+* Tue Mar 05 2019 Kalev Lember <klember@redhat.com> - 1.55.92-1
-- Update to 1.52.4
+- Update to 1.55.92
+
+* Mon Feb 18 2019 Kalev Lember <klember@redhat.com> - 1.55.91-1
+- Update to 1.55.91
+
+* Sun Feb 17 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.55.90-3
+- Rebuild for readline 8.0
+
+* Thu Feb 14 2019 Frantisek Zatloukal <fzatlouk@redhat.com> - 1.55.90-2
+- Rebuild against mozjs60 built by GCC9: ABI change detected by Taskotron/abicheck
+
+* Tue Feb 05 2019 Kalev Lember <klember@redhat.com> - 1.55.90-1
+- Update to 1.55.90
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.55.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Tue Jan 08 2019 Kalev Lember <klember@redhat.com> - 1.55.4-1
+- Update to 1.55.4
+
+* Wed Jan 02 2019 Frantisek Zatloukal <fzatlouk@redhat.com> - 1.55.1-3
+- Add BR dbus-daemon to fix running tests on F30
+
+* Wed Jan 02 2019 Frantisek Zatloukal <fzatlouk@redhat.com> - 1.55.1-2
+- Rebuilt against mozjs60 60.4.0
+
+* Tue Oct 09 2018 Kalev Lember <klember@redhat.com> - 1.55.1-1
+- Update to 1.55.1
+
+* Fri Oct 05 2018 Kalev Lember <klember@redhat.com> - 1.54.1-2
+- Rebuilt against mozjs60 60.2.2
+
+* Mon Sep 24 2018 Kalev Lember <klember@redhat.com> - 1.54.1-1
+- Update to 1.54.1
+
+* Thu Sep 13 2018 Kalev Lember <klember@redhat.com> - 1.54.0-3
+- Rebuilt against mozjs60 60.2.0 that broke ABI (#1628438)
+
+* Mon Sep 10 2018 Kalev Lember <klember@redhat.com> - 1.54.0-2
+- Rebuilt against fixed atk (#1626575)
+
+* Thu Sep 06 2018 Kalev Lember <klember@redhat.com> - 1.54.0-1
+- Update to 1.54.0
+- Switch to building with mozjs60
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.52.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
 * Tue May 08 2018 Kalev Lember <klember@redhat.com> - 1.52.3-1
 - Update to 1.52.3