mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-26 01:59:01 +08:00
ec4a7d72b1
* [gtk] update to 4.10.1 (microsoft#30896) gtk-4.8.2 and newer no longer contain a python script to emulate meson's post-install logic, so we can't manually trigger it after patching meson not to run the post-install. Patch the meson file to run the post-install even when cross-compiling, though if it's execution is optional and all it does is to generate some caches, i.e. pollute the build system, then we might be better off not running the post-install logic at all. Also, we now have a direct harfbuzz dependency by gtk/gtkmain.c and it also needs harfbuzz with glib support enabled. * [gtk] Regenerate version registries (microsoft#30896)
30 lines
828 B
Diff
30 lines
828 B
Diff
diff --git a/meson.build b/meson.build
|
|
index 13517714b7..2132611c88 100644
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -857,15 +857,15 @@ subdir('po')
|
|
|
|
subdir('docs/reference')
|
|
|
|
-if not meson.is_cross_build()
|
|
- gnome.post_install(
|
|
- glib_compile_schemas: true,
|
|
- gio_querymodules: gio_module_dirs,
|
|
- gtk_update_icon_cache: get_option('demos'),
|
|
- )
|
|
-else
|
|
- message('Not executing post-install steps automatically when cross compiling')
|
|
-endif
|
|
+#if not meson.is_cross_build()
|
|
+ gnome.post_install(
|
|
+ glib_compile_schemas: true,
|
|
+ gio_querymodules: gio_module_dirs,
|
|
+ gtk_update_icon_cache: get_option('demos'),
|
|
+ )
|
|
+#else
|
|
+# message('Not executing post-install steps automatically when cross compiling')
|
|
+#endif
|
|
|
|
if not meson.is_subproject()
|
|
meson.add_dist_script('build-aux/meson/dist-data.py')
|