From 2187149c063b01867386f41e29fc32961f364ccb Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Thu, 13 Jun 2024 04:56:32 -0500 Subject: [PATCH 1/2] Disable gobject-introspection in glib build It shouldn't be used anyway, and was causing build errors on my macOS machine: glib| Run-time dependency gobject-introspection-1.0 found: NO (tried framework) subprojects/glib-2.80.3/girepository/introspection/meson.build:43:17: ERROR: Dependency lookup for gobject-introspection-1.0 with method 'pkgconfig' failed: Pkg-config for machine host machine not found. Giving up. Signed-off-by: Benjamin Gilbert --- deps/meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/deps/meson.build b/deps/meson.build index 9c93784..4218c25 100644 --- a/deps/meson.build +++ b/deps/meson.build @@ -98,6 +98,7 @@ subproject( subproject( 'glib', default_options : [ + 'introspection=disabled', 'nls=disabled', 'tests=false', ], From eab04c16a34e7ca1fb17ee60123b4bb976c3f184 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Thu, 13 Jun 2024 12:52:17 -0500 Subject: [PATCH 2/2] Update libffi, libxml2 Signed-off-by: Benjamin Gilbert --- deps/meson.build | 1 + subprojects/libffi.wrap | 10 +++++----- subprojects/libxml2.wrap | 17 +++++++---------- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/deps/meson.build b/deps/meson.build index 4218c25..456f8fd 100644 --- a/deps/meson.build +++ b/deps/meson.build @@ -54,6 +54,7 @@ else 'libxml2', default_options : [ 'iconv=disabled', + 'python=false', ], ) subproject('sqlite3') diff --git a/subprojects/libffi.wrap b/subprojects/libffi.wrap index 323d6bb..cab3b81 100644 --- a/subprojects/libffi.wrap +++ b/subprojects/libffi.wrap @@ -3,11 +3,11 @@ directory = libffi-3.4.4 source_url = https://github.com/libffi/libffi/releases/download/v3.4.4/libffi-3.4.4.tar.gz source_filename = libffi-3.4.4.tar.gz source_hash = d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676 -patch_filename = libffi_3.4.4-3_patch.zip -patch_url = https://wrapdb.mesonbuild.com/v2/libffi_3.4.4-3/get_patch -patch_hash = 7833f5cfb6501c859d6a71710cac74c5c7e0bf5280871e1ace34ebdc2cb56e2c -source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/libffi_3.4.4-3/libffi-3.4.4.tar.gz -wrapdb_version = 3.4.4-3 +patch_filename = libffi_3.4.4-4_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/libffi_3.4.4-4/get_patch +patch_hash = 6babcedb6949383986f1b240a99cd2219a029d62421996d518865a2de855d35a +source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/libffi_3.4.4-4/libffi-3.4.4.tar.gz +wrapdb_version = 3.4.4-4 [provide] dependency_names = libffi diff --git a/subprojects/libxml2.wrap b/subprojects/libxml2.wrap index 27217c4..ce29747 100644 --- a/subprojects/libxml2.wrap +++ b/subprojects/libxml2.wrap @@ -1,13 +1,10 @@ [wrap-file] -directory = libxml2-2.12.7 -source_url = https://download.gnome.org/sources/libxml2/2.12/libxml2-2.12.7.tar.xz -source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/libxml2_2.12.7-1/libxml2-2.12.7.tar.xz -source_filename = libxml2-2.12.7.tar.xz -source_hash = 24ae78ff1363a973e6d8beba941a7945da2ac056e19b53956aeb6927fd6cfb56 -patch_filename = libxml2_2.12.7-1_patch.zip -patch_url = https://wrapdb.mesonbuild.com/v2/libxml2_2.12.7-1/get_patch -patch_hash = 2ca34e5bdffa395a8a499b453b9595a23433939b5683d1d4b6dfac0c51b2db65 -wrapdb_version = 2.12.7-1 +directory = libxml2-2.13.0 +source_url = https://download.gnome.org/sources/libxml2/2.13/libxml2-2.13.0.tar.xz +source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/libxml2_2.13.0-1/libxml2-2.13.0.tar.xz +source_filename = libxml2-2.13.0.tar.xz +source_hash = d5a2f36bea96e1fb8297c6046fb02016c152d81ed58e65f3d20477de85291bc9 +wrapdb_version = 2.13.0-1 [provide] -libxml-2.0 = libxml2_dep +libxml-2.0 = xml_dep