8 changed files with 263 additions and 125 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/gnome-tweaks-40.10.tar.xz
+SOURCES/gnome-tweaks-3.28.1.tar.xz
--- a/.gnome-tweaks.metadata
+++ b/.gnome-tweaks.metadata
@ -1 +1 @@
-4d69fc7bb4982a281066d9c62d6a2713df2955e2 SOURCES/gnome-tweaks-40.10.tar.xz
+4b73d3e4a9a8f67f8b65bcb7a2d169183e5e0640 SOURCES/gnome-tweaks-3.28.1.tar.xz
--- a/SOURCES/0001-extensions-Fix-opening-system-installed-extensions-i.patch
+++ b/SOURCES/0001-extensions-Fix-opening-system-installed-extensions-i.patch
@ -0,0 +1,30 @@
+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
+
--- a/SOURCES/0002-settings-Drop-override-settings-support.patch
+++ b/SOURCES/0002-settings-Drop-override-settings-support.patch
@ -0,0 +1,53 @@
+From 000396a7ac3f03b0cea1c7897819634edd9f2dd4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Wed, 18 Jul 2018 17:09:05 +0200
+Subject: [PATCH] settings: Drop override settings support
+
+Now that session-specific overrides landed in GIO, it is no longer
+necessary to explicitly handle different defaults in GNOME and Classic.
+
+https://gitlab.gnome.org/GNOME/gnome-tweaks/merge_requests/9
+---
+ gtweak/widgets.py | 23 -----------------------
+ 1 file changed, 23 deletions(-)
+
+diff --git a/gtweak/widgets.py b/gtweak/widgets.py
+index 3d48a51..f1d607c 100644
+--- a/gtweak/widgets.py
+++ b/gtweak/widgets.py
+@@ -116,32 +116,9 @@ def build_tight_button(stock_id):
+     button.get_style_context().add_provider(provider, 600)
+     return button
+ 
+-def adjust_schema_for_overrides(originalSchema, key, options):
+-    if (_shell is None):
+-        return originalSchema
+-
+-    if (_shell.mode == 'user'):
+-        overridesSchema = "org.gnome.shell.overrides"
+-        overridesFile = "org.gnome.shell.gschema.xml"
+-    elif (_shell.mode == 'classic'):
+-        overridesSchema = "org.gnome.shell.extensions.classic-overrides"
+-        overridesFile = None
+-    else:
+-        return originalSchema
+-
+-    try:
+-        if (key in GSettingsSetting(overridesSchema, schema_filename=overridesFile).list_keys()):
+-            options['schema_filename'] = overridesFile
+-            return overridesSchema
+-    except GSettingsMissingError as e:
+-        logging.info("GSetting missing %s", e)
+-
+-    return originalSchema
+-
+ 
+ class _GSettingsTweak(Tweak):
+     def __init__(self, name, schema_name, key_name, **options):
+-        schema_name = adjust_schema_for_overrides(schema_name, key_name, options)
+         self.schema_name = schema_name
+         self.key_name = key_name
+         self._extra_info = None
+-- 
+2.21.0
+
--- a/SOURCES/drop-app-menu-option.patch
+++ b/SOURCES/drop-app-menu-option.patch
@ -0,0 +1,65 @@
+diff -up gnome-tweaks-3.28.1/gtweak/tweaks/tweak_group_top_bar.py.drop-app-menu-option gnome-tweaks-3.28.1/gtweak/tweaks/tweak_group_top_bar.py
+--- gnome-tweaks-3.28.1/gtweak/tweaks/tweak_group_top_bar.py.drop-app-menu-option	2019-07-04 11:57:08.757232549 +0200
+++ gnome-tweaks-3.28.1/gtweak/tweaks/tweak_group_top_bar.py	2019-07-04 11:58:58.306231034 +0200
+@@ -4,60 +4,13 @@
+ 
+ import gtweak
+ from gtweak.gshellwrapper import GnomeShellFactory
+-from gtweak.widgets import ListBoxTweakGroup, GSettingsSwitchTweak, GetterSetterSwitchTweak, Title, _GSettingsTweak
+-from gtweak.utils import XSettingsOverrides
+from gtweak.widgets import ListBoxTweakGroup, GSettingsSwitchTweak, Title
+ 
+ _shell = GnomeShellFactory().get_shell()
+ _shell_loaded = _shell is not None
+ 
+-class ApplicationMenuTweak(GetterSetterSwitchTweak):
+-    def __init__(self, **options):
+-        self._xsettings = XSettingsOverrides()
+-        name = _("Application Menu")
+-        GetterSetterSwitchTweak.__init__(self, name, **options)
+-
+-        _GSettingsTweak.__init__(self,
+-                                 name,
+-                                 "org.gnome.desktop.wm.preferences",
+-                                 "button-layout",
+-                                 loaded=_shell_loaded,
+-                                 **options)
+-
+-    def get_active(self):
+-        return self._xsettings.get_shell_shows_app_menu()
+-
+-    def set_active(self, v):
+-        self._xsettings.set_shell_shows_app_menu(v)
+-
+-        if v:
+-            self.notify_logout()
+-            return
+-        val = self.settings.get_string(self.key_name)
+-        if "appmenu" in val:
+-            self.notify_logout()
+-            return
+-        else:
+-            (left, colon, right) = val.partition(":")
+-
+-            if "close" in right:
+-                rsplit = right.split(",")
+-                rsplit = [x for x in rsplit if x in ["minimize", "maximize", "close"]]
+-                rsplit.append("appmenu")
+-                rsplit.sort(key=lambda x: ["appmenu", "minimize", "maximize", "close"].index(x))
+-                self.settings.set_string(self.key_name, left + colon + ",".join(rsplit))
+-
+-            else:
+-                rsplit = left.split(",")
+-                rsplit = [x for x in rsplit if x in ["minimize", "maximize", "close"]]
+-                rsplit.append("appmenu")
+-                rsplit.sort(key=lambda x: ["close", "minimize", "maximize", "appmenu"].index(x))
+-                self.settings.set_string(self.key_name, ",".join(rsplit) + colon + right)
+-        self.notify_logout()
+-
+-
+ TWEAK_GROUPS = [
+     ListBoxTweakGroup(_("Top Bar"),
+-        ApplicationMenuTweak(),
+         GSettingsSwitchTweak(_("Battery Percentage"),"org.gnome.desktop.interface", "show-battery-percentage", loaded=_shell_loaded),
+         # Requires patch from https://bugzilla.gnome.org/688320
+         GSettingsSwitchTweak(_("Activities Overview Hot Corner"),"org.gnome.shell", "enable-hot-corners", loaded=_shell_loaded),
--- a/SOURCES/extension-enable-state.patch
+++ b/SOURCES/extension-enable-state.patch
@ -0,0 +1,13 @@
+diff -up gnome-tweaks-3.28.1/gtweak/gshellwrapper.py.orig gnome-tweaks-3.28.1/gtweak/gshellwrapper.py
+--- gnome-tweaks-3.28.1/gtweak/gshellwrapper.py.orig	2020-02-18 11:52:27.943003986 +0100
+++ gnome-tweaks-3.28.1/gtweak/gshellwrapper.py	2020-02-18 11:53:13.572003355 +0100
+@@ -123,8 +123,7 @@ class GnomeShell32(GnomeShell):
+         return self._proxy.proxy.ListExtensions()
+ 
+     def extension_is_active(self, state, uuid):
+-        return state == GnomeShell.EXTENSION_STATE["ENABLED"] and \
+-                self._settings.setting_is_in_list(self.EXTENSION_ENABLED_KEY, uuid)
+        return self._settings.setting_is_in_list(self.EXTENSION_ENABLED_KEY, uuid)
+ 
+     def enable_extension(self, uuid):
+         self._settings.setting_add_to_list(self.EXTENSION_ENABLED_KEY, uuid)
--- a/SOURCES/reflect-extensions-status.patch
+++ b/SOURCES/reflect-extensions-status.patch
@ -0,0 +1,51 @@
+From 3efa6fff00f812a034180d3d980a50cfa9a3250b Mon Sep 17 00:00:00 2001
+From: Carlos Soriano <csoriano@redhat.com>
+Date: Tue, 23 Apr 2019 15:16:17 +0200
+Subject: [PATCH] Reflect extension status in the UI
+
+---
+ gtweak/gshellwrapper.py                       | 3 ++-
+ gtweak/tweaks/tweak_group_shell_extensions.py | 6 ++++--
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/gtweak/gshellwrapper.py b/gtweak/gshellwrapper.py
+index d654f88..ef1873a 100644
+--- a/gtweak/gshellwrapper.py
+++ b/gtweak/gshellwrapper.py
+@@ -81,7 +81,8 @@ class GnomeShell:
+ 
+     EXTENSION_TYPE = {
+         "SYSTEM"        :   1,
+-        "PER_USER"      :   2
+        "PER_USER"      :   2,
+        "SESSION_MODE"  :   3
+     }
+ 
+     DATA_DIR = os.path.join(GLib.get_user_data_dir(), "gnome-shell")
+diff --git a/gtweak/tweaks/tweak_group_shell_extensions.py b/gtweak/tweaks/tweak_group_shell_extensions.py
+index e295d0b..5769774 100644
+--- a/gtweak/tweaks/tweak_group_shell_extensions.py
+++ b/gtweak/tweaks/tweak_group_shell_extensions.py
+@@ -114,7 +114,8 @@ class _ShellExtensionTweak(Gtk.ListBoxRow, Tweak):
+         if state == GnomeShell.EXTENSION_STATE["ENABLED"] or \
+            state == GnomeShell.EXTENSION_STATE["DISABLED"] or \
+            state == GnomeShell.EXTENSION_STATE["INITIALIZED"]:
+-            sensitive = True
+            if ext.get("type") != GnomeShell.EXTENSION_TYPE["SESSION_MODE"]:
+                sensitive = True
+         elif state == GnomeShell.EXTENSION_STATE["DOWNLOADING"]:
+             info = _("Extension downloading")
+         elif state == GnomeShell.EXTENSION_STATE["ERROR"]:
+@@ -145,7 +146,8 @@ class _ShellExtensionTweak(Gtk.ListBoxRow, Tweak):
+         sw = Gtk.Switch(sensitive=sensitive)
+         sw.props.vexpand = False
+         sw.props.valign = Gtk.Align.CENTER
+-        sw.set_active(self._shell.extension_is_active(state, uuid))
+        sw.set_active(self._shell.extension_is_active(state, uuid) or
+                      ext.get("type") == GnomeShell.EXTENSION_TYPE["SESSION_MODE"])
+         sw.connect('notify::active', self._on_extension_toggled, uuid)
+         self.hbox.pack_start(sw, False, False, 0)
+ 
+--
+libgit2 0.26.0
+
--- a/SPECS/gnome-tweaks.spec
+++ b/SPECS/gnome-tweaks.spec
@ -1,15 +1,19 @@
-%global tarball_version %%(echo %{version} | tr '~' '.')
-%global major_version %%(cut -d '.' -f 1 <<<%{tarball_version})
+%global majorversion %(cut -d "." -f 1-2 <<<%{version})

 Name:           gnome-tweaks
-Version:        40.10
-Release:        1%{?dist}
+Version:        3.28.1
+Release:        7%{?dist}
 Summary:        Customize advanced GNOME 3 options

 # Software is GPLv3, Appdata file is CC0-1.0
 License:        GPLv3 and CC0
-URL:            https://wiki.gnome.org/Apps/Tweaks
-Source0:        https://download.gnome.org/sources/%{name}/%{major_version}/%{name}-%{tarball_version}.tar.xz
+URL:            https://wiki.gnome.org/action/show/Apps/Tweaks
+Source0:        https://download.gnome.org/sources/%{name}/%{majorversion}/%{name}-%{version}.tar.xz
+Patch0:         reflect-extensions-status.patch
+Patch1:         0001-extensions-Fix-opening-system-installed-extensions-i.patch
+Patch2:         0002-settings-Drop-override-settings-support.patch
+Patch3:         drop-app-menu-option.patch
+Patch4:         extension-enable-state.patch

 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
@ -18,19 +22,18 @@ BuildRequires:  meson
 BuildRequires:  python3-devel
 Requires:       gnome-desktop3
 Requires:       gnome-settings-daemon
-Requires:       gnome-shell
+Requires:       gnome-shell >= 3.24
 Requires:       gnome-shell-extension-user-theme
-Requires:       gnome-themes-extra
 Requires:       gobject-introspection
-Requires:       gsettings-desktop-schemas
-Requires:       gtk3
-Requires:       libhandy1
+Requires:       gsettings-desktop-schemas >= 3.27.90
+Requires:       gtk3 >= 3.12
 Requires:       libnotify
 Requires:       libsoup
 Requires:       mutter
 Requires:       pango
 Requires:       python3dist(pygobject)
-Provides:       gnome-tweak-tool = %{version}-%{release}
+Provides:       gnome-tweak-tool = %{version}.%{release}
+Obsoletes:      gnome-tweak-tool < 3.27.3-4
 BuildArch:      noarch

 %description
@ -41,7 +44,7 @@ and extension, etc.


 %prep
-%autosetup -n %{name}-%{tarball_version} -p1 -S gendiff
+%autosetup -p1


 %build
@ -52,6 +55,16 @@ and extension, etc.
 %install
 %meson_install

+# Update the screenshot shown in the software center
+#
+# NOTE: It would be *awesome* if this file was pushed upstream.
+#
+# See http://people.freedesktop.org/~hughsient/appdata/#screenshots for more details.
+#
+appstream-util replace-screenshots $RPM_BUILD_ROOT%{_datadir}/metainfo/org.gnome.tweaks.appdata.xml \
+  https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/gnome-tweak-tool/a.png \
+  https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/gnome-tweak-tool/b.png
+
 %find_lang %{name}


@ -62,128 +75,41 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT/%{_datadir}/metainfo/*.app

 %files -f %{name}.lang
 %doc AUTHORS NEWS README.md
-%license LICENSES/*
+%license LICENSES/
 %{_bindir}/%{name}
 %{_libexecdir}/gnome-tweak-tool-lid-inhibitor
 %{python3_sitelib}/gtweak/
-%{_datadir}/%{name}/
-%{_datadir}/applications/*.desktop
-%{_datadir}/glib-2.0/schemas/*.xml
-%{_datadir}/icons/hicolor/*/apps/org.gnome.tweaks.svg
-%{_datadir}/icons/hicolor/symbolic/apps/org.gnome.tweaks-symbolic.svg
 %{_datadir}/metainfo/*.appdata.xml
+%{_datadir}/applications/*.desktop
+%{_datadir}/%{name}/
+%{_datadir}/icons/hicolor/*/apps/*.png
+%{_datadir}/icons/hicolor/scalable/apps/*.svg


 %changelog
-* Mon Mar 14 2022 Milan Crha <mcrha@redhat.com> - 40.10-1
- Resolves: #2063688 (Update to 40.10 release)
-
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 40.0-6
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Mon Jul 19 2021 Milan Crha <mcrha@redhat.com> - 40.0-5
- Resolves: #1973391 (Remove the patch, not applicable due to Nautilus changes)
-
-* Fri Jun 18 2021 Milan Crha <mcrha@redhat.com> - 40.0-4
- Resolves: #1973391 (Backport downstream patch from older RHEL)
-
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 40.0-3
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Sat Mar 27 2021 Kalev Lember <klember@redhat.com> - 40.0-2
- Use upstream appdata screenshots
-
-* Sat Mar 27 2021 Kalev Lember <klember@redhat.com> - 40.0-1
- Update to 40.0
-
-* 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
-
-* Wed Feb 17 2021 Kalev Lember <klember@redhat.com> - 40~beta-2
- Require libhandy1 instead of libhandy
-
-* Mon Feb 15 2021 Mohamed El Morabity <melmorabity@fedoraproject.org> - 40~beta-1
- Update to 40.beta
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.34.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Fri Dec 11 2020 Kalev Lember <klember@redhat.com> - 3.34.1-1
- Update to 3.34.1
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.34.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 3.34.0-5
- Rebuilt for Python 3.9
-
-* Sat Apr 04 2020 Mohamed El Morabity <melmorabity@fedoraproject.org> - 3.34.0-4
- Fix extension preferences opening (RHBZ #1820396)
-
-* Sat Mar 28 2020 Mohamed El Morabity <melmorabity@fedoraproject.org> - 3.34.0-3
- Add dependency on gnome-extensions-app (RHBZ #1812779)
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.34.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Fri Sep 27 2019 Kalev Lember <klember@redhat.com> - 3.34.0-1
- Update to 3.34.0
-
-* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 3.33.90-2
- Rebuilt for Python 3.8
-
-* Fri Aug 09 2019 Mohamed El Morabity <melmorabity@fedoraproject.org> - 3.33.90-1
- Update to 3.33.90
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.32.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Wed Jun 19 2019 Mohamed El Morabity <melmorabity@fedoraproject.org> - 3.32.0-2
- Fix typo in Provides version (RHBZ #1721864)
-
-* Mon Mar 11 2019 Kalev Lember <klember@redhat.com> - 3.32.0-1
- Update to 3.32.0
-
-* Wed Feb 06 2019 Kalev Lember <klember@redhat.com> - 3.31.90-1
- Update to 3.31.90
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.31.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Wed Jan 23 2019 Kalev Lember <klember@redhat.com> - 3.31.3-1
- Update to 3.31.3
-
-* Wed Dec 19 2018 Kalev Lember <klember@redhat.com> - 3.30.2-1
- Update to 3.30.2
- Fix opening system installed extensions in gnome-software
-
-* Fri Sep 28 2018 Kalev Lember <klember@redhat.com> - 3.30.1-1
- Update to 3.30.1
-
-* Thu Sep 06 2018 Mohamed El Morabity <melmorabity@fedoraproject.org> - 3.30.0-1
- Update to 3.30.0
-
-* Wed Aug 29 2018 Mohamed El Morabity <melmorabity@fedoraproject.org> - 3.29.92-1
- Update to 3.29.92
+* Tue Feb 18 2020 Milan Crha <mcrha@redhat.com> - 3.28.1-7
+- extensions: Incorrectly shows enabled extensions as disabled after enable-all
+- Resolves: #1804123

-* Mon Aug 13 2018 Kalev Lember <klember@redhat.com> - 3.29.91.1-1
- Update to 3.29.91.1
+* Thu Jul 04 2019 Milan Crha <mcrha@redhat.com> - 3.28.1-6
+- top-bar: Drop ApplicationMenu tweak
+- Resolves: #1726656

-* Fri Aug 03 2018 Mohamed El Morabity <melmorabity@fedoraproject.org> - 3.29.90.1-1
- Update to 3.29.90.1
+* Tue Jul 02 2019 Milan Crha <mcrha@redhat.com> - 3.28.1-5
+- settings: Drop override settings support
+- Resolves: #1725741

-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.29.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+* Tue Jun 18 2019 Milan Crha <mcrha@redhat.com> - 3.28.1-4
+- extensions: Fix opening system installed extensions in gnome-software
+- Resolves: #1721575

-* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 3.29.2-2
- Rebuilt for Python 3.7
+* Fri Apr 26 2019 Carlos Soriano <csoriano@redhat.com> - 3.28.1-3
+- Fix reflect extension status in the UI
+- Resolves: #1679127

-* Mon May 21 2018 Mohamed El Morabity <melmorabity@fedoraproject.org> - 3.29.2-1
- Update to 3.29.2
+* Tue Apr 23 2019 Carlos Soriano <csoriano@redhat.com> - 3.28.1-2
+- Reflect extension status in the UI
+- Resolves: #1679127

 * Sun Apr 08 2018 Kalev Lember <klember@redhat.com> - 3.28.1-1
 - Update to 3.28.1