From cee4df4e0f23f5a24581dbb3b3ea4530568a72b6 Mon Sep 17 00:00:00 2001
From: Nikolas Zimmermann <nzimmermann@igalia.com>
Date: Tue, 26 Aug 2025 10:37:59 +0200
Subject: [PATCH] Switch base image to Ubuntu 25.04.

---
 images/wkdev_sdk/Containerfile                         |  6 +++---
 images/wkdev_sdk/jhbuild/webkit-sdk-deps.modules       | 10 +++++-----
 .../wkdev_sdk/required_system_packages/04-devtools.lst |  3 +++
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/images/wkdev_sdk/Containerfile b/images/wkdev_sdk/Containerfile
index 69ae849..43609f2 100644
--- a/images/wkdev_sdk/Containerfile
+++ b/images/wkdev_sdk/Containerfile
@@ -1,12 +1,12 @@
-# Copyright 2024 Igalia S.L.
+# Copyright 2024-2025 Igalia S.L.
 # SPDX-License: MIT
 
-FROM ubuntu:24.04
+FROM ubuntu:25.04
 
 LABEL maintainer="webkit-gtk@lists.webkit.org"
 LABEL version="1.0"
 LABEL org.opencontainers.image.title="WebKit SDK"
-LABEL org.opencontainers.image.description="Provides a complete WebKit Gtk/WPE development environment based on Ubuntu 24.04"
+LABEL org.opencontainers.image.description="Provides a complete WebKit Gtk/WPE development environment based on Ubuntu 25.04"
 LABEL org.opencontainers.image.source=https://github.com/Igalia/webkit-container-sdk
 
 # Tweakable "make -j <x>" setting.
diff --git a/images/wkdev_sdk/jhbuild/webkit-sdk-deps.modules b/images/wkdev_sdk/jhbuild/webkit-sdk-deps.modules
index 7109a53..55eca33 100644
--- a/images/wkdev_sdk/jhbuild/webkit-sdk-deps.modules
+++ b/images/wkdev_sdk/jhbuild/webkit-sdk-deps.modules
@@ -70,12 +70,12 @@
   <meson id="gtk4" mesonargs="-Dbuild-demos=false -Dbuild-examples=false -Dbuild-tests=false -Dbuild-testsuite=false">
     <branch repo="github.com"
             checkoutdir="gtk4"
-            module="GNOME/gtk.git" tag="4.16.2"/>
+            module="GNOME/gtk.git" tag="4.19.4"/>
   </meson>
 
   <meson id="libadwaita" mesonargs="-Dexamples=false -Dgtk_doc=true -Dtests=false -Dvapi=false">
     <branch repo="github.com"
-            module="GNOME/libadwaita.git" tag="1.6.0"/>
+            module="GNOME/libadwaita.git" tag="1.7.6"/>
     <dependencies>
       <dep package="gtk4"/>
       <dep package="sassc"/>
@@ -190,7 +190,7 @@
   <!-- Everything in this section is just for sysprof. -->
   <meson id="libpanel" mesonargs="-Dvapi=false">
     <branch repo="github.com"
-            module="GNOME/libpanel.git" tag="1.8.0"/>
+            module="GNOME/libpanel.git" tag="1.10.0"/>
     <dependencies>
       <dep package="libadwaita"/>
     </dependencies>
@@ -198,12 +198,12 @@
 
   <meson id="libdex" mesonargs="-Dvapi=false">
     <branch repo="github.com"
-            module="GNOME/libdex.git" tag="0.8.0"/>
+            module="GNOME/libdex.git" tag="0.11.1"/>
   </meson>
 
   <meson id="sysprof" mesonargs="-Dexamples=false -Dpolkit-agent=disabled -Dsysprofd=host -Dtests=false">
     <branch repo="github.com"
-            module="GNOME/sysprof.git" tag="47.0">
+            module="GNOME/sysprof.git" tag="48.0">
     </branch>
     <dependencies>
       <dep package="libadwaita"/>
diff --git a/images/wkdev_sdk/required_system_packages/04-devtools.lst b/images/wkdev_sdk/required_system_packages/04-devtools.lst
index d641d04..cc4530f 100644
--- a/images/wkdev_sdk/required_system_packages/04-devtools.lst
+++ b/images/wkdev_sdk/required_system_packages/04-devtools.lst
@@ -10,6 +10,9 @@ valgrind perf-tools-unstable systemd-coredump
 # Documentation
 asciidoc doxygen doxygen-latex doxygen-doxyparse graphviz python3-sphinx devhelp libglib2.0-doc libgtk-4-doc libsoup-3.0-doc
 
+# Needed for jhbuild / gstreamer
+python-gi-dev python3-gi
+
 # For WebKit scripts such as git-webkit
 python3-pip python3-cffi