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

extension-tool: Set reminder for removing old compat code

Browse Source 
GSettings schemas are now compiled at install time, so it is no
longer necessary to include the compiled schema in the archive.

However the `gnome-extensions pack` command hasn't been adjusted,
so that it can still be used to produce valid archives for all
supported versions.

To not let that code linger forever, error out when building
a version where GNOME 44 is the oldest supported release.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2639>
This commit is contained in:
Florian Müllner 2023-02-13 00:26:29 +01:00 committed by Marge Bot
parent ad7515fd0a
commit 43401b9d44
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -163,12 +163,16 @@ extension_pack_add_schemas (ExtensionPack *pack,
return FALSE; return FALSE;
} }
#if MAJOR_VERSION >= 46
#error "Outdated compatibility code, please remove"
#else
dstpath = g_file_get_path (dstdir); dstpath = g_file_get_path (dstdir);
proc = g_subprocess_new (G_SUBPROCESS_FLAGS_STDERR_SILENCE, error, proc = g_subprocess_new (G_SUBPROCESS_FLAGS_STDERR_SILENCE, error,
"glib-compile-schemas", "--strict", dstpath, NULL); "glib-compile-schemas", "--strict", dstpath, NULL);
if (!g_subprocess_wait_check (proc, NULL, error)) if (!g_subprocess_wait_check (proc, NULL, error))
return FALSE; return FALSE;
#endif
g_hash_table_insert (pack->files, g_hash_table_insert (pack->files,
g_strdup ("schemas"), g_steal_pointer (&dstdir)); g_strdup ("schemas"), g_steal_pointer (&dstdir));

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

@ -1,6 +1,7 @@
config_h = configuration_data() config_h = configuration_data()
config_h.set_quoted('GETTEXT_PACKAGE', package_name) config_h.set_quoted('GETTEXT_PACKAGE', package_name)
config_h.set_quoted('VERSION', meson.project_version()) 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_quoted('LOCALEDIR', localedir)
config_h.set('HAVE_BIND_TEXTDOMAIN_CODESET', cc.has_function('bind_textdomain_codeset')) config_h.set('HAVE_BIND_TEXTDOMAIN_CODESET', cc.has_function('bind_textdomain_codeset'))
configure_file( configure_file(