import gjs-1.56.2-3.el8

.gitignore

@@ -1 +1 @@
-SOURCES/gjs-1.52.5.tar.xz
+SOURCES/gjs-1.56.2.tar.xz

.gjs.metadata

@@ -1 +1 @@
-a133292bdc6e922b30679f7de9364ec847599b03 SOURCES/gjs-1.52.5.tar.xz
+cf4f885d2d41a5c9fb85bd90df46bb67a93f4f07 SOURCES/gjs-1.56.2.tar.xz

SOURCES/0001-cairo-context-Special-case-0-sized-vector.patch

@@ -1,28 +0,0 @@
-From c47b4f6993f1cd7fb346f0e09a0fabb0a158039b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
-Date: Fri, 22 Feb 2019 14:16:17 +0100
-Subject: [PATCH] cairo-context: Special-case 0-sized vector
-
----
- modules/cairo-context.cpp | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/modules/cairo-context.cpp b/modules/cairo-context.cpp
-index e77bde16..35d798a6 100644
---- a/modules/cairo-context.cpp
-+++ b/modules/cairo-context.cpp
-@@ -582,7 +582,10 @@ setDash_func(JSContext *context,
-         dashes_c.push_back(b);
-     }
- 
--    cairo_set_dash(cr, &dashes_c[0], dashes_c.size(), offset);
-+    if (dashes_c.size() == 0)
-+        cairo_set_dash(cr, NULL, 0, offset);
-+    else
-+        cairo_set_dash(cr, &dashes_c[0], dashes_c.size(), offset);
-     argv.rval().setUndefined();
-     return true;
- }
--- 
-2.20.1
-

SPECS/gjs.spec

@@ -1,10 +1,11 @@
-%global glib2_version 2.50.0
+%global glib2_version 2.54.0
 %global gobject_introspection_version 1.41.4
 %global gtk3_version 3.20
+%global mozjs60_version 60.9.0
 
 Name:          gjs
-Version:       1.52.5
+Version:       1.56.2
-Release:       2%{?dist}
+Release:       3%{?dist}
 Summary:       Javascript Bindings for GNOME
 
 # The following files contain code from Mozilla which
@@ -13,24 +14,27 @@ Summary:       Javascript Bindings for GNOME
 # Stack printer (gjs/stack.c)
 License:       MIT and (MPLv1.1 or GPLv2+ or LGPLv2+)
 URL:           https://wiki.gnome.org/Projects/Gjs
-Source0:       https://download.gnome.org/sources/%{name}/1.52/%{name}-%{version}.tar.xz
+Source0:       https://download.gnome.org/sources/%{name}/1.56/%{name}-%{version}.tar.xz
 
-Patch0:        0001-cairo-context-Special-case-0-sized-vector.patch
+Patch0:        0001-gi-Include-missing-glib-bits.patch
 
 BuildRequires: cairo-gobject-devel
 BuildRequires: chrpath
-BuildRequires: gobject-introspection-devel >= %{gobject_introspection_version}
+BuildRequires: dbus-daemon
-BuildRequires: readline-devel
 BuildRequires: dbus-glib-devel
+BuildRequires: gcc-c++
 BuildRequires: gettext
 BuildRequires: glib2-devel >= %{glib2_version}
+BuildRequires: gobject-introspection-devel >= %{gobject_introspection_version}
 BuildRequires: gtk3-devel >= %{gtk3_version}
-BuildRequires: mozjs52-devel
+BuildRequires: mozjs60-devel >= %{mozjs60_version}
 BuildRequires: pkgconfig
+BuildRequires: readline-devel
 
 Requires: glib2%{?_isa} >= %{glib2_version}
 Requires: gobject-introspection%{?_isa} >= %{gobject_introspection_version}
 Requires: gtk3%{?_isa} >= %{gtk3_version}
+Requires: mozjs60%{?_isa} >= %{mozjs60_version}
 
 # Filter provides for private libraries
 %global __provides_exclude_from ^%{_libdir}/gjs/
@@ -97,6 +101,14 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 %{_datadir}/installed-tests
 
 %changelog
+* Tue Sep 10 2019 Kalev Lember <klember@redhat.com> - 1.56.2-3
+- Rebuild for mozjs60 s390x fixes
+- Related: #1746889
+
+* Thu May 23 2019 Florian Müllner <fmuellner@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
 - Fix crash in cairo support module
   Resolves: #1678869