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

.gitlab-ci.yml

@@ -8,7 +8,7 @@ include:
 variables:
   FDO_UPSTREAM_REPO: 'cairo/cairo'
   FDO_DISTRIBUTION_VERSION: '34'
-  FDO_DISTRIBUTION_TAG: '2021-07-31.0'
+  FDO_DISTRIBUTION_TAG: '2021-08-26.0'
 
   # TODO: should probably get its own image at some point instead of reusing the GStreamer one.
   WINDOWS_IMAGE:             "registry.freedesktop.org/gstreamer/gst-ci/amd64/windows:v16-master"
@@ -62,7 +62,7 @@ fedora image:
       gcc
       g++
       zlib-devel
-      expat
+      expat-devel
       libpng-devel
       fontconfig-devel
       freetype-devel

Makefile.am

@@ -82,11 +82,8 @@ EXTRA_DIST += \
 	subprojects/fontconfig.wrap \
 	subprojects/freetype2.wrap \
 	subprojects/glib.wrap \
-	subprojects/gperf.wrap \
-	subprojects/libffi.wrap \
 	subprojects/libpng.wrap \
 	subprojects/pixman.wrap \
-	subprojects/proxy-libintl.wrap \
 	subprojects/zlib.wrap \
 	$(NULL)
 

meson.build

@@ -1,5 +1,5 @@
 project('cairo', 'c', 'cpp',
-  meson_version: '>= 0.54.0',
+  meson_version: '>= 0.56.0',
   version: run_command(find_program('version.py'), check: true).stdout().strip(),
   default_options: ['warning_level=2'],
 )

subprojects/gperf.wrap

@@ -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

subprojects/libffi.wrap

@@ -1,4 +0,0 @@
-[wrap-git]
-directory=libffi
-url=https://gitlab.freedesktop.org/gstreamer/meson-ports/libffi.git
-revision=meson

subprojects/proxy-libintl.wrap

@@ -1,4 +0,0 @@
-[wrap-git]
-directory=proxy-libintl
-url=https://github.com/frida/proxy-libintl.git
-revision=0.1