From 6096fd0f235e041621e2988623100e33d9d92d8cea15d3b69a3ca306db4f65a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Fri, 1 Nov 2019 08:55:47 +0000 Subject: [PATCH] Accepting request 744680 from GNOME:Next OBS-URL: https://build.opensuse.org/request/show/744680 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell?expand=0&rev=402 --- _servicedata | 2 +- ...007468-lock-screen-SUSE-logo-missing.patch | 35 ++++++++++--------- gnome-shell-3.34.1+6.obscpio | 3 -- gnome-shell-3.34.1+7.obscpio | 3 ++ gnome-shell-domain.patch | 30 +++++++++------- gnome-shell.changes | 12 +++++++ gnome-shell.obsinfo | 6 ++-- gnome-shell.spec | 2 +- 8 files changed, 56 insertions(+), 37 deletions(-) delete mode 100644 gnome-shell-3.34.1+6.obscpio create mode 100644 gnome-shell-3.34.1+7.obscpio diff --git a/_servicedata b/_servicedata index 737bf98..001f815 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://gitlab.gnome.org/GNOME/gnome-shell.git - 246150d8b6177fda9aba47cba6089fcf548e0dab \ No newline at end of file + 750c5acd30ef724b2398bb9d9178a130b58e046b \ No newline at end of file diff --git a/gnome-shell-1007468-lock-screen-SUSE-logo-missing.patch b/gnome-shell-1007468-lock-screen-SUSE-logo-missing.patch index 9e3e4a1..4173150 100644 --- a/gnome-shell-1007468-lock-screen-SUSE-logo-missing.patch +++ b/gnome-shell-1007468-lock-screen-SUSE-logo-missing.patch @@ -1,6 +1,7 @@ -diff -urp gnome-shell-3.33.91.orig/data/gnome-shell-theme.gresource.xml gnome-shell-3.33.91/data/gnome-shell-theme.gresource.xml ---- gnome-shell-3.33.91.orig/data/gnome-shell-theme.gresource.xml 2019-08-21 15:00:39.000000000 -0500 -+++ gnome-shell-3.33.91/data/gnome-shell-theme.gresource.xml 2019-09-04 15:20:19.511263425 -0500 +Index: gnome-shell-3.34.1+7/data/gnome-shell-theme.gresource.xml +=================================================================== +--- gnome-shell-3.34.1+7.orig/data/gnome-shell-theme.gresource.xml ++++ gnome-shell-3.34.1+7/data/gnome-shell-theme.gresource.xml @@ -31,5 +31,6 @@ toggle-on.svg toggle-on-dark.svg @@ -8,10 +9,11 @@ diff -urp gnome-shell-3.33.91.orig/data/gnome-shell-theme.gresource.xml gnome-sh + sle-background.png -diff -urp gnome-shell-3.33.91.orig/data/theme/gnome-shell-sass/_common.scss gnome-shell-3.33.91/data/theme/gnome-shell-sass/_common.scss ---- gnome-shell-3.33.91.orig/data/theme/gnome-shell-sass/_common.scss 2019-08-21 15:00:39.000000000 -0500 -+++ gnome-shell-3.33.91/data/theme/gnome-shell-sass/_common.scss 2019-09-04 15:22:50.500063729 -0500 -@@ -1912,6 +1912,9 @@ StScrollBar { +Index: gnome-shell-3.34.1+7/data/theme/gnome-shell-sass/_common.scss +=================================================================== +--- gnome-shell-3.34.1+7.orig/data/theme/gnome-shell-sass/_common.scss ++++ gnome-shell-3.34.1+7/data/theme/gnome-shell-sass/_common.scss +@@ -1919,6 +1919,9 @@ StScrollBar { max-width: 23em; } @@ -21,14 +23,15 @@ diff -urp gnome-shell-3.33.91.orig/data/theme/gnome-shell-sass/_common.scss gnom .login-dialog { //reset border: none; -diff -urp gnome-shell-3.33.91.orig/js/ui/unlockDialog.js gnome-shell-3.33.91/js/ui/unlockDialog.js ---- gnome-shell-3.33.91.orig/js/ui/unlockDialog.js 2019-08-21 15:00:39.000000000 -0500 -+++ gnome-shell-3.33.91/js/ui/unlockDialog.js 2019-09-04 15:24:01.072437800 -0500 -@@ -20,6 +20,7 @@ var UnlockDialog = class { - layout_manager: new Clutter.BoxLayout(), - visible: false }); +Index: gnome-shell-3.34.1+7/js/ui/unlockDialog.js +=================================================================== +--- gnome-shell-3.34.1+7.orig/js/ui/unlockDialog.js ++++ gnome-shell-3.34.1+7/js/ui/unlockDialog.js +@@ -23,6 +23,7 @@ var UnlockDialog = GObject.registerClass + visible: false, + }); -+ this.actor.add_style_class_name('login-dialog-sle'); - this.actor.add_constraint(new Layout.MonitorConstraint({ primary: true })); - parentActor.add_child(this.actor); ++ this.add_style_class_name('login-dialog-sle'); + this.add_constraint(new Layout.MonitorConstraint({ primary: true })); + parentActor.add_child(this); diff --git a/gnome-shell-3.34.1+6.obscpio b/gnome-shell-3.34.1+6.obscpio deleted file mode 100644 index 377fad0..0000000 --- a/gnome-shell-3.34.1+6.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:04a41ef73d7dc3f2fe6092be717e5ac800008399214999ef0c334f6fae14a40e -size 12410381 diff --git a/gnome-shell-3.34.1+7.obscpio b/gnome-shell-3.34.1+7.obscpio new file mode 100644 index 0000000..c1520db --- /dev/null +++ b/gnome-shell-3.34.1+7.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:490d9d1b2ffe2dd89432256edaf71857bb20e8fe4c44f3b07ac9c84fbdd89829 +size 12410381 diff --git a/gnome-shell-domain.patch b/gnome-shell-domain.patch index 5fbe0b7..fbcfcb6 100644 --- a/gnome-shell-domain.patch +++ b/gnome-shell-domain.patch @@ -1,6 +1,7 @@ -diff -urNp gnome-shell-3.33.91.orig/js/gdm/domain.js gnome-shell-3.33.91/js/gdm/domain.js ---- gnome-shell-3.33.91.orig/js/gdm/domain.js 1969-12-31 18:00:00.000000000 -0600 -+++ gnome-shell-3.33.91/js/gdm/domain.js 2019-09-04 10:22:42.476273775 -0500 +Index: gnome-shell-3.34.1+7/js/gdm/domain.js +=================================================================== +--- /dev/null ++++ gnome-shell-3.34.1+7/js/gdm/domain.js @@ -0,0 +1,243 @@ +// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- +/* @@ -245,9 +246,10 @@ diff -urNp gnome-shell-3.33.91.orig/js/gdm/domain.js gnome-shell-3.33.91/js/gdm/ + } +}); +Signals.addSignalMethods(DomainMenuButton.prototype); -diff -urNp gnome-shell-3.33.91.orig/js/gdm/loginDialog.js gnome-shell-3.33.91/js/gdm/loginDialog.js ---- gnome-shell-3.33.91.orig/js/gdm/loginDialog.js 2019-09-04 10:05:51.598915194 -0500 -+++ gnome-shell-3.33.91/js/gdm/loginDialog.js 2019-09-04 12:52:15.396169384 -0500 +Index: gnome-shell-3.34.1+7/js/gdm/loginDialog.js +=================================================================== +--- gnome-shell-3.34.1+7.orig/js/gdm/loginDialog.js ++++ gnome-shell-3.34.1+7/js/gdm/loginDialog.js @@ -22,6 +22,7 @@ const { AccountsService, Atk, Clutter, G const Signals = imports.signals; @@ -335,7 +337,7 @@ diff -urNp gnome-shell-3.33.91.orig/js/gdm/loginDialog.js gnome-shell-3.33.91/js + _startSession(serviceName) { this._bindOpacity(); - this.actor.ease({ + this.ease({ @@ -1099,6 +1153,11 @@ var LoginDialog = GObject.registerClass( this._askForUsernameAndBeginVerification(); } @@ -358,9 +360,10 @@ diff -urNp gnome-shell-3.33.91.orig/js/gdm/loginDialog.js gnome-shell-3.33.91/js if (!Main.screenShield.locked) this._userList.actor.grab_key_focus(); } -diff -urNp gnome-shell-3.33.91.orig/js/js-resources.gresource.xml gnome-shell-3.33.91/js/js-resources.gresource.xml ---- gnome-shell-3.33.91.orig/js/js-resources.gresource.xml 2019-09-04 10:21:23.651855885 -0500 -+++ gnome-shell-3.33.91/js/js-resources.gresource.xml 2019-09-04 12:52:22.840208842 -0500 +Index: gnome-shell-3.34.1+7/js/js-resources.gresource.xml +=================================================================== +--- gnome-shell-3.34.1+7.orig/js/js-resources.gresource.xml ++++ gnome-shell-3.34.1+7/js/js-resources.gresource.xml @@ -2,6 +2,7 @@ @@ -369,9 +372,10 @@ diff -urNp gnome-shell-3.33.91.orig/js/js-resources.gresource.xml gnome-shell-3. gdm/batch.js gdm/fingerprint.js gdm/loginDialog.js -diff -urNp gnome-shell-3.33.91.orig/po/POTFILES.in gnome-shell-3.33.91/po/POTFILES.in ---- gnome-shell-3.33.91.orig/po/POTFILES.in 2019-08-21 15:00:39.000000000 -0500 -+++ gnome-shell-3.33.91/po/POTFILES.in 2019-09-04 12:52:22.840208842 -0500 +Index: gnome-shell-3.34.1+7/po/POTFILES.in +=================================================================== +--- gnome-shell-3.34.1+7.orig/po/POTFILES.in ++++ gnome-shell-3.34.1+7/po/POTFILES.in @@ -7,6 +7,7 @@ data/org.gnome.shell.gschema.xml.in data/org.gnome.Shell.PortalHelper.desktop.in.in js/extensionPrefs/main.js diff --git a/gnome-shell.changes b/gnome-shell.changes index 68e3a40..399aa55 100644 --- a/gnome-shell.changes +++ b/gnome-shell.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Nov 1 08:03:00 UTC 2019 - Alynx Zhou + +- Rebase patch gnome-shell-domain.patch and + gnome-shell-1007468-lock-screen-SUSE-logo-missing.patch. + +------------------------------------------------------------------- +Wed Oct 30 15:41:25 UTC 2019 - dimstar@opensuse.org + +- Update to version 3.34.1+7: + * dnd: Skip drag target when its acceptDrop() throws an exception + ------------------------------------------------------------------- Wed Oct 23 18:16:39 UTC 2019 - bjorn.lie@gmail.com diff --git a/gnome-shell.obsinfo b/gnome-shell.obsinfo index 3034b27..d207c41 100644 --- a/gnome-shell.obsinfo +++ b/gnome-shell.obsinfo @@ -1,5 +1,5 @@ name: gnome-shell -version: 3.34.1+6 -mtime: 1571651197 -commit: 246150d8b6177fda9aba47cba6089fcf548e0dab +version: 3.34.1+7 +mtime: 1571958488 +commit: 750c5acd30ef724b2398bb9d9178a130b58e046b diff --git a/gnome-shell.spec b/gnome-shell.spec index d8b6a97..3dbb6fb 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -19,7 +19,7 @@ %global __requires_exclude typelib\\(Meta\\) Name: gnome-shell -Version: 3.34.1+6 +Version: 3.34.1+7 Release: 0 Summary: GNOME Shell License: GPL-2.0-or-later