[cairo-commit] 2 commits - .gitlab-ci.yml Makefile.am meson.build subprojects/gperf.wrap subprojects/libffi.wrap subprojects/proxy-libintl.wrap

[GitLab Mirror]

 .gitlab-ci.yml                 |    4 ++--
 Makefile.am                    |    3 ---
 meson.build                    |    2 +-
 subprojects/gperf.wrap         |    5 -----
 subprojects/libffi.wrap        |    4 ----
 subprojects/proxy-libintl.wrap |    4 ----
 6 files changed, 3 insertions(+), 19 deletions(-)

New commits:
commit 187fd83aaa3a342e598f2731ca0e78414c7a2ffa
Merge: 6d169c699 38f018656
Author: Tim-Philipp Müller <tim at centricular.com>
Date:   Sat Aug 28 11:52:26 2021 +0000

    Merge branch 'meson-rely-on-subproject-wrap-promotion-for-indirectly-needed-wraps' into 'master'
    
    meson: rely on automatic wrap promotion from subprojects
    
    Closes #445
    
    See merge request cairo/cairo!131

commit 38f0186560156ac7dd26d55239f95bf87f79fcf3
Author: Tim-Philipp Müller <tim at centricular.com>
Date:   Thu Feb 25 00:31:31 2021 +0000

    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

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