diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2021-02-25 00:31:31 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2021-08-26 23:40:12 +0100 |
| commit | 38f0186560156ac7dd26d55239f95bf87f79fcf3 (patch) | |
| tree | 842cd320dfe1285c4f591c23e1c9aca9baf5f38c | |
| parent | 923715f2e9acec31f6af406f39e14c36f9f7365c (diff) | |
| download | cairo-38f0186560156ac7dd26d55239f95bf87f79fcf3.tar.gz | |
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
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | subprojects/gperf.wrap | 5 | ||||
| -rw-r--r-- | subprojects/libffi.wrap | 4 | ||||
| -rw-r--r-- | subprojects/proxy-libintl.wrap | 4 |
6 files changed, 3 insertions, 19 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b43a1a571..11f45725a 100644 --- a/.gitlab-ci.yml +++ b/.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 diff --git a/Makefile.am b/Makefile.am index 1b7c59bf0..12cd9bf25 100644 --- a/Makefile.am +++ b/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) diff --git a/meson.build b/meson.build index f10a0067b..996a0fce6 100644 --- a/meson.build +++ b/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'], ) 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 |