From dcee0c6329c34b00940031346a9afc497086e15c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Sun, 3 Dec 2023 12:20:47 +0100 Subject: [PATCH] extension-tool: Remove old compatibility code Since GNOME 44, extension schemas are compiled at install time. At the time GNOME 46 is released, this will be all supported versions, so start relying on it and drop the old compatibility code. Part-of: --- subprojects/extensions-tool/src/command-pack.c | 12 ------------ subprojects/extensions-tool/src/meson.build | 1 - 2 files changed, 13 deletions(-) diff --git a/subprojects/extensions-tool/src/command-pack.c b/subprojects/extensions-tool/src/command-pack.c index 4c07bf3ad..9575c21ea 100644 --- a/subprojects/extensions-tool/src/command-pack.c +++ b/subprojects/extensions-tool/src/command-pack.c @@ -138,7 +138,6 @@ extension_pack_add_schemas (ExtensionPack *pack, { g_autoptr (GSubprocess) proc = NULL; g_autoptr (GFile) dstdir = NULL; - g_autofree char *dstpath = NULL; char **s; if (!ensure_tmpdir (pack, error)) @@ -163,17 +162,6 @@ extension_pack_add_schemas (ExtensionPack *pack, return FALSE; } -#if MAJOR_VERSION >= 46 -#error "Outdated compatibility code, please remove" -#else - dstpath = g_file_get_path (dstdir); - proc = g_subprocess_new (G_SUBPROCESS_FLAGS_STDERR_SILENCE, error, - "glib-compile-schemas", "--strict", dstpath, NULL); - - if (!g_subprocess_wait_check (proc, NULL, error)) - return FALSE; -#endif - g_hash_table_insert (pack->files, g_strdup ("schemas"), g_steal_pointer (&dstdir)); return TRUE; diff --git a/subprojects/extensions-tool/src/meson.build b/subprojects/extensions-tool/src/meson.build index f7bda8aff..a855fef97 100644 --- a/subprojects/extensions-tool/src/meson.build +++ b/subprojects/extensions-tool/src/meson.build @@ -1,7 +1,6 @@ config_h = configuration_data() config_h.set_quoted('GETTEXT_PACKAGE', package_name) config_h.set_quoted('VERSION', meson.project_version()) -config_h.set('MAJOR_VERSION', meson.project_version().split('.')[0]) config_h.set_quoted('LOCALEDIR', localedir) config_h.set('HAVE_BIND_TEXTDOMAIN_CODESET', cc.has_function('bind_textdomain_codeset')) configure_file(