brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

extension-tool: Remove old compatibility code

Browse Source 
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: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3042>
This commit is contained in:
Florian Müllner
2023-12-03 12:20:47 +01:00
parent 8e1241c29b
commit dcee0c6329
2 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
subprojects/extensions-tool/src/command-pack.c
View File

@ -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;

1
subprojects/extensions-tool/src/meson.build
View File

@ -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(