Merge branch 'meson' into 'main'

build: Bump Meson dependency to 1.4.0

See merge request GNOME/glib!4244

.gitlab-ci.yml

@@ -11,11 +11,11 @@ cache:
     - _ccache/
 
 variables:
-  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/glib/fedora:v39.1"
+  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/glib/fedora:v39.2"
   COVERITY_IMAGE: "registry.gitlab.gnome.org/gnome/glib/coverity:v7"
-  DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v19"
+  DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v20"
-  ALPINE_IMAGE: "registry.gitlab.gnome.org/gnome/glib/alpine:v3"
+  ALPINE_IMAGE: "registry.gitlab.gnome.org/gnome/glib/alpine:v4"
-  MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v39.1"
+  MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v39.2"
   GOBJECT_INTROSPECTION_TAG: "1.80.1"
   MESON_TEST_TIMEOUT_MULTIPLIER: 4
   G_MESSAGES_DEBUG: all
@@ -284,12 +284,7 @@ hurd-i386:
     - hurd
   needs: []
   script:
-    # FIXME: We can’t use ${MESON_COMMON_OPTIONS} here because the Hurd runner
+    - meson setup ${MESON_COMMON_OPTIONS}
-    # has Meson 1.3 installed. See the comment below about the same problem on
-    # FreeBSD.
-    - meson setup
-            --buildtype debug
-            --wrap-mode=nodownload
             --werror
             --default-library=both
             --prefix=$HOME/glib-installed
@@ -713,7 +708,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.3
+    - pip3 install meson==1.4.2
     - pip3 install ninja==1.11.1
   script:
     # FIXME: Use --wrap-mode=default so we download dependencies each time,
@@ -721,8 +716,11 @@ macos-x86_64:
     # already contains the dependencies. See:
     #  - https://gitlab.gnome.org/GNOME/glib/merge_requests/388
     #  - https://gitlab.gnome.org/Infrastructure/Infrastructure/issues/225
+    # FIXME: Override c_std to not be a list, until
+    # https://github.com/mesonbuild/meson/issues/13639 is fixed.
     - meson setup ${MESON_COMMON_OPTIONS}
             --wrap-mode=default
+            -Dc_std=gnu99
             --werror
             _build
     - meson compile -C _build

.gitlab-ci/alpine.Dockerfile

@@ -25,7 +25,7 @@ RUN apk add --no-cache \
 
 ENV LANG=C.UTF-8 LANGUAGE=C.UTF-8 LC_ALL=C.UTF-8 MUSL_LOCPATH=/usr/share/i18n/locales/musl
 
-RUN pip3 install --break-system-packages meson==1.2.3
+RUN pip3 install --break-system-packages meson==1.4.2
 
 ARG HOST_USER_ID=5555
 ENV HOST_USER_ID ${HOST_USER_ID}

.gitlab-ci/debian-stable.Dockerfile

@@ -71,7 +71,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==1.2.3
+RUN pip3 install --break-system-packages meson==1.4.2
 
 ARG HOST_USER_ID=5555
 ENV HOST_USER_ID ${HOST_USER_ID}

.gitlab-ci/fedora.Dockerfile

@@ -79,7 +79,7 @@ RUN dnf -y update \
     make \
  && dnf clean all
 
-RUN pip3 install meson==1.2.3
+RUN pip3 install meson==1.4.2
 
 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:v39.1
+FROM registry.gitlab.gnome.org/gnome/glib/fedora:v39.2
 
 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.2.3 || goto :error
+pip3 install --upgrade --user meson==1.4.2 || goto :error
 meson setup %args% _build || goto :error
 meson compile -C _build || goto :error
 

gio/meson.build

@@ -758,8 +758,6 @@ gio_visibility_h = custom_target(
   command: [gen_visibility_macros, meson.project_version(), 'visibility-macros', 'GIO', '@OUTPUT@'],
   install: true,
   install_dir: gio_includedir,
-  # FIXME: Not needed with Meson >= 0.64.0
-  install_tag: 'devel',
 )
 gio_sources += gio_visibility_h
 
@@ -776,8 +774,6 @@ gioenumtypes_h = custom_target('gioenumtypes_h',
   input : gio_headers,
   install : true,
   install_dir : gio_includedir,
-  # FIXME: Not needed with Meson >= 0.64.0
-  install_tag: 'devel',
   command : [python, glib_mkenums,
              '--template', files('gioenumtypes.h.template'),
              '@INPUT@', gnetworking_h])

gio/tests/meson.build

@@ -7,7 +7,7 @@ common_gio_tests_deps = [
 
 test_c_args = [
   '-DG_LOG_DOMAIN="GLib-GIO"',
-  '-DGLIB_MKENUMS="@0@"'.format(glib_mkenums),
+  '-DGLIB_MKENUMS="@0@"'.format(glib_mkenums.full_path()),
   '-DGLIB_COMPILE_SCHEMAS="@0@"'.format(glib_compile_schemas.full_path()),
   '-UG_DISABLE_ASSERT',
 ]

girepository/introspection/meson.build

@@ -242,14 +242,14 @@ gio_gir_args = [
 if host_system == 'windows'
   gio_gir_sources += [ gio_win32_include_headers, win32_sources ]
   foreach h: gio_win32_include_headers
-    gio_gir_args += '--c-include=@0@'.format(h)
+    gio_gir_args += '--c-include=' + h.full_path()
   endforeach
   gio_gir_packages += 'gio-windows-2.0'
   gio_gir_args += '--pkg=gio-windows-2.0'
 else
   gio_gir_sources += [ gio_unix_include_headers, unix_sources ]
   foreach h: gio_unix_include_headers
-    gio_gir_args += '--c-include=@0@'.format(h)
+    gio_gir_args += '--c-include=' + h.full_path()
   endforeach
   gio_gir_packages += 'gio-unix-2.0'
   gio_gir_args += '--pkg=gio-unix-2.0'
@@ -278,7 +278,7 @@ gio_gir = gnome.generate_gir(libgio,
 if host_system == 'windows'
   gio_win32_gir_c_includes = []
   foreach h: gio_win32_include_headers
-    gio_win32_gir_c_includes += '--c-include=@0@'.format(h)
+    gio_win32_gir_c_includes += '--c-include=' + h.full_path()
   endforeach
 
   gio_win32_gir = gnome.generate_gir(libgio,
@@ -308,7 +308,7 @@ if host_system == 'windows'
 else
   gio_unix_gir_c_includes = []
   foreach h: gio_unix_include_headers
-    gio_unix_gir_c_includes += '--c-include=@0@'.format(h)
+    gio_unix_gir_c_includes += '--c-include=' + h.full_path()
   endforeach
 
   gio_unix_gir = gnome.generate_gir(libgio,

glib/meson.build

@@ -13,8 +13,6 @@ gversionmacros_h = custom_target(
   command: [gen_visibility_macros, meson.project_version(), 'versions-macros', '@INPUT@', '@OUTPUT@'],
   install: true,
   install_dir: glib_sub_includedir,
-  # FIXME: Not needed with Meson >= 0.64.0
-  install_tag: 'devel',
 )
 
 glib_visibility_h = custom_target(
@@ -22,8 +20,6 @@ glib_visibility_h = custom_target(
   command: [gen_visibility_macros, meson.project_version(), 'visibility-macros', 'GLIB', '@OUTPUT@'],
   install: true,
   install_dir: glib_sub_includedir,
-  # FIXME: Not needed with Meson >= 0.64.0
-  install_tag: 'devel',
 )
 
 glib_built_headers = [gversionmacros_h, glib_visibility_h]

gmodule/meson.build

@@ -74,8 +74,6 @@ gmodule_visibility_h = custom_target(
   command: [gen_visibility_macros, meson.project_version(), 'visibility-macros', 'GMODULE', '@OUTPUT@'],
   install: true,
   install_dir: g_module_includedir,
-  # FIXME: Not needed with Meson >= 0.64.0
-  install_tag: 'devel',
 )
 
 gmodule_sources = [gmodule_c, gmodule_visibility_h, gmodule_deprecated_c]

gobject/meson.build

@@ -32,8 +32,6 @@ gobject_visibility_h = custom_target(
   command: [gen_visibility_macros, meson.project_version(), 'visibility-macros', 'GOBJECT', '@OUTPUT@'],
   install: true,
   install_dir: gobject_includedir,
-  # FIXME: Not needed with Meson >= 0.64.0
-  install_tag: 'devel',
 )
 gobject_sources += gobject_visibility_h
 

meson.build

@@ -1,11 +1,11 @@
 project('glib', 'c',
   version : '2.83.0',
   # NOTE: See the policy in docs/meson-version.md before changing the Meson dependency
-  meson_version : '>= 1.2.0',
+  meson_version : '>= 1.4.0',
   default_options : [
     'buildtype=debugoptimized',
     'warning_level=3',
-    'c_std=gnu99'
+    'c_std=gnu99,c99'
   ]
 )
 
@@ -222,8 +222,7 @@ if valgrind.found()
       '--num-callers=50',
       '--show-leak-kinds=definite,possible',
       '--show-error-list=yes',
-      '--suppressions=@0@'.format(meson.project_source_root() /
+      '--suppressions=' + valgrind_suppression_file.full_path(),
-        '@0@'.format(valgrind_suppression_file)),
     ],
     env: common_test_env,
     timeout_multiplier: 20,

subprojects/proxy-libintl.wrap

@@ -1,7 +1,7 @@
 [wrap-git]
 directory = proxy-libintl
 url = https://github.com/frida/proxy-libintl.git
-revision = 0.4
+revision = 33934de09af6a6627eb44e310a8079df009abdbb
 depth=1
 
 [provide]

subprojects/zlib.wrap

@@ -1,11 +1,13 @@
 [wrap-file]
-directory = zlib-1.2.11
+directory = zlib-1.3.1
-source_url = https://zlib.net/fossils/zlib-1.2.11.tar.gz
+source_url = http://zlib.net/fossils/zlib-1.3.1.tar.gz
-source_filename = zlib-1.2.11.tar.gz
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/zlib_1.3.1-1/zlib-1.3.1.tar.gz
-source_hash = c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
+source_filename = zlib-1.3.1.tar.gz
-patch_filename = zlib_1.2.11-6_patch.zip
+source_hash = 9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23
-patch_url = https://wrapdb.mesonbuild.com/v2/zlib_1.2.11-6/get_patch
+patch_filename = zlib_1.3.1-1_patch.zip
-patch_hash = f7c24c5698ce787294910ad431f94088102d35ddaf88542d04add1e54afa9212
+patch_url = https://wrapdb.mesonbuild.com/v2/zlib_1.3.1-1/get_patch
+patch_hash = e79b98eb24a75392009cec6f99ca5cdca9881ff20bfa174e8b8926d5c7a47095
+wrapdb_version = 1.3.1-1
 
 [provide]
 zlib = zlib_dep