gnome-base/gnome-shell: restrict to older gjs

3.28 and older crash without upstream commit e36ba874
"Stop using conditional catch statements
It is a mozilla extension that is going away in SpiderMonkey 60."

It trivially applies to 3.28, after which 3.28 appears to work
fine with newer gjs, but we'll be bumping gnome-shell to 3.30
very soon anyways. Plus there seem to be non-crashing issues from
using newer gjs with gnome-shell-3.28 (missing labels in GPG/SSH
password dialogs for example).

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio@gentoo.org>

diff --git a/gnome-base/gnome-shell/gnome-shell-3.24.3.ebuild b/gnome-base/gnome-shell/gnome-shell-3.24.3.ebuild
index d163df856f89f5bc19ac3ed60f3ab97bbf1c8b08..4639ca5f8726f4b1a25ea13a6f000ca777a4efc4 100644 (file)
--- a/gnome-base/gnome-shell/gnome-shell-3.24.3.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.24.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,6 +27,7 @@ COMMON_DEPEND="
        >=app-crypt/gcr-3.7.5[introspection]
        >=dev-libs/glib-2.45.3:2[dbus]
        >=dev-libs/gjs-1.47.0
+       <dev-libs/gjs-1.53
        >=dev-libs/gobject-introspection-1.49.1:=
        dev-libs/libical:=
        >=x11-libs/gtk+-3.15.0:3[introspection]

diff --git a/gnome-base/gnome-shell/gnome-shell-3.26.2-r4.ebuild b/gnome-base/gnome-shell/gnome-shell-3.26.2-r4.ebuild
index 6ebaf3f99c33d63c2ccd9f40a6a49fa3a4485722..af185e103a1c4c247594d0926f8656376f15c846 100644 (file)
--- a/gnome-base/gnome-shell/gnome-shell-3.26.2-r4.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.26.2-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,6 +29,7 @@ COMMON_DEPEND="
        >=dev-libs/glib-2.53.0:2
        >=dev-libs/gobject-introspection-1.49.1:=
        >=dev-libs/gjs-1.47.0
+       <dev-libs/gjs-1.53
        >=x11-libs/gtk+-3.15.0:3[introspection]
        nsplugin? ( >=dev-libs/json-glib-0.13.2 )
        >=x11-wm/mutter-3.24.0:0/1[introspection]

diff --git a/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild b/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild
index a6c40a3bf6134b743730bc33768875166ac5b293..42564e155a8ab79a76111e0ce7983c994f083f06 100644 (file)
--- a/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild
@@ -29,6 +29,7 @@ COMMON_DEPEND="
        >=dev-libs/glib-2.56.0:2
        >=dev-libs/gobject-introspection-1.49.1:=
        >=dev-libs/gjs-1.47.0
+       <dev-libs/gjs-1.53
        >=x11-libs/gtk+-3.15.0:3[introspection]
        nsplugin? ( >=dev-libs/json-glib-0.13.2 )
        >=x11-wm/mutter-3.28.0:0/2[introspection]