Merge branch 'update-wraps' into 'main'

Update GLib fallback subproject to latest stable release

See merge request dbus/dbus!426

.gitlab-ci.yml

@@ -201,7 +201,7 @@ debian meson clang debug:
     - tar --strip-components=1 -C test/use-as-subproject/subprojects/dbus -xf $ci_builddir/meson-dist/*.tar.xz
     - meson setup --wrap-mode=forcefallback test/use-as-subproject/_build test/use-as-subproject
     - meson compile -C test/use-as-subproject/_build
-    - meson test -C test/use-as-subproject/_build
+    - "meson test -C test/use-as-subproject/_build dbus:"
 
 debian meson reduced:
   extends:
@@ -387,7 +387,7 @@ windows-meson-mingw-ucrt64:
     - C:\msys64\usr\bin\bash -lc "
         meson build &&
         ninja -j1 -C build &&
-        meson test --no-suite=runs-dbus-daemon -C build"
+        meson test --no-suite=runs-dbus-daemon -C build dbus:"
   artifacts:
     reports:
       junit: "build/meson-logs/testlog.junit.xml"
@@ -406,7 +406,7 @@ windows-meson-vs15-x86:
     - cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=x86 &&
         meson --force-fallback-for=expat,glib,zlib build &&
         meson compile -C build &&
-        meson test --no-suite=runs-dbus-daemon -C build"
+        meson test --no-suite=runs-dbus-daemon -C build dbus:"
   artifacts:
     reports:
       junit: "build/meson-logs/testlog.junit.xml"

subprojects/glib.wrap

@@ -1,9 +1,10 @@
 [wrap-file]
-directory = glib-2.72.2
-source_url = https://download.gnome.org/sources/glib/2.72/glib-2.72.2.tar.xz
-source_filename = glib-2.72.2.tar.xz
-source_hash = 78d599a133dba7fe2036dfa8db8fb6131ab9642783fc9578b07a20995252d2de
-wrapdb_version = 2.72.2-1
+directory = glib-2.82.5
+source_url = https://download.gnome.org/sources/glib/2.82/glib-2.82.5.tar.xz
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/glib_2.82.5-1/glib-2.82.5.tar.xz
+source_filename = glib-2.82.5.tar.xz
+source_hash = 05c2031f9bdf6b5aba7a06ca84f0b4aced28b19bf1b50c6ab25cc675277cbc3f
+wrapdb_version = 2.82.5-1
 
 [provide]
 dependency_names = gthread-2.0, gobject-2.0, gmodule-no-export-2.0, gmodule-export-2.0, gmodule-2.0, glib-2.0, gio-2.0, gio-windows-2.0, gio-unix-2.0

tools/ci-build.sh

@@ -214,12 +214,12 @@ case "$ci_host" in
             fi
             init_wine \
                 "${ci_builddir}/bin" \
-                "${ci_builddir}/subprojects/expat-2.4.8" \
-                "${ci_builddir}/subprojects/glib-2.72.2/gio" \
-                "${ci_builddir}/subprojects/glib-2.72.2/glib" \
-                "${ci_builddir}/subprojects/glib-2.72.2/gmodule" \
-                "${ci_builddir}/subprojects/glib-2.72.2/gobject" \
-                "${ci_builddir}/subprojects/glib-2.72.2/gthread" \
+                "${ci_builddir}"/subprojects/expat-* \
+                "${ci_builddir}"/subprojects/glib-*/gio \
+                "${ci_builddir}"/subprojects/glib-*/glib \
+                "${ci_builddir}"/subprojects/glib-*/gmodule \
+                "${ci_builddir}"/subprojects/glib-*/gobject \
+                "${ci_builddir}"/subprojects/glib-*/gthread \
                 "${dep_prefix}/bin" \
                 ${libgcc_path:+"$libgcc_path"}
         fi
@@ -465,7 +465,7 @@ case "$ci_buildsys" in
         # This is too slow and verbose to keep enabled at the moment
         export DBUS_TEST_MALLOC_FAILURES=0
 
-        [ "$ci_test" = no ] || meson test --print-errorlogs
+        [ "$ci_test" = no ] || meson test dbus: --print-errorlogs
         DESTDIR=DESTDIR meson install
         ( cd DESTDIR && find . -ls)
 

tools/ci-install.sh

@@ -91,9 +91,19 @@ case "$ci_distro" in
                 ;;
         esac
 
-        $sudo apt-get -qq -y update
         packages=()
 
+        case "$ci_host/$ci_suite" in
+            (*-w64-mingw32/bookworm)
+                echo "deb https://deb.debian.org/debian bookworm-backports main" >> /etc/apt/sources.list.d/backports.list
+                packages=("${packages[@]}" meson/bookworm-backports)
+                ;;
+
+            (*)
+                packages=("${packages[@]}" meson)
+                ;;
+        esac
+
         case "$ci_host" in
             (i686-w64-mingw32)
                 packages=(
@@ -148,7 +158,6 @@ case "$ci_distro" in
             libsystemd-dev
             libx11-dev
             llvm
-            meson
             ninja-build
             sudo
             valgrind
@@ -161,6 +170,7 @@ case "$ci_distro" in
             zstd
         )
 
+        $sudo apt-get -qq -y update
         $sudo apt-get -qq -y --no-install-recommends install "${packages[@]}"
 
         packages=(