pool/gnome-shell
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 833590 from home:xiaoguang_wang:branches:GNOME:Factory

Browse Source 
- Move branding image file to branding-SLE package
  (jsc#SLE-11720 bsc#1176304).
  + Update gnome-shell-1007468-lock-screen-SUSE-logo-missing.patch
  + Remove sle-background.png

OBS-URL: https://build.opensuse.org/request/show/833590
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell?expand=0&rev=448
This commit is contained in:
Dominique Leuenberger 2020-09-11 08:20:01 +00:00 committed by Git OBS Bridge
parent 175a1f90fe
commit d50cd0f61c
4 changed files with 16 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
gnome-shell-1007468-lock-screen-SUSE-logo-missing.patch
View File

@ -1,37 +1,15 @@
Index: gnome-shell-3.34.1+7/data/gnome-shell-theme.gresource.xml
Index: gnome-shell-3.34.5/js/ui/unlockDialog.js
===================================================================
--- 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 @@
<file>toggle-on.svg</file>
<file>toggle-on-dark.svg</file>
<file>toggle-on-hc.svg</file>
+ <file>sle-background.png</file>
</gresource>
</gresources>
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;
}
+.login-dialog-sle {
+ background: #2e3436 url(sle-background.png); }
+
.login-dialog {
//reset
border: none;
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
--- gnome-shell-3.34.5.orig/js/ui/unlockDialog.js
+++ gnome-shell-3.34.5/js/ui/unlockDialog.js
@@ -23,6 +23,10 @@ var UnlockDialog = GObject.registerClass
visible: false,
});
+ this.add_style_class_name('login-dialog-sle');
+ let path = '/usr/share/gnome-shell/theme/SLE-background.png';
+ if (GLib.file_test(path, GLib.FileTest.EXISTS))
+ this.style = 'background: url(' + path + ')';
+
this.add_constraint(new Layout.MonitorConstraint({ primary: true }));
parentActor.add_child(this);

8
gnome-shell.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Sep 10 01:58:30 UTC 2020 - Xiaoguang Wang <xiaoguang.wang@suse.com>
- Move branding image file to branding-SLE package
(jsc#SLE-11720 bsc#1176304).
+ Update gnome-shell-1007468-lock-screen-SUSE-logo-missing.patch
+ Remove sle-background.png
-------------------------------------------------------------------
Tue Sep 8 12:08:30 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>

3
gnome-shell.spec
View File

@ -29,8 +29,6 @@ URL: https://wiki.gnome.org/Projects/GnomeShell
Source: %{name}-%{version}.tar.xz
# SOURCE-FEATURE-SLE aboutMenu fate#314545 dliang@suse.com -- Add an applet on login UI to display suse icon, product name, hostname.
Source1: aboutMenu.js
# SOURCE-FEATURE-SLE sle-background bsc#1007468 xwang@suse.com -- Add SUSE logo on lock screen for GNOME theme
Source2: sle-background.png
# PATCH-FIX-UPSTREAM gnome-shell-private-connection.patch bnc#751211 bgo#646187 dimstar@opensuse.org -- create private connections if the user is not authorized
Patch1: gnome-shell-private-connection.patch
@ -197,7 +195,6 @@ translation-update-upstream
%if 0%{?sle_version}
cp %{SOURCE1} js/ui/
cp %{SOURCE2} data/theme/
%endif
%build

3
sle-background.png
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ffb9cbca2f9c45042c2b892be1f7536813005c0485dba438d5b17915126515c8
size 34068