From 09f67212123d685c6f35dae22b774312f8394830 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 30 Mar 2021 10:33:22 -0400 Subject: [PATCH] import cheese-3.28.0-3.el8 --- SOURCES/cheese-3.28.0-fix-accelerators.patch | 49 ++++++++++++++++++++ SPECS/cheese.spec | 12 ++++- 2 files changed, 59 insertions(+), 2 deletions(-) create mode 100644 SOURCES/cheese-3.28.0-fix-accelerators.patch diff --git a/SOURCES/cheese-3.28.0-fix-accelerators.patch b/SOURCES/cheese-3.28.0-fix-accelerators.patch new file mode 100644 index 0000000..62e6246 --- /dev/null +++ b/SOURCES/cheese-3.28.0-fix-accelerators.patch @@ -0,0 +1,49 @@ +From 446da7884914d471ce50f8b327edddbaf0d75ccb Mon Sep 17 00:00:00 2001 +From: esoleyman +Date: Fri, 24 May 2019 15:25:02 -0500 +Subject: [PATCH] Fix the accelerators + +The thumbnail view did not allow users to execute commands such as open, +save as, trash, or delete for one or more photo / video thumbnails using +keyboard shortcuts such as ctrl+o, ctrl+s, etc... + +https://gitlab.gnome.org/GNOME/cheese/issues/9 +--- + src/cheese-application.vala | 2 +- + src/cheese-window.vala | 7 +++++++ + 2 files changed, 8 insertions(+), 1 deletion(-) + +diff --git a/src/cheese-application.vala b/src/cheese-application.vala +index c4542be0..f46f3165 100644 +--- a/src/cheese-application.vala ++++ b/src/cheese-application.vala +@@ -116,7 +116,7 @@ public class Cheese.Application : Gtk.Application + Environment.set_application_name (_("Cheese")); + Window.set_default_icon_name ("org.gnome.Cheese"); + +- this.add_accelerator ("space", "app.shoot", null); ++ this.set_accels_for_action ("app.shoot", {"space"}); + + // FIXME: Push these into the main window initialization. + main_window.setup_ui (); +diff --git a/src/cheese-window.vala b/src/cheese-window.vala +index 09879fc5..25df09e7 100644 +--- a/src/cheese-window.vala ++++ b/src/cheese-window.vala +@@ -1312,6 +1312,13 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow + + var menu = application.get_menu_by_id ("thumbview-menu"); + thumbnail_popup = new Gtk.Menu.from_model (menu); ++ ++ application.set_accels_for_action ("app.quit", {"q"}); ++ application.set_accels_for_action ("app.fullscreen", {"F11"}); ++ application.set_accels_for_action ("win.file-open", {"o"}); ++ application.set_accels_for_action ("win.file-saveas", {"s"}); ++ application.set_accels_for_action ("win.file-trash", {"Delete"}); ++ application.set_accels_for_action ("win.file-delete", {"Delete"}); + + this.add_action_entries (actions, this); + +-- +GitLab + diff --git a/SPECS/cheese.spec b/SPECS/cheese.spec index 474262a..0c432c9 100644 --- a/SPECS/cheese.spec +++ b/SPECS/cheese.spec @@ -1,12 +1,14 @@ Name: cheese Epoch: 2 Version: 3.28.0 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Application for taking pictures and movies from a webcam License: GPLv2+ URL: https://wiki.gnome.org/Apps/Cheese Source0: https://download.gnome.org/sources/%{name}/3.28/%{name}-%{version}.tar.xz +# https://bugzilla.redhat.com/show_bug.cgi?id=1625735 +Patch0: cheese-3.28.0-fix-accelerators.patch BuildRequires: chrpath BuildRequires: desktop-file-utils @@ -63,7 +65,7 @@ for writing applications that require a webcam display widget. %prep -%setup -q +%autosetup -p1 %build @@ -118,6 +120,12 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Cheese.desk %changelog +* Wed Nov 25 2020 David King - 2:3.28.0-3 +- Fix keyboard accelerator patch (#1625735) + +* Tue Oct 20 2020 David King - 2:3.28.0-2 +- Fix keyboard accelerators (#1625735) + * Mon Mar 12 2018 Kalev Lember - 2:3.28.0-1 - Update to 3.28.0