Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove gnomekbd dep #750

Merged
merged 2 commits into from
May 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Install Dependencies
run: |
apt update
apt install -y desktop-file-utils gettext libdistinst-dev libgtk-3-dev libgee-0.8-dev libgranite-dev libhandy-1-dev libxml2-dev libjson-glib-dev libgnomekbd-dev libpwquality-dev libxml2-utils meson valac
apt install -y desktop-file-utils gettext libdistinst-dev libgtk-3-dev libgee-0.8-dev libgranite-dev libhandy-1-dev libxml2-dev libjson-glib-dev libpwquality-dev libxml2-utils meson valac
- name: Build
run: |
meson build
Expand Down
2 changes: 0 additions & 2 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ granite_dep = dependency('granite', version: '>=0.5')
handy_dep = dependency('libhandy-1', version: '>=0.90.0')
json_glib_dep = dependency('json-glib-1.0')
xml2_dep = dependency('libxml-2.0')
gnome_keyboard_dep = dependency('libgnomekbd')
gnome_keyboard_ui_dep = meson.get_compiler('c').find_library('gnomekbdui')
pwquality_dep = dependency('pwquality')
systemd_dep = dependency('systemd')

Expand Down
1 change: 0 additions & 1 deletion po/POTFILES
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ src/Widgets/DecryptMenu.vala
src/Widgets/DiskBar.vala
src/Widgets/DiskGrid.vala
src/Widgets/InstallTypeGrid.vala
src/Widgets/LayoutWidget.vala
src/Widgets/PartitionBar.vala
src/Widgets/PartitionMenu.vala
src/Widgets/VariantWidget.vala
13 changes: 6 additions & 7 deletions src/Views/KeyboardLayoutView.vala
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,6 @@ public class KeyboardLayoutView : AbstractInstallerView {
});

keyboard_test_entry.icon_release.connect (() => {
var layout = new LayoutWidget ();

string layout_string;
unowned Gtk.ListBoxRow row = input_variant_widget.main_listbox.get_selected_row ();
if (row != null) {
Expand All @@ -173,11 +171,12 @@ public class KeyboardLayoutView : AbstractInstallerView {
layout_string = "us";
}

layout.set_layout (layout_string);

var popover = new Gtk.Popover (keyboard_test_entry);
popover.add (layout);
popover.show_all ();
string command = "gkbd-keyboard-display --layout=%s".printf (layout_string);
try {
AppInfo.create_from_commandline (command, null, NONE).launch (null, null);
} catch (Error e) {
warning ("Error launching keyboard layout display: %s", e.message);
}
});

foreach (var layout in KeyboardLayoutHelper.get_layouts ()) {
Expand Down
52 changes: 0 additions & 52 deletions src/Widgets/LayoutWidget.vala

This file was deleted.

3 changes: 0 additions & 3 deletions src/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ vala_files = [
'Widgets/DiskBar.vala',
'Widgets/DiskGrid.vala',
'Widgets/InstallTypeGrid.vala',
'Widgets/LayoutWidget.vala',
'Widgets/PartitionBar.vala',
'Widgets/PartitionMenu.vala',
'Widgets/Terminal.vala',
Expand Down Expand Up @@ -57,8 +56,6 @@ gui_dependencies = [
distinst_dep,
gee_dep,
glib_dep,
gnome_keyboard_dep,
gnome_keyboard_ui_dep,
gobject_dep,
granite_dep,
gtk_dep,
Expand Down
3 changes: 0 additions & 3 deletions vapi/libgnomekbd.deps

This file was deleted.

214 changes: 0 additions & 214 deletions vapi/libgnomekbd.vapi

This file was deleted.

Loading