Merge branch 'override-dependency' into 'master'

meson: Use meson.override_dependency()

See merge request GNOME/pango!250

4 files changed, 11 insertions, 5 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c287010c..0d1433cb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,9 +8,10 @@ stages:
 variables:
   COMMON_MESON_FLAGS: "--fatal-meson-warnings --werror"
   MESON_TEST_TIMEOUT_MULTIPLIER: 2
+  FEDORA_IMAGE: registry.gitlab.gnome.org/gnome/pango/fedora:v3
 
 linux-fedora:
-  image: registry.gitlab.gnome.org/gnome/pango/fedora:v2
+  image: $FEDORA_IMAGE
   stage: build
   needs: []
   variables:
@@ -34,7 +35,7 @@ linux-fedora:
       - "${CI_PROJECT_DIR}/_build/fontlist.txt"
 
 asan-build:
-  image: registry.gitlab.gnome.org/gnome/pango/fedora:v2
+  image: $FEDORA_IMAGE
   tags: [ asan ]
   stage: analysis
   needs: []
@@ -78,7 +79,7 @@ msys2-mingw64:
       - _build/fontlist.txt
 
 reference:
-  image: registry.gitlab.gnome.org/gnome/pango/fedora:v1
+  image: $FEDORA_IMAGE
   stage: docs
   needs: []
   variables:
diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile
index f2240cac..9447bdb1 100644
--- a/.gitlab-ci/fedora.Dockerfile
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -41,7 +41,7 @@ RUN dnf -y install \
     thai-scalable-waree-fonts \
  && dnf clean all
 
-RUN pip3 install meson==0.53.1
+RUN pip3 install meson==0.54.3
 
 ARG HOST_USER_ID=5555
 ENV HOST_USER_ID ${HOST_USER_ID}
diff --git a/meson.build b/meson.build
index b67f9d61..98f4e372 100644
--- a/meson.build
+++ b/meson.build
@@ -8,7 +8,7 @@ project('pango', 'c', 'cpp',
           # https://github.com/mesonbuild/meson/issues/2289
           'c_std=gnu99',
         ],
-        meson_version : '>= 0.50.0')
+        meson_version : '>= 0.54.0')
 
 add_project_arguments([ '-D_POSIX_C_SOURCE=200809L', '-D_POSIX_THREAD_SAFE_FUNCTIONS', '-D_GNU_SOURCE', ], language: 'c')
 
diff --git a/pango/meson.build b/pango/meson.build
index 0b87b644..91261274 100644
--- a/pango/meson.build
+++ b/pango/meson.build
@@ -152,6 +152,7 @@ libpango_dep = declare_dependency(
   dependencies: pango_deps,
   sources: pango_dep_sources,
 )
+meson.override_dependency('pango', libpango_dep)
 
 pango_pkg_requires = ['gobject-2.0']
 if harfbuzz_dep.type_name() == 'pkgconfig'
@@ -293,6 +294,7 @@ if build_pangoft2
     dependencies: pango_deps + [ libpango_dep ],
     sources: pangoft2_dep_sources,
   )
+  meson.override_dependency('pangoft2', libpangoft2_dep)
 
   pkgconfig.generate(libpangoft2,
     name: 'Pango FT2 and Pango Fc',
@@ -382,6 +384,7 @@ if xft_dep.found() and fontconfig_dep.found()
     dependencies: pango_deps + [ libpango_dep, libpangoft2_dep ],
     sources: pangoxft_dep_sources,
   )
+  meson.override_dependency('pangoxft', libpangoxft_dep)
 
   pkgconfig.generate(libpangoxft,
     name: 'Pango Xft',
@@ -441,6 +444,7 @@ if host_system == 'windows'
     include_directories: root_inc,
     dependencies: pango_deps + [ libpango_dep ],
   )
+  meson.override_dependency('pangowin32', libpangowin32_dep)
 
   pkgconfig.generate(libpangowin32,
     name: 'Pango Win32',
@@ -547,6 +551,7 @@ if cairo_dep.found()
     dependencies: pango_deps + [ libpango_dep ],
     sources: pangocairo_dep_sources,
   )
+  meson.override_dependency('pangocairo', libpangocairo_dep)
 
   # Create pangocairo.pc according to whether we found Cairo
   # manually