From 38f0186560156ac7dd26d55239f95bf87f79fcf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Thu, 25 Feb 2021 00:31:31 +0000 Subject: meson: rely on automatic wrap promotion from subprojects Don't ship wrap files for things that are only dependencies of dependencies, such as gperf (for fontconfig), or libffi + proxy-libintl (for glib). Instead, let Meson use the wraps that these subprojects ship, which Meson will pick up automatically since v56, so there's no need for us to ship these wraps any more. Bump the Meson requirement to 0.56 accordingly. Fix expat package dep for fedora ci and bump the tag so it gets picked up. See https://mesonbuild.com/Release-notes-for-0-56-0.html#wraps-from-subprojects-are-automatically-promoted Closes #445 --- subprojects/gperf.wrap | 5 ----- subprojects/libffi.wrap | 4 ---- subprojects/proxy-libintl.wrap | 4 ---- 3 files changed, 13 deletions(-) delete mode 100644 subprojects/gperf.wrap delete mode 100644 subprojects/libffi.wrap delete mode 100644 subprojects/proxy-libintl.wrap (limited to 'subprojects') diff --git a/subprojects/gperf.wrap b/subprojects/gperf.wrap deleted file mode 100644 index 748973312..000000000 --- a/subprojects/gperf.wrap +++ /dev/null @@ -1,5 +0,0 @@ -[wrap-git] -directory=gperf -url=https://gitlab.freedesktop.org/tpm/gperf.git -push-url=https://gitlab.freedesktop.org/tpm/gperf.git -revision=meson diff --git a/subprojects/libffi.wrap b/subprojects/libffi.wrap deleted file mode 100644 index 6dea9ebed..000000000 --- a/subprojects/libffi.wrap +++ /dev/null @@ -1,4 +0,0 @@ -[wrap-git] -directory=libffi -url=https://gitlab.freedesktop.org/gstreamer/meson-ports/libffi.git -revision=meson diff --git a/subprojects/proxy-libintl.wrap b/subprojects/proxy-libintl.wrap deleted file mode 100644 index b53c8f7c3..000000000 --- a/subprojects/proxy-libintl.wrap +++ /dev/null @@ -1,4 +0,0 @@ -[wrap-git] -directory=proxy-libintl -url=https://github.com/frida/proxy-libintl.git -revision=0.1 -- cgit v1.2.1