mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-25 12:58:59 +08:00
3f56cc65d8
* Make gtk4.4 build. * Update baseline for gtk * Fix vcpkg version. * Fix vcpkg version. * [gtk] Fix macos build. * [gtk] Fix linux build. * [gtk] Add patches. * [gtk] Bump versions - again * Fix macos patch. * Bump versions. * Install xdamage. * Bump versions. * Add merged patch from upstream. * [gtk] Bump version. * Delete duplicate install of libxdamage-dev * Add comment about change being merged upstream. Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
48 lines
1.5 KiB
Diff
48 lines
1.5 KiB
Diff
diff --git a/meson.build b/meson.build
|
|
index 9fe9cd5ac..19a19e5c6 100644
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -845,24 +845,24 @@ subdir('po-properties')
|
|
subdir('docs/tools')
|
|
subdir('docs/reference')
|
|
|
|
-if not meson.is_cross_build()
|
|
- if meson.version().version_compare('>=0.57.0')
|
|
- gnome.post_install(
|
|
- glib_compile_schemas: true,
|
|
- gio_querymodules: gio_module_dirs,
|
|
- gtk_update_icon_cache: true,
|
|
- )
|
|
- else
|
|
- meson.add_install_script('build-aux/meson/post-install.py',
|
|
- gtk_api_version,
|
|
- gtk_binary_version,
|
|
- gtk_libdir,
|
|
- gtk_datadir,
|
|
- gtk_bindir)
|
|
- endif
|
|
-else
|
|
- message('Not executing post-install steps automatically when cross compiling')
|
|
-endif
|
|
+#if not meson.is_cross_build()
|
|
+# if meson.version().version_compare('>=0.57.0')
|
|
+# gnome.post_install(
|
|
+# glib_compile_schemas: true,
|
|
+# gio_querymodules: gio_module_dirs,
|
|
+# gtk_update_icon_cache: true,
|
|
+# )
|
|
+# else
|
|
+# meson.add_install_script('build-aux/meson/post-install.py',
|
|
+# gtk_api_version,
|
|
+# gtk_binary_version,
|
|
+# gtk_libdir,
|
|
+# gtk_datadir,
|
|
+# gtk_bindir)
|
|
+# endif
|
|
+#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')
|