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

Accepting request 911497 from GNOME:Factory

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/911497
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-shell?expand=0&rev=204
This commit is contained in:
Richard Brown 2021-08-16 08:05:37 +00:00 committed by Git OBS Bridge
commit 687db9808d
3 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
gnome-shell-executable-path-not-absolute.patch Normal file
View File

@ -0,0 +1,35 @@
diff --git a/data/meson.build b/data/meson.build
index 4a1e16d..490e793 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -115,8 +115,14 @@ if have_systemd
install_dir: systemduserunitdir
)
- units = files('org.gnome.Shell.target',
- 'org.gnome.Shell-disable-extensions.service')
+ configure_file(
+ input: 'org.gnome.Shell-disable-extensions.service.in',
+ output: 'org.gnome.Shell-disable-extensions.service',
+ configuration: unitconf,
+ install_dir: systemduserunitdir
+ )
+
+ units = files('org.gnome.Shell.target')
install_data(units, install_dir: systemduserunitdir)
endif
diff --git a/data/org.gnome.Shell-disable-extensions.service b/data/org.gnome.Shell-disable-extensions.service.in
similarity index 85%
rename from data/org.gnome.Shell-disable-extensions.service
rename to data/org.gnome.Shell-disable-extensions.service.in
index de91167..49236a6 100644
--- a/data/org.gnome.Shell-disable-extensions.service
+++ b/data/org.gnome.Shell-disable-extensions.service.in
@@ -11,5 +11,5 @@ ConditionPathExists=%t/gnome-shell-disable-extensions
[Service]
Type=simple
# Disable extensions
-ExecStart=gsettings set org.gnome.shell disable-user-extensions true
+ExecStart=@bindir@/gsettings set org.gnome.shell disable-user-extensions true
Restart=no

8
gnome-shell.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Aug 10 02:51:13 UTC 2021 - Xiaoguang Wang <xiaoguang.wang@suse.com>
- Add gnome-shell-executable-path-not-absolute.patch: Fix ExecStart
is not absolute path. ExecStart can use related path in high
systemd version. The current systemd version in SLE-15-SP2
should use absolute path (bsc#1176051 bsc#1188960).
-------------------------------------------------------------------
Mon Aug 2 00:09:07 UTC 2021 - Yifan Jiang <yfjiang@suse.com>

3
gnome-shell.spec
View File

@ -42,6 +42,8 @@ Patch4: gnome-shell-fate324570-Make-GDM-background-image-configurable.pa
Patch5: gnome-shell-jscSLE9267-Remove-sessionList-of-endSessionDialog.patch
# PATCH-FIX-UPSTREAM gnome-shell-jsc#SLE-16051-Input-method-recommendation.patch jsc#SLE-16051 glgo#GNOME/gnome-shell!1563 qzhao@suse.com -- launch recommended input engines when Gnome-shell init in CJK regions.
Patch6: gnome-shell-jsc#SLE-16051-Input-method-recommendation.patch
# PATCH-FIX-OPENSUSE gnome-shell-executable-path-not-absolute.patch bsc#1176051 xwang@suse.com -- Fix ExecStart is not absolute path
Patch7: gnome-shell-executable-path-not-absolute.patch
## NOTE: Keep SLE-only patches at bottom (starting on 1000).
# PATCH-FEATURE-SLE gnome-shell-gdm-login-applet.patch fate#314545 dliang@suse.com -- Add an applet on login UI to display suse icon, product name, hostname.
@ -180,6 +182,7 @@ This package contains an optional extensions app for managing GNOME Shell extens
%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150300
%patch6 -p1
%endif
%patch7 -p1
translation-update-upstream