Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/gnome-tweaks.git#5422ad5c81448b8fdea2fec04c49f0bf626548c5
This commit is contained in:
DistroBaker 2021-03-01 10:05:25 +00:00
parent 3067c3c2e1
commit ccabb7ce63
3 changed files with 5 additions and 43 deletions

View File

@ -1,30 +0,0 @@
From ca3581fe34030438c323b7da6b6d08abcd4d391d Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Mon, 19 Nov 2018 11:06:30 +0100
Subject: [PATCH] extensions: Fix opening system installed extensions in
gnome-software
When generating the app id that's passed to gnome-software, avoid
hardcoding the 'user' scope and use 'system' scope for system-wide
installed shell extensions.
---
gtweak/tweaks/tweak_group_shell_extensions.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/gtweak/tweaks/tweak_group_shell_extensions.py b/gtweak/tweaks/tweak_group_shell_extensions.py
index 47854a7..284e6e0 100644
--- a/gtweak/tweaks/tweak_group_shell_extensions.py
+++ b/gtweak/tweaks/tweak_group_shell_extensions.py
@@ -88,7 +88,8 @@ class _ShellExtensionTweak(Gtk.ListBoxRow, Tweak):
self._shell = shell
state = ext.get("state")
uuid = ext["uuid"]
- self._app_id = "user/*/extensions-web/shell-extension/" + uuid.replace('@', '_') + "/*"
+ scope = "user" if ext.get("type") == GnomeShell.EXTENSION_TYPE["PER_USER"] else "system"
+ self._app_id = scope + "/*/*/shell-extension/" + uuid.replace('@', '_') + "/*"
shell._settings.bind("disable-user-extensions", self,
"sensitive", Gio.SettingsBindFlags.INVERT_BOOLEAN)
--
2.19.1

View File

@ -1,12 +0,0 @@
diff -up ./gtweak/tweaks/tweak_group_shell_extensions.py.orig ./gtweak/tweaks/tweak_group_shell_extensions.py
--- ./gtweak/tweaks/tweak_group_shell_extensions.py.orig 2019-09-27 13:15:56.000000000 +0200
+++ ./gtweak/tweaks/tweak_group_shell_extensions.py 2020-04-04 12:47:37.398869243 +0200
@@ -159,7 +159,7 @@ class _ShellExtensionTweak(Gtk.ListBoxRo
sw.set_active(False)
def _on_configure_clicked(self, btn, uuid):
- execute_subprocess(['gnome-shell-extension-prefs', uuid], block=False)
+ execute_subprocess(['gnome-extensions', 'prefs', uuid], block=False)
def _on_extension_toggled(self, sw, active, uuid):
if not sw.get_active():

View File

@ -3,7 +3,7 @@
Name: gnome-tweaks
Version: 40~beta
Release: 3%{?dist}
Release: 4%{?dist}
Summary: Customize advanced GNOME 3 options
# Software is GPLv3, Appdata file is CC0-1.0
@ -20,6 +20,7 @@ Requires: gnome-desktop3
Requires: gnome-settings-daemon
Requires: gnome-shell
Requires: gnome-shell-extension-user-theme
Requires: gnome-themes-extra
Requires: gobject-introspection
Requires: gsettings-desktop-schemas
Requires: gtk3
@ -84,6 +85,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT/%{_datadir}/metainfo/*.app
%changelog
* Tue Feb 23 2021 Kalev Lember <klember@redhat.com> - 40~beta-4
- Require gnome-themes-extra for gtk3 css files
* Thu Feb 18 2021 Kalev Lember <klember@redhat.com> - 40~beta-3
- Use same pre-release system as in other GNOME packages