build: Drop wrap files for GLib dependencies

We don't need wrap files for things we get from GLib or from the system.

5 files changed, 12 insertions, 28 deletions

diff --git a/meson.build b/meson.build
index 240a2387..1452309c 100644
--- a/meson.build
+++ b/meson.build
@@ -147,8 +147,9 @@ else
   giowin_dep = dependency('gio-windows-2.0', version : glib_version,
     fallback: ['glib', 'libgiowin32_dep'])
 endif
-libffi_dep = dependency('libffi',
-  fallback : ['libffi', 'ffi_dep'])
+
+# We either get libffi from the system, or from GLib's own subproject
+libffi_dep = dependency('libffi')
 
 if not (host_system == 'darwin' and host_arch == 'aarch64' or
         host_system == 'linux' and libffi_dep.version().version_compare('>= 3.4'))
diff --git a/subprojects/glib.wrap b/subprojects/glib.wrap
index cd886b2e..0c1cb6b8 100644
--- a/subprojects/glib.wrap
+++ b/subprojects/glib.wrap
@@ -1,5 +1,10 @@
 [wrap-git]
-directory=glib
-url=https://gitlab.gnome.org/GNOME/glib.git
-revision=main
-depth=1
+directory = glib
+url = https://gitlab.gnome.org/GNOME/glib.git
+push-url = ssh://git@ssh.gitlab.gnome.org:GNOME/glib.git
+revision = 2.74.4
+depth = 1
+
+[provide]
+dependency_names = gthread-2.0, gobject-2.0, gmodule-no-export-2.0, gmodule-export-2.0, gmodule-2.0, glib-2.0, gio-2.0, gio-windows-2.0, gio-unix-2.0
+program_names = glib-genmarshal, glib-mkenums, glib-compile-schemas, glib-compile-resources, gio-querymodules, gdbus-codegen
diff --git a/subprojects/libffi.wrap b/subprojects/libffi.wrap
deleted file mode 100644
index f92e7363..00000000
--- a/subprojects/libffi.wrap
+++ /dev/null
@@ -1,5 +0,0 @@
-[wrap-git]
-directory=libffi
-url=https://github.com/centricular/libffi.git
-revision=meson
-depth=1
diff --git a/subprojects/proxy-libintl.wrap b/subprojects/proxy-libintl.wrap
deleted file mode 100644
index d7c8d5fa..00000000
--- a/subprojects/proxy-libintl.wrap
+++ /dev/null
@@ -1,5 +0,0 @@
-[wrap-git]
-directory=proxy-libintl
-url=https://github.com/centricular/proxy-libintl.git
-revision=master
-depth=1
diff --git a/subprojects/zlib.wrap b/subprojects/zlib.wrap
deleted file mode 100644
index 3c7b5757..00000000
--- a/subprojects/zlib.wrap
+++ /dev/null
@@ -1,12 +0,0 @@
-[wrap-file]
-directory = zlib-1.2.12
-source_url = http://zlib.net/fossils/zlib-1.2.12.tar.gz
-source_filename = zlib-1.2.12.tar.gz
-source_hash = 91844808532e5ce316b3c010929493c0244f3d37593afd6de04f71821d5136d9
-patch_filename = zlib_1.2.12-1_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/zlib_1.2.12-1/get_patch
-patch_hash = 8ec8344f3fe7b06ad4be768fd416694bc56cb4545ce78b0f1c18b3e72b3ec936
-
-[provide]
-zlib = zlib_dep
-