From fafad5c10814f07440ff490f0eb50d2e86caf88b Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Mar 12 2019 16:38:55 +0000 Subject: import gnome-tweak-tool-3.28.1-2.el7.2 --- diff --git a/SOURCES/fix-keyboard-panel-crash.patch b/SOURCES/fix-keyboard-panel-crash.patch new file mode 100644 index 0000000..6dfe8e4 --- /dev/null +++ b/SOURCES/fix-keyboard-panel-crash.patch @@ -0,0 +1,41 @@ +From 37319e3ccbaf8cba315ace406896a7cd120b32c9 Mon Sep 17 00:00:00 2001 +From: Carlos Soriano +Date: Mon, 21 Jan 2019 13:28:05 +0100 +Subject: [PATCH] tweak_group_xkb: Disconnect settings changed signal on + destruction + +Otherwise when the dialog is destructed, when the settings change it +will call the callback and make the application crash. +--- + gtweak/tweaks/tweak_group_xkb.py | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/gtweak/tweaks/tweak_group_xkb.py b/gtweak/tweaks/tweak_group_xkb.py +index 9cb3670..b41a627 100644 +--- a/gtweak/tweaks/tweak_group_xkb.py ++++ b/gtweak/tweaks/tweak_group_xkb.py +@@ -147,7 +147,7 @@ class TypingTweakGroup(Gtk.Box): + ok = False + try: + self._kbdsettings = GSettingsSetting(self.XKB_GSETTINGS_SCHEMA) +- self._kbdsettings.connect("changed::"+self.XKB_GSETTINGS_NAME, self._on_changed) ++ self._kdb_settings_id = self._kbdsettings.connect("changed::"+self.XKB_GSETTINGS_NAME, self._on_changed) + self._xkb_info = GnomeDesktop.XkbInfo() + ok = True + self.loaded = True +@@ -165,6 +165,12 @@ class TypingTweakGroup(Gtk.Box): + self.pack_start(obj, False, False, 0) + TweakGroup.__init__(self, _("Typing"), *self._option_objects) + ++ self.connect("destroy", self._on_destroy) ++ + def _on_changed(self, *args): + for obj in self._option_objects: + obj.reload() ++ ++ def _on_destroy(self, event): ++ if (self._kdb_settings_id): ++ self._kbdsettings.disconnect(self._kdb_settings_id) +-- +2.19.0 + diff --git a/SOURCES/port-to-python2.patch b/SOURCES/port-to-python2.patch index bd40d22..a19d5f2 100644 --- a/SOURCES/port-to-python2.patch +++ b/SOURCES/port-to-python2.patch @@ -1,7 +1,7 @@ -From e8c6a7acc24799450801d581a37c2d803e676cf9 Mon Sep 17 00:00:00 2001 +From 1bda0910b4d8b05dfa94732d4bb0795621d4970f Mon Sep 17 00:00:00 2001 From: Carlos Soriano Date: Thu, 14 Jun 2018 11:51:06 +0200 -Subject: [PATCH] general: Port to python2 +Subject: [PATCH 2/3] general: Port to python2 RHEL 7.6 doesn't have python3... --- @@ -25,14 +25,14 @@ RHEL 7.6 doesn't have python3... gtweak/tweaks/tweak_group_top_bar.py | 3 ++- gtweak/tweaks/tweak_group_windows.py | 1 + gtweak/tweaks/tweak_group_workspaces.py | 3 ++- - gtweak/tweaks/tweak_group_xkb.py | 3 ++- + gtweak/tweaks/tweak_group_xkb.py | 5 +++-- gtweak/tweaks/tweak_wacom.py | 9 +++++---- gtweak/tweakview.py | 5 +++-- gtweak/utils.py | 11 ++++++++--- gtweak/widgets.py | 1 + meson-postinstall.py | 4 ++-- meson.build | 3 +-- - 27 files changed, 64 insertions(+), 26 deletions(-) + 27 files changed, 65 insertions(+), 27 deletions(-) diff --git a/gnome-tweak-tool-lid-inhibitor b/gnome-tweak-tool-lid-inhibitor index f9d18db..499e9eb 100755 @@ -327,7 +327,7 @@ index 1805861..dd28b4c 100644 def __init__(self, **options): name = _("Workspaces") diff --git a/gtweak/tweaks/tweak_group_xkb.py b/gtweak/tweaks/tweak_group_xkb.py -index 9cb3670..c681474 100644 +index 9cb3670..659b08a 100644 --- a/gtweak/tweaks/tweak_group_xkb.py +++ b/gtweak/tweaks/tweak_group_xkb.py @@ -1,3 +1,4 @@ @@ -344,6 +344,15 @@ index 9cb3670..c681474 100644 if w._val in self._values: _set_active(w, True) else: +@@ -134,7 +135,7 @@ class _XkbOption(Gtk.Expander, Tweak): + elif active and not w._val in self._values and w._val: + self._parent_settings.setting_add_to_list(TypingTweakGroup.XKB_GSETTINGS_NAME, w._val) + +-class TypingTweakGroup(Gtk.Box): ++class TypingTweakGroup(Gtk.Box, TweakGroup): + + XKB_GSETTINGS_SCHEMA = "org.gnome.desktop.input-sources" + XKB_GSETTINGS_NAME = "xkb-options" diff --git a/gtweak/tweaks/tweak_wacom.py b/gtweak/tweaks/tweak_wacom.py index ed227ca..2e89246 100644 --- a/gtweak/tweaks/tweak_wacom.py @@ -491,6 +500,6 @@ index 4d24fa5..f5ea92d 100644 pkgdatadir = join_paths(datadir, meson.project_name()) --- -libgit2 0.27.1 +-- +2.17.0 diff --git a/SPECS/gnome-tweak-tool.spec b/SPECS/gnome-tweak-tool.spec index 0a0a3b5..c8fe488 100644 --- a/SPECS/gnome-tweak-tool.spec +++ b/SPECS/gnome-tweak-tool.spec @@ -5,7 +5,7 @@ Name: gnome-tweak-tool Version: 3.28.1 -Release: 2%{?dist} +Release: 2%{?dist}.2 Summary: Customize advanced GNOME 3 options # Software is GPLv3, Appdata file is CC0-1.0 @@ -13,6 +13,7 @@ License: GPLv3 and CC0 URL: https://wiki.gnome.org/action/show/Apps/Tweaks Source0: https://download.gnome.org/sources/%{name_new}/%{majorversion}/%{name_new}-%{version}.tar.xz Patch0: port-to-python2.patch +Patch1: fix-keyboard-panel-crash.patch BuildRequires: desktop-file-utils BuildRequires: gettext @@ -43,6 +44,7 @@ and extension, etc. %prep %setup -q -n gnome-tweaks-%{version} %patch0 -p1 -b .py3 +%patch1 -p1 %build %meson @@ -102,6 +104,18 @@ fi %changelog +* Tue Jan 22 2019 Carlos Soriano - 3.28.1-2 +- Fix release numbers for z-stream +- Resolves: #1667991 #1664791 + +* Mon Jan 21 2019 Carlos Soriano - 3.28.1-4 +- Fix keyboard panel crashes +- Resolves: #1667991 + +* Mon Dec 17 2018 Carlos Soriano - 3.28.1-3 +- Fixes to port to python2 +- Resolves: #1664791 + * Thu Jun 14 2018 Carlos Soriano - 3.28.1-2 - Port to python2 - Resolves: #1590848