pantheon.switchboard-plug-keyboard: 3.2.1 -> 8.0.0

https://github.com/elementary/switchboard-plug-keyboard/compare/3.2.1...8.0.0

3 files changed, 28 insertions, 106 deletions

diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
index f6512a8a8d74d..e30a7faf726ca 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
@@ -7,12 +7,12 @@
 , ninja
 , pkg-config
 , vala
+, libadwaita
 , libgee
 , gnome-settings-daemon
-, granite
+, granite7
 , gsettings-desktop-schemas
-, gtk3
-, libhandy
+, gtk4
 , libxml2
 , libgnomekbd
 , libxklavier
@@ -23,13 +23,13 @@
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-keyboard";
-  version = "3.2.1";
+  version = "8.0.0";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
     rev = version;
-    sha256 = "sha256-4LfS2F8pLbZw+HhnEVmZqbEaNCM96q+lqnf4sUBDVJI=";
+    sha256 = "sha256-jOUrotgtSRmSVsxOXEbQfIi92BlpIPye7maCsa+ssT8=";
   };
 
   patches = [
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
 
     (substituteAll {
       src = ./fix-paths.patch;
-      inherit ibus onboard libgnomekbd;
+      inherit onboard libgnomekbd;
     })
   ];
 
@@ -53,12 +53,12 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     gnome-settings-daemon # media-keys
-    granite
+    granite7
     gsettings-desktop-schemas
-    gtk3
+    gtk4
     ibus
+    libadwaita
     libgee
-    libhandy
     libxklavier
     switchboard
   ];
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/fix-paths.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/fix-paths.patch
index 37f202e98b2ae..47f29161c4721 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/fix-paths.patch
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/fix-paths.patch
@@ -1,21 +1,8 @@
-diff --git a/src/Views/InputMethod.vala b/src/Views/InputMethod.vala
-index ba12d6db..b9263c1d 100644
---- a/src/Views/InputMethod.vala
-+++ b/src/Views/InputMethod.vala
-@@ -338,7 +338,7 @@ public class Keyboard.InputMethodPage.Page : Gtk.Grid {
-     private void spawn_ibus_daemon () {
-         bool is_spawn_succeeded = false;
-         try {
--            is_spawn_succeeded = Process.spawn_sync ("/", { "ibus-daemon", "-drx" }, Environ.get (), SpawnFlags.SEARCH_PATH, null);
-+            is_spawn_succeeded = Process.spawn_sync ("/", { "@ibus@/bin/ibus-daemon", "-drx" }, Environ.get (), SpawnFlags.SEARCH_PATH, null);
-         } catch (GLib.SpawnError e) {
-             warning (e.message);
-             set_visible_view (e.message);
-diff --git a/src/Views/Behavior.vala b/src/Views/Behavior.vala
-index 8a89a0a4..a4f98668 100644
---- a/src/Views/Behavior.vala
-+++ b/src/Views/Behavior.vala
-@@ -270,7 +270,7 @@ public class Keyboard.Behaviour.Page : Gtk.Box {
+diff --git a/src/Behavior/Behavior.vala b/src/Behavior/Behavior.vala
+index bd461685..b6371096 100644
+--- a/src/Behavior/Behavior.vala
++++ b/src/Behavior/Behavior.vala
+@@ -252,7 +252,7 @@ public class Keyboard.Behaviour.Page : Gtk.Box {
  
          onscreen_keyboard_settings.clicked.connect (() => {
              try {
@@ -24,11 +11,11 @@ index 8a89a0a4..a4f98668 100644
                  appinfo.launch (null, null);
              } catch (Error e) {
                  critical ("Unable to launch onboard-settings: %s", e.message);
-diff --git a/src/Dialogs/AddLayoutDialog.vala b/src/Dialogs/AddLayoutDialog.vala
-index aa084295..a486b52a 100644
---- a/src/Dialogs/AddLayoutDialog.vala
-+++ b/src/Dialogs/AddLayoutDialog.vala
-@@ -197,7 +197,7 @@ public class Keyboard.LayoutPage.AddLayoutDialog : Granite.Dialog {
+diff --git a/src/Layout/Widgets/AddLayoutDialog.vala b/src/Layout/Widgets/AddLayoutDialog.vala
+index 25cc0fe9..b3e350bb 100644
+--- a/src/Layout/Widgets/AddLayoutDialog.vala
++++ b/src/Layout/Widgets/AddLayoutDialog.vala
+@@ -206,7 +206,7 @@ public class Keyboard.LayoutPage.AddLayoutDialog : Granite.Dialog {
          });
  
          keyboard_map_button.clicked.connect (() => {
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/hide-install-unlisted-engines-button.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/hide-install-unlisted-engines-button.patch
index 6313dc30f6d0c..10510965de68a 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/hide-install-unlisted-engines-button.patch
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/hide-install-unlisted-engines-button.patch
@@ -1,78 +1,13 @@
-diff --git a/src/Widgets/InputMethod/AddEnginesPopover.vala b/src/Widgets/InputMethod/AddEnginesPopover.vala
-index 478e6b02..5b25f2e9 100644
---- a/src/Widgets/InputMethod/AddEnginesPopover.vala
-+++ b/src/Widgets/InputMethod/AddEnginesPopover.vala
-@@ -43,7 +43,6 @@ public class Keyboard.InputMethodPage.AddEnginesPopover : Gtk.Popover {
-         };
-         scrolled.add (listbox);
+diff --git a/src/InputMethod/Widgets/AddEngineDialog.vala b/src/InputMethod/Widgets/AddEngineDialog.vala
+index 0a7f6013..a16904eb 100644
+--- a/src/InputMethod/Widgets/AddEngineDialog.vala
++++ b/src/InputMethod/Widgets/AddEngineDialog.vala
+@@ -70,8 +70,6 @@ public class Keyboard.InputMethodPage.AddEngineDialog : Granite.Dialog {
  
--        var install_button = new Gtk.Button.with_label (_("Install Unlisted Engines…"));
+         get_content_area ().append (frame);
  
-         var cancel_button = new Gtk.Button.with_label (_("Cancel"));
- 
-@@ -55,10 +54,8 @@ public class Keyboard.InputMethodPage.AddEnginesPopover : Gtk.Popover {
-             margin = 12,
-             spacing = 6
-         };
--        button_box.add (install_button);
-         button_box.add (cancel_button);
-         button_box.add (add_button);
--        button_box.set_child_secondary (install_button, true);
- 
-         var grid = new Gtk.Grid ();
-         grid.attach (search_entry, 0, 0);
-@@ -88,30 +85,6 @@ public class Keyboard.InputMethodPage.AddEnginesPopover : Gtk.Popover {
-             listbox.invalidate_filter ();
-         });
- 
--        install_button.clicked.connect (() => {
--            popdown ();
--
--            var installer = UbuntuInstaller.get_default ();
--            var install_dialog = new InstallEngineDialog ((Gtk.Window) get_toplevel ());
--            install_dialog.response.connect ((response_id) => {
--                if (response_id == Gtk.ResponseType.OK) {
--                    string engine_to_install = install_dialog.get_selected_engine_name ();
--                    install_dialog.destroy ();
--                    installer.install (engine_to_install);
+-        var install_button = add_button (_("Install Unlisted Engines…"), Gtk.ResponseType.OK);
 -
--                    var progress_dialog = new ProgressDialog () {
--                        transient_for = (Gtk.Window) get_toplevel ()
--                    };
--                    installer.progress_changed.connect ((p) => {
--                        progress_dialog.progress = p;
--                    });
--                    progress_dialog.run ();
--                } else {
--                    install_dialog.destroy ();
--                }
--            });
--            install_dialog.run ();
--        });
+         var cancel_button = add_button (_("Cancel"), Gtk.ResponseType.CANCEL);
  
-         cancel_button.clicked.connect (() => {
-             popdown ();
-diff --git a/src/meson.build b/src/meson.build
-index 83cde9f6..63d6a88a 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -19,7 +19,6 @@ plug_files = files(
-     'Widgets/Layout/Display.vala',
-     'Widgets/Layout/AdvancedSettingsPanel.vala',
-     'Widgets/Layout/AdvancedSettingsGrid.vala',
--    'Widgets/InputMethod/LanguagesRow.vala',
-     'Widgets/InputMethod/EnginesRow.vala',
-     'Widgets/InputMethod/AddEnginesPopover.vala',
-     'Views/Shortcuts.vala',
-@@ -35,11 +34,6 @@ plug_files = files(
-     'InputSources/SourceSettings.vala',
-     'InputSources/InputSource.vala',
-     'InputMethod/AddEnginesList.vala',
--    'InputMethod/Installer/UbuntuInstaller.vala',
--    'InputMethod/Installer/InstallList.vala',
--    'InputMethod/Installer/aptd-client.vala',
--    'Dialogs/ProgressDialog.vala',
--    'Dialogs/InstallEngineDialog.vala',
-     'Dialogs/ConflictDialog.vala',
-     'Dialogs/AddLayoutDialog.vala'
- )
+         var add_button = add_button (_("Add Engine"), Gtk.ResponseType.ACCEPT);