From 079251a2e84992f7aa72e3669e2764785988f2cf Mon Sep 17 00:00:00 2001
From: N0VA <n0va@krzak.org>
Date: Sun, 4 Jan 2026 16:01:06 +0100
Subject: [PATCH] Builds on modern

---
 .gitignore       |  1 +
 configure        |  1 -
 data/meson.build | 12 +++++++++---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 31d0c29..d7d6904 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,4 @@ Makefile
 _build/
 .flatpak-builder/
 flatpak/
+/subprojects/
diff --git a/configure b/configure
index 6ee3185..40dd34d 100755
--- a/configure
+++ b/configure
@@ -78,7 +78,6 @@ echooption() {
 }
 
 sanitycheck MESON 'meson'
-sanitycheck MESONTEST 'mesontest'
 sanitycheck NINJA 'ninja' 'ninja-build'
 
 declare -A default_options=(
diff --git a/data/meson.build b/data/meson.build
index 94b8ee5..63327d1 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,10 +1,9 @@
 desktop = 'com.frac_tion.teleport.desktop'
 
 i18n.merge_file(
-  desktop,
-  type: 'desktop',
   input: desktop + '.in',
   output: desktop,
+  type: 'desktop',
   po_dir: po_dir,
   install: true,
   install_dir: join_paths(teleport_datadir, 'applications')
@@ -40,10 +39,17 @@ endif
 #  install_dir: teleport_schemadir
 #)
 
+schema_dir = join_paths(get_option('prefix'), get_option('datadir'), 'glib-2.0', 'schemas')
 install_data(
   'com.frac_tion.teleport.gschema.xml',
-  install_dir: teleport_schemadir
+  install_dir: schema_dir
 )
 
+# Compile the schemas after installation
+glib_compiled_schemas = find_program('glib-compile-schemas', required: false)
+if glib_compiled_schemas.found()
+  meson.add_install_script(glib_compiled_schemas, schema_dir)
+endif
+
 #subdir('appdata')
 subdir('icons')