Merge branch 'meson-version-bump' into 'main'

build: Bump Meson dependency to 1.2.0

See merge request GNOME/glib!3666

.gitlab-ci.yml

@@ -11,10 +11,10 @@ cache:
     - _ccache/
 
 variables:
-  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/glib/fedora:v21"
+  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/glib/fedora:v22"
   COVERITY_IMAGE: "registry.gitlab.gnome.org/gnome/glib/coverity:v7"
-  DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v15"
+  DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v16"
-  MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v11"
+  MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v12"
   MESON_TEST_TIMEOUT_MULTIPLIER: 4
   G_MESSAGES_DEBUG: all
   MESON_COMMON_OPTIONS: "--buildtype debug --wrap-mode=nodownload --fatal-meson-warnings"
@@ -574,7 +574,7 @@ macos-x86_64:
     - ln -s /opt/cmake/CMake.app/Contents/bin/cmake .venv/bin
     - ln -s /opt/ccache/ccache .venv/bin
     - source .venv/bin/activate
-    - pip3 install meson==1.2.0
+    - pip3 install meson==1.2.3
     - pip3 install ninja==1.11.1
   script:
     # FIXME: Use --wrap-mode=default so we download dependencies each time,

.gitlab-ci/debian-stable.Dockerfile

@@ -68,7 +68,7 @@ RUN locale-gen de_DE.UTF-8 \
 
 ENV LANG=C.UTF-8 LANGUAGE=C.UTF-8 LC_ALL=C.UTF-8
 
-RUN pip3 install --break-system-packages meson==0.60.3
+RUN pip3 install --break-system-packages meson==1.2.3
 
 ARG HOST_USER_ID=5555
 ENV HOST_USER_ID ${HOST_USER_ID}

.gitlab-ci/fedora.Dockerfile

@@ -75,7 +75,7 @@ RUN dnf -y update \
     make \
  && dnf clean all
 
-RUN pip3 install meson==0.60.3
+RUN pip3 install meson==1.2.3
 
 COPY install-gitlab-cobertura-tools.sh .
 RUN ./install-gitlab-cobertura-tools.sh

.gitlab-ci/mingw.Dockerfile

@@ -1,4 +1,4 @@
-FROM registry.gitlab.gnome.org/gnome/glib/fedora:v21
+FROM registry.gitlab.gnome.org/gnome/glib/fedora:v22
 
 USER root
 

.gitlab-ci/test-msvc.bat

@@ -12,7 +12,7 @@ for %%x in (%*) do (
 set args=%args:~1%
 
 :: FIXME: make warnings fatal
-pip3 install --upgrade --user meson==1.0.0  || goto :error
+pip3 install --upgrade --user meson==1.2.3  || goto :error
 meson setup %args% _build || goto :error
 python .gitlab-ci/check-missing-install-tag.py _build || goto :error
 meson compile -C _build || goto :error

.gitlab-ci/test-msys2.sh

@@ -26,7 +26,7 @@ CCACHE_BASEDIR="$(pwd)"
 CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
 export CCACHE_BASEDIR CCACHE_DIR
 
-pip3 install --upgrade --user meson==1.0.0
+pip3 install --upgrade --user meson==1.2.3
 
 PATH="$(cygpath "$USERPROFILE")/.local/bin:$HOME/.local/bin:$PATH"
 DIR="$(pwd)"

docs/reference/gio/meson.build

@@ -154,11 +154,7 @@ if get_option('gtk_doc')
     command : [concat_files_helper, '@OUTPUT@', '@INPUT@'],
   )
 
-  configure_file(
+  fs.copyfile(platform_file, 'gio-docs-platform.xml')
-    output : 'gio-docs-platform.xml',
-    input : platform_file,
-    copy : true,
-  )
 
   content_files = [
     'migrating-posix.xml',

gio/gdbus-2.0/codegen/meson.build

@@ -30,6 +30,7 @@ meson.override_find_program('gdbus-codegen', gdbus_codegen)
 codegen_dir = join_paths(glib_datadir, 'glib-2.0', 'codegen')
 
 gdbus_codegen_built_files = []
+gdbus_codegen_built_targets = []
 gdbus_codegen_built_files += configure_file(input : 'config.py.in',
                                             output : 'config.py',
                                             install_dir : codegen_dir,
@@ -39,8 +40,7 @@ gdbus_codegen_built_files += configure_file(input : 'config.py.in',
 foreach f : gdbus_codegen_files
   # Copy these into the builddir so that gdbus-codegen can be used uninstalled
   # and then install it too so that it can be used after installation
-  gdbus_codegen_built_files += configure_file(input : f, output : f,
+  gdbus_codegen_built_targets += fs.copyfile(f, f,
-                                              install_dir : codegen_dir,
+                                             install_dir : codegen_dir,
-                                              install_tag : 'bin-devel',
+                                             install_tag : 'bin-devel')
-                                              copy : true)
 endforeach

gio/meson.build

@@ -242,6 +242,7 @@ xdp_dbus_generated = custom_target('xdp-dbus',
              'org.freedesktop.portal.Trash.xml'],
     output : ['xdp-dbus.h', 'xdp-dbus.c'],
     depend_files : gdbus_codegen_built_files,
+    depends : gdbus_codegen_built_targets,
     command : [python, gdbus_codegen,
                '--interface-prefix', 'org.freedesktop.portal.',
                '--output-directory', '@OUTDIR@',
@@ -254,6 +255,7 @@ gdbus_daemon_generated = custom_target('gdbus-daemon-generated',
     input : ['dbus-daemon.xml'],
     output : ['gdbus-daemon-generated.h', 'gdbus-daemon-generated.c'],
     depend_files : gdbus_codegen_built_files,
+    depends : gdbus_codegen_built_targets,
     command : [python, gdbus_codegen,
                '--interface-prefix', 'org.',
                '--output-directory', '@OUTDIR@',
@@ -881,10 +883,8 @@ libgio_dep = declare_dependency(link_with : libgio,
 pkg.generate(libgio,
   requires : ['glib-2.0', 'gobject-2.0'],
   variables : [
-    'datadir=' + '${prefix}' / get_option('datadir'),
     'schemasdir=' + '${datadir}' / schemas_subdir,
     'dtdsdir=' + '${datadir}' / dtds_subdir,
-    'bindir=' + '${prefix}' / get_option('bindir'),
     'giomoduledir=' + pkgconfig_giomodulesdir,
     'gio=' + '${bindir}' / 'gio',
     'gio_querymodules=' + pkgconfig_multiarch_bindir / 'gio-querymodules',
@@ -1086,20 +1086,11 @@ endif
 
 if multiarch_bindir != get_option('bindir')
   foreach exe : ['gio-querymodules', 'glib-compile-schemas']
-    if meson.version().version_compare('>=0.61.0')
+    install_symlink(
-      install_symlink(
+      exe,
-        exe,
+      install_dir : get_option('bindir'),
-        install_dir : get_option('bindir'),
+      pointing_to : get_option('prefix') / multiarch_bindir / exe,
-        pointing_to : get_option('prefix') / multiarch_bindir / exe,
+    )
-      )
-    else
-      warning(
-        'Please use Meson >= 0.61.0 or create a symlink @1@ -> @2@ in packaging'.format(
-          get_option('prefix') / get_option('bindir') / exe,
-          get_option('prefix') / multiarch_bindir / exe,
-        )
-      )
-    endif
   endforeach
 endif
 

gio/tests/meson.build

@@ -890,10 +890,7 @@ if not meson.is_cross_build()
                '@INPUT@'])
 
   # referenced by test.gresource.xml
-  test_generated_txt = configure_file(input : 'test1.txt',
+  test_generated_txt = fs.copyfile('test1.txt', 'test-generated.txt')
-    output : 'test-generated.txt',
-    copy : true,
-  )
 
   resources_extra_sources = [
     test_gresource,

glib/meson.build

@@ -445,8 +445,6 @@ pkg.generate(libglib,
   subdirs : ['glib-2.0'],
   extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags,
   variables : [
-    'bindir=' + '${prefix}' / get_option('bindir'),
-    'datadir=' + '${prefix}' / get_option('datadir'),
     'glib_genmarshal=' + '${bindir}' / 'glib-genmarshal',
     'gobject_query=' + '${bindir}' / 'gobject-query',
     'glib_mkenums=' + '${bindir}' / 'glib-mkenums',

meson.build

@@ -1,7 +1,7 @@
 project('glib', 'c',
   version : '2.79.0',
   # NOTE: See the policy in docs/meson-version.md before changing the Meson dependency
-  meson_version : '>= 0.60.0',
+  meson_version : '>= 1.2.0',
   default_options : [
     'buildtype=debugoptimized',
     'warning_level=3',