From 23abb729cb0a64746dd554dc35c292b769ec49a6 Mon Sep 17 00:00:00 2001 From: windowsboy111 Date: Fri, 6 Jan 2023 15:22:59 +0800 Subject: [PATCH] Fix gala switchboard-plug-keyboard (#102) --- anda/desktops/elementary/gala/gala.spec | 4 +-- .../switchboard-plug-keyboard/6ebd576.patch | 32 ------------------- .../switchboard-plug-keyboard.spec | 2 -- 3 files changed, 2 insertions(+), 36 deletions(-) delete mode 100644 anda/desktops/elementary/switchboard-plug-keyboard/6ebd576.patch diff --git a/anda/desktops/elementary/gala/gala.spec b/anda/desktops/elementary/gala/gala.spec index 3974861792..be03833605 100644 --- a/anda/desktops/elementary/gala/gala.spec +++ b/anda/desktops/elementary/gala/gala.spec @@ -91,8 +91,8 @@ desktop-file-validate \ desktop-file-validate \ %{buildroot}/%{_datadir}/applications/gala*.desktop -%dnf appstream-util validate-relax --nonet \ -%dnf %{buildroot}/%{_datadir}/metainfo/%{name}.appdata.xml +#appstream-util validate-relax --nonet \ +# %%{buildroot}/%%{_datadir}/metainfo/%%{name}.appdata.xml %files -f gala.lang diff --git a/anda/desktops/elementary/switchboard-plug-keyboard/6ebd576.patch b/anda/desktops/elementary/switchboard-plug-keyboard/6ebd576.patch deleted file mode 100644 index 2323b28a70..0000000000 --- a/anda/desktops/elementary/switchboard-plug-keyboard/6ebd576.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 6ebd57673b45cc64e1caf895134efc0d5f6cf2be Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Danielle=20For=C3=A9?= -Date: Sat, 23 Apr 2022 15:34:16 -0700 -Subject: [PATCH] Read screenshot shortcuts from gala schema (#407) - ---- - src/Shortcuts/List.vala | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/Shortcuts/List.vala b/src/Shortcuts/List.vala -index 34a518c9..4d534a16 100644 ---- a/src/Shortcuts/List.vala -+++ b/src/Shortcuts/List.vala -@@ -96,12 +96,12 @@ namespace Pantheon.Keyboard.Shortcuts { - screenshot_group = {}; - screenshot_group.icon_name = "io.elementary.switchboard.keyboard.screenshots"; - screenshot_group.label = _("Screenshots"); -- add_action (ref screenshot_group, Schema.MEDIA, _("Grab the whole screen"), "screenshot"); -- add_action (ref screenshot_group, Schema.MEDIA, _("Copy the whole screen to clipboard"), "screenshot-clip"); -- add_action (ref screenshot_group, Schema.MEDIA, _("Grab the current window"), "window-screenshot"); -- add_action (ref screenshot_group, Schema.MEDIA, _("Copy the current window to clipboard"), "window-screenshot-clip"); -- add_action (ref screenshot_group, Schema.MEDIA, _("Select an area to grab"), "area-screenshot"); -- add_action (ref screenshot_group, Schema.MEDIA, _("Copy an area to clipboard"), "area-screenshot-clip"); -+ add_action (ref screenshot_group, Schema.GALA, _("Grab the whole screen"), "screenshot"); -+ add_action (ref screenshot_group, Schema.GALA, _("Copy the whole screen to clipboard"), "screenshot-clip"); -+ add_action (ref screenshot_group, Schema.GALA, _("Grab the current window"), "window-screenshot"); -+ add_action (ref screenshot_group, Schema.GALA, _("Copy the current window to clipboard"), "window-screenshot-clip"); -+ add_action (ref screenshot_group, Schema.GALA, _("Select an area to grab"), "area-screenshot"); -+ add_action (ref screenshot_group, Schema.GALA, _("Copy an area to clipboard"), "area-screenshot-clip"); - - launchers_group = {}; - launchers_group.icon_name = "preferences-desktop-applications"; diff --git a/anda/desktops/elementary/switchboard-plug-keyboard/switchboard-plug-keyboard.spec b/anda/desktops/elementary/switchboard-plug-keyboard/switchboard-plug-keyboard.spec index b12be4977f..63a48b3e99 100644 --- a/anda/desktops/elementary/switchboard-plug-keyboard/switchboard-plug-keyboard.spec +++ b/anda/desktops/elementary/switchboard-plug-keyboard/switchboard-plug-keyboard.spec @@ -15,8 +15,6 @@ License: GPLv3+ URL: https://github.com/elementary/switchboard-plug-keyboard Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz -Patch0: https://github.com/elementary/switchboard-plug-keyboard/pull/427.patch - BuildRequires: gettext BuildRequires: libappstream-glib BuildRequires: meson