From 805a9077622235a0280003e5b691c811ae759f85 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sun, 6 Sep 2020 22:25:08 +0200 Subject: [PATCH] Update to 1.65.92 --- .gitignore | 1 + ...ntation_emit_signal-don-t-try-to-unr.patch | 35 ------------------- gjs.spec | 10 +++--- sources | 2 +- 4 files changed, 7 insertions(+), 41 deletions(-) delete mode 100644 0001-gjs_dbus_implementation_emit_signal-don-t-try-to-unr.patch diff --git a/.gitignore b/.gitignore index 378f7cc..8df327c 100644 --- a/.gitignore +++ b/.gitignore @@ -110,3 +110,4 @@ gjs-0.7.1.tar.gz /gjs-1.65.4.tar.xz /gjs-1.65.90.tar.xz /gjs-1.65.91.tar.xz +/gjs-1.65.92.tar.xz diff --git a/0001-gjs_dbus_implementation_emit_signal-don-t-try-to-unr.patch b/0001-gjs_dbus_implementation_emit_signal-don-t-try-to-unr.patch deleted file mode 100644 index ec57bfc..0000000 --- a/0001-gjs_dbus_implementation_emit_signal-don-t-try-to-unr.patch +++ /dev/null @@ -1,35 +0,0 @@ -From dc15ab81baf589a071b241da90e2ee83c83baef3 Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Fri, 28 Aug 2020 13:33:04 -0700 -Subject: [PATCH] gjs_dbus_implementation_emit_signal: don't try to unref NULL - -07221d6d (which added support for multiple bus connections) -added a `g_variant_unref(parameters)` call here, but it needs to -only be done if `parameters` is not `NULL`. This was causing -frequent "g_variant_unref: assertion 'value != NULL' failed" -errors in the journal, see -https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/3102 . - -Signed-off-by: Adam Williamson ---- - libgjs-private/gjs-gdbus-wrapper.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/libgjs-private/gjs-gdbus-wrapper.c b/libgjs-private/gjs-gdbus-wrapper.c -index f7361366..eb0516f9 100644 ---- a/libgjs-private/gjs-gdbus-wrapper.c -+++ b/libgjs-private/gjs-gdbus-wrapper.c -@@ -395,7 +395,9 @@ gjs_dbus_implementation_emit_signal (GjsDBusImplementation *self, - - g_object_unref(iter->data); - } -- g_variant_unref(parameters); -+ if (parameters != NULL) -+ g_variant_unref(parameters); -+ - g_list_free(connections); - } - --- -2.28.0 - diff --git a/gjs.spec b/gjs.spec index 341dd2f..878966a 100644 --- a/gjs.spec +++ b/gjs.spec @@ -4,8 +4,8 @@ %global mozjs78_version 78.2.0-1 Name: gjs -Version: 1.65.91 -Release: 3%{?dist} +Version: 1.65.92 +Release: 1%{?dist} Summary: Javascript Bindings for GNOME # The following files contain code from Mozilla which @@ -15,9 +15,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.65/%{name}-%{version}.tar.xz -# Fix frequent "g_variant_unref: assertion 'value != NULL' failed" errors -# https://gitlab.gnome.org/GNOME/gjs/-/merge_requests/483 -Patch0: 0001-gjs_dbus_implementation_emit_signal-don-t-try-to-unr.patch BuildRequires: cairo-gobject-devel BuildRequires: dbus-daemon @@ -97,6 +94,9 @@ the functionality of the installed gjs package. %{_datadir}/installed-tests/ %changelog +* Sun Sep 06 2020 Kalev Lember - 1.65.92-1 +- Update to 1.65.92 + * Fri Aug 28 2020 Adam Williamson - 1.65.91-3 - Backport MR #483 to fix frequent g_variant_unref errors in journal diff --git a/sources b/sources index 5e867fc..622a8a6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gjs-1.65.91.tar.xz) = 966ff6a073956fac83a5b9340580bd899efd42df09b97766c75842ef66c77e3e441c69274e73a29e36cb2b53d8bbc176e102e8520d1fa187a489d61c6e15404e +SHA512 (gjs-1.65.92.tar.xz) = 0e9c41c55cc07b81c4df482c4e6397508e369b7547dc371dcdaec12bc20cd4c332815fdca16db2b7ad92ffc445d6035963bb1bead8751c3a20f8f9e8e2703c3a