Remove XML dep, update README, CI

elementary · Oct 9, 2024 · 171f0bc · 171f0bc
1 parent 42b1c4b
commit 171f0bc
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 29 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,7 +23,7 @@ jobs:
     - name: Install Dependencies
       run: |
         apt update
-        apt install -y desktop-file-utils gettext libadwaita-1-dev libdistinst-dev libgee-0.8-dev libgranite-7-dev libgtk-4-dev libxml2-dev libjson-glib-dev libpwquality-dev libxml2-utils meson valac
+        apt install -y desktop-file-utils gettext libadwaita-1-dev libdistinst-dev libgee-0.8-dev libgranite-7-dev libgtk-4-dev libxkbregistry-dev libjson-glib-dev libpwquality-dev libxml2-utils meson valac
     - name: Build and Test
       env:
         DESTDIR: out

diff --git a/README.md b/README.md
@@ -22,8 +22,7 @@ You'll need the following dependencies:
  - libadwaita-1-dev >=1.4.0
  - libjson-glib-dev
  - libpwquality-dev
- - libxml2-dev
- - libxml2-utils
+ - libxkbregistry-dev
  - [distinst](https://github.com/pop-os/distinst/)
  - valac
 

diff --git a/meson.build b/meson.build
@@ -20,7 +20,6 @@ gio_dep = dependency('gio-2.0')
 granite_dep = dependency('granite-7', version: '>=7.4.0')
 adw_dep = dependency('libadwaita-1', version: '>=1.4.0')
 json_glib_dep = dependency('json-glib-1.0')
-xml2_dep = dependency('libxml-2.0')
 xkbregistry_dep = dependency('xkbregistry')
 pwquality_dep = dependency('pwquality')
 systemd_dep = dependency('systemd')

diff --git a/src/Objects/KeyboardLayout.vala b/src/Objects/KeyboardLayout.vala
@@ -246,17 +246,6 @@ public class Installer.KeyboardLayout : GLib.Object {
         return a.display_name.collate (b.display_name);
     }
 
-    private const string XKB_RULES_FILE = "base.xml";
-
-    private static string get_xml_rules_file_path () {
-        unowned string? base_path = GLib.Environment.get_variable ("XKB_CONFIG_ROOT");
-        if (base_path == null) {
-            base_path = Build.XKB_BASE;
-        }
-
-        return Path.build_filename (base_path, "rules", XKB_RULES_FILE);
-    }
-
     public static GLib.ListStore get_all () {
         var layout_store = new GLib.ListStore (typeof (KeyboardLayout));
 
@@ -284,16 +273,4 @@ public class Installer.KeyboardLayout : GLib.Object {
 
         return layout_store;
     }
-
-    private static unowned Xml.Node* get_xml_node_by_name (Xml.Node* root, string name) {
-        for (unowned Xml.Node* iter = root->children; iter != null; iter = iter->next) {
-            if (iter->type == Xml.ElementType.ELEMENT_NODE) {
-                if (iter->name == name) {
-                    return iter;
-                }
-            }
-        }
-
-        return null;
-    }
 }
diff --git a/src/meson.build b/src/meson.build
@@ -65,8 +65,7 @@ gui_dependencies = [
     adw_dep,
     json_glib_dep,
     pwquality_dep,
-    xkbregistry_dep,
-    xml2_dep
+    xkbregistry_dep
 ]
 
 executable(meson.project_name(), vala_files, config_file,