diff --git a/.gitignore b/.gitignore index c71e5e5..789232a 100644 --- a/.gitignore +++ b/.gitignore @@ -134,3 +134,4 @@ gjs-0.7.1.tar.gz /gjs-1.74.1.tar.xz /gjs-1.75.1.tar.xz /gjs-1.75.2.tar.xz +/gjs-1.75.90.tar.xz diff --git a/gjs-1.75.2-signed-char.patch b/gjs-1.75.2-signed-char.patch deleted file mode 100644 index b9b0cda..0000000 --- a/gjs-1.75.2-signed-char.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 3dce1d6b1885f326c55aed9e1d401ac79801396a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= -Date: Thu, 23 Feb 2023 21:46:59 +0100 -Subject: [PATCH 1/2] value: Use a signed char to old g_value_get_schar result - -char and signed char are the same in most of platforms, but that's not -always true such as in arm64, s390x, ppc64el and others. - -See: https://buildd.debian.org/status/fetch.php?pkg=gjs&arch=arm64&ver=1.75.2-1&stamp=1676991213&raw=0 - -Closes: #529 ---- - gi/value.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gi/value.cpp b/gi/value.cpp -index 2e2f49aa2..651c21ad3 100644 ---- a/gi/value.cpp -+++ b/gi/value.cpp -@@ -881,7 +881,7 @@ gjs_value_from_g_value_internal(JSContext *context, - return false; - } - } else if (gtype == G_TYPE_CHAR) { -- char v; -+ signed char v; - v = g_value_get_schar(gvalue); - value_p.setInt32(v); - } else if (gtype == G_TYPE_UCHAR) { --- -GitLab - - -From 86a66ea412a725caa59d9fa41ea333117406768e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= -Date: Thu, 23 Feb 2023 21:53:16 +0100 -Subject: [PATCH 2/2] gi/value: Cleanup schar setting code - -We still need to use an int32 to hold its result (as that's where a -signed char is stored in JS), but if the conversion is fine we need to -cast its value to signed char. Do it using C++ style now though. ---- - gi/value.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gi/value.cpp b/gi/value.cpp -index 651c21ad3..17db002f6 100644 ---- a/gi/value.cpp -+++ b/gi/value.cpp -@@ -458,11 +458,11 @@ gjs_value_to_g_value_internal(JSContext *context, - return throw_expect_type(context, value, "string"); - } - } else if (gtype == G_TYPE_CHAR) { -- gint32 i; -+ int32_t i; - if (Gjs::js_value_to_c_checked(context, value, &i, - &out_of_range) && - !out_of_range) { -- g_value_set_schar(gvalue, (signed char)i); -+ g_value_set_schar(gvalue, static_cast(i)); - } else { - return throw_expect_type(context, value, "char", 0, out_of_range); - } --- -GitLab - diff --git a/gjs.spec b/gjs.spec index 84abc52..522b0a2 100644 --- a/gjs.spec +++ b/gjs.spec @@ -3,7 +3,7 @@ %global mozjs102_version 102.8.0 Name: gjs -Version: 1.75.2 +Version: 1.75.90 Release: 1%{?dist} Summary: Javascript Bindings for GNOME @@ -14,8 +14,6 @@ Summary: Javascript Bindings for GNOME License: MIT and (MPLv1.1 or GPLv2+ or LGPLv2+) URL: https://wiki.gnome.org/Projects/Gjs Source0: https://download.gnome.org/sources/%{name}/1.75/%{name}-%{version}.tar.xz -# https://gitlab.gnome.org/GNOME/gjs/-/merge_requests/825 -Patch0: gjs-1.75.2-signed-char.patch BuildRequires: gcc-c++ BuildRequires: meson @@ -96,6 +94,9 @@ the functionality of the installed gjs package. %{_datadir}/installed-tests/ %changelog +* Mon Mar 06 2023 David King - 1.75.90-1 +- Update to 1.75.90 + * Thu Feb 23 2023 David King - 1.75.2-1 - Update to 1.75.2 diff --git a/sources b/sources index 75a9a6e..e813e17 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gjs-1.75.2.tar.xz) = 2b9699a16d8c8d3c8117aa1a338700e995903dd22ec1d6d21ed26863c5a3ae1505b96c81c60e024b9f7341167269a2bd419f625106e8bbfec3804680b9fe297e +SHA512 (gjs-1.75.90.tar.xz) = 2bfdb9fb62612505e2f647c164944337257915d427e62c340b1dbe389d22cf309fe4ba4f55c9399c3027136e24b49ed441598b9fbd93389e8596e2de8a6917fc