153 files changed, 2021 insertions, 999 deletions
diff --git a/meta-gnome/SECURITY.md b/meta-gnome/SECURITY.md
new file mode 100644
index 0000000000..1530103230
--- /dev/null
+++ b/meta-gnome/SECURITY.md
@@ -0,0 +1,20 @@
+How to Report a Potential Vulnerability?
+========================================
+If you would like to report a public issue (for example, one with a released
+CVE number), please report it to the mailing list:
+  https://lists.openembedded.org/g/openembedded-devel
+If you are dealing with a not-yet released or urgent issue, please send a
+message to one of the maintainers listed in the README.  Include as many
+details as possible:
+  - the layer or software module affected
+  - the recipe and its version
+  - any example code, if available
+Branches maintained with security fixes
+---------------------------------------
+See https://wiki.yoctoproject.org/wiki/Releases for the list of current
+releases.  We only accept patches for the LTS releases and the master branch.
diff --git a/meta-gnome/classes/clutter.bbclass b/meta-gnome/classes/clutter.bbclass
index 24b53a13e4..6cf746261a 100644
--- a/meta-gnome/classes/clutter.bbclass
+++ b/meta-gnome/classes/clutter.bbclass
@@ -12,7 +12,7 @@ VERMINOR = "${@get_minor_dir("${PV}")}"
 REALNAME = "${@get_real_name("${BPN}")}"
 SRC_URI = "${GNOME_MIRROR}/${REALNAME}/${VERMINOR}/${REALNAME}-${PV}.tar.xz;name=archive"
-S = "${WORKDIR}/${REALNAME}-${PV}"
+S = "${UNPACKDIR}/${REALNAME}-${PV}"
 CLUTTERBASEBUILDCLASS ??= "autotools"
 inherit ${CLUTTERBASEBUILDCLASS} pkgconfig gtk-doc gettext
diff --git a/meta-gnome/conf/include/non-repro-meta-gnome.inc b/meta-gnome/conf/include/non-repro-meta-gnome.inc
deleted file mode 100755
index 553bc32cc6..0000000000
--- a/meta-gnome/conf/include/non-repro-meta-gnome.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-# List of known non-reproducible package of the meta-gnome layer
-# Please keep this list sorted
-KNOWN_NON_REPRO_META_GNOME = " \
-    geary \
-    geary-dbg \
-    gegl-dev \
-    gimp \
-    gimp-dbg \
-    gnome-terminal-src \
-    grilo-src \
-    gtk-vnc-src \
-    ibus \
-"
diff --git a/meta-gnome/conf/layer.conf b/meta-gnome/conf/layer.conf
index f831de78c4..faacba478e 100644
--- a/meta-gnome/conf/layer.conf
+++ b/meta-gnome/conf/layer.conf
@@ -17,7 +17,7 @@ LAYERVERSION_gnome-layer = "1"
 LAYERDEPENDS_gnome-layer = "core openembedded-layer networking-layer meta-python"
-LAYERSERIES_COMPAT_gnome-layer = "styhead"
+LAYERSERIES_COMPAT_gnome-layer = "walnascar whinlatter"
 SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += "\
  faenza-icon-theme->gdk-pixbuf \
@@ -29,3 +29,17 @@ BBFILES_DYNAMIC += " \
    virtualization-layer:${LAYERDIR}/dynamic-layers/meta-virtualization/*/*/*.bbappend \
    security:${LAYERDIR}/dynamic-layers/meta-security/*/*/*.bb \
 "
+# List of known non-reproducible package of the meta-gnome layer
+# Please keep this list sorted
+OEQA_REPRODUCIBLE_EXCLUDED_PACKAGES += " \
+    geary \
+    geary-dbg \
+    gegl-dev \
+    gimp \
+    gimp-dbg \
+    gnome-terminal-src \
+    grilo-src \
+    gtk-vnc-src \
+    ibus \
+"
diff --git a/meta-gnome/dynamic-layers/meta-security/recipes-gnome/gnome-remote-desktop/gnome-remote-desktop_46.2.bb b/meta-gnome/dynamic-layers/meta-security/recipes-gnome/gnome-remote-desktop/gnome-remote-desktop_48.0.bb
index 59ae9383db..a80b101a6e 100644
--- a/meta-gnome/dynamic-layers/meta-security/recipes-gnome/gnome-remote-desktop/gnome-remote-desktop_46.2.bb
+++ b/meta-gnome/dynamic-layers/meta-security/recipes-gnome/gnome-remote-desktop/gnome-remote-desktop_48.0.bb
@@ -8,7 +8,7 @@ inherit gnomebase gettext gsettings features_check useradd
 REQUIRED_DISTRO_FEATURES = "opengl polkit"
-SRC_URI[archive.sha256sum] = "97443eaffe4b1a69626886a41d25cbeb2c148d3fed43d92115c1b7d20d5238ab"
+SRC_URI[archive.sha256sum] = "038c42e48fe1d890849bec5d567566c152bd6d7f463eadeec59b1eae8fbb32a0"
 DEPENDS = " \
    asciidoc-native \
@@ -33,18 +33,23 @@ PACKAGECONFIG ??= " \
 PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,pipewire-native wireplumber-native dbus-native"
 PACKAGECONFIG[vnc] = "-Dvnc=true,-Dvnc=false,libvncserver"
-PACKAGECONFIG[rdp] = "-Drdp=true,-Drdp=false,freerdp3 fuse3 libxkbcommon"
+PACKAGECONFIG[rdp] = "-Drdp=true,-Drdp=false,freerdp3 fuse3 libxkbcommon shaderc-native"
 PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd"
-USERADD_PACKAGES = "${PN}"
-USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd"
 do_install:append() {
-    if [ -d ${D}${datadir}/polkit-1/rules.d ]; then
+        install -d ${D}${sysconfdir}/tmpfiles.d
-        chmod 700 ${D}${datadir}/polkit-1/rules.d
+        echo "d ${localstatedir}/lib/gnome-remote-desktop 700 gnome-remote-desktop gnome-remote-desktop - -" > ${D}${sysconfdir}/tmpfiles.d/gnome-remote-desktop.conf
-        chown polkitd:root ${D}${datadir}/polkit-1/rules.d
-    fi
 }
+USERADD_PACKAGES = "${PN}"
+USERADD_PARAM:${PN} = " \
+        --system \
+        --no-create-home \
+        --user-group \
+        --home-dir ${localstatedir}/lib/gnome-remote-desktop \
+        --shell /sbin/nologin \
+        gnome-remote-desktop \
+"
 PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
 FILES:${PN} += "${systemd_user_unitdir} ${systemd_system_unitdir} ${datadir} ${libdir}/sysusers.d ${libdir}/tmpfiles.d"
diff --git a/meta-gnome/dynamic-layers/meta-virtualization/recipes-gnome/gnome-boxes/gnome-boxes_46.1.bb b/meta-gnome/dynamic-layers/meta-virtualization/recipes-gnome/gnome-boxes/gnome-boxes_48.0.bb
index 6272065de6..41f576bcab 100644
--- a/meta-gnome/dynamic-layers/meta-virtualization/recipes-gnome/gnome-boxes/gnome-boxes_46.1.bb
+++ b/meta-gnome/dynamic-layers/meta-virtualization/recipes-gnome/gnome-boxes/gnome-boxes_48.0.bb
@@ -5,11 +5,14 @@ LIC_FILES_CHKSUM = "file://copyright;md5=a65e9b0c9f78617732f09f68fc4ef79a"
 GNOMEBASEBUILDCLASS = "meson"
-REQUIRED_DISTRO_FEATURES += "gobject-introspection-data"
+# reason for opengl: spice-gtk requires opengl
+REQUIRED_DISTRO_FEATURES += "gobject-introspection-data opengl"
 DEPENDS = " \
+  appstream-native \
  glib-2.0 \
  desktop-file-utils-native \
+  itstool-native \
  libarchive \
  libgudev \
  libhandy \
@@ -20,7 +23,7 @@ DEPENDS = " \
  libvirt-glib \
  mtools \
  spice-gtk \
-  tracker \
+  tinysparql \
  webkitgtk3 \
  appstream-glib-native \
  spice-protocol \
@@ -31,13 +34,11 @@ RDEPENDS:${PN} = "glib-2.0-dev libvirt-virsh qemu-common qemu-system-x86-64 geni
 inherit gnomebase gsettings pkgconfig mime-xdg gtk-icon-cache gobject-introspection vala features_check
-SRC_URI[archive.sha256sum] = "900c177f6762640370a6634cf9e7d3cd8207e498367a8a667a6b731b04116036"
+SRC_URI[archive.sha256sum] = "d05f5f42568fafbf6d88771161b06ed5f739d43121278d418cae95c56e513ead"
 GIR_MESON_OPTION = ""
 VALA_MESON_OPTION = ""
-CFLAGS += "-Wno-int-conversion"
 FILES:${PN} += "${datadir}"
 INSANE_SKIP:${PN} = "dev-deps"
diff --git a/meta-gnome/files/static-passwd-meta-gnome b/meta-gnome/files/static-passwd-meta-gnome
index 4502d8bd10..03659d77f1 100644
--- a/meta-gnome/files/static-passwd-meta-gnome
+++ b/meta-gnome/files/static-passwd-meta-gnome
@@ -1 +1,3 @@
-gdm:x:680:nogroup::/:/bin/nologin
-\ No newline at end of file
+gdm:x:680:nogroup::/:/sbin/nologin
+gnome-remote-desktop:x:974:974::/var/lib/gnome-remote-desktop:/sbin/nologin
diff --git a/meta-gnome/recipes-connectivity/folks/folks_0.15.9.bb b/meta-gnome/recipes-connectivity/folks/folks_0.15.9.bb
index 899b8da261..0c6a39d492 100644
--- a/meta-gnome/recipes-connectivity/folks/folks_0.15.9.bb
+++ b/meta-gnome/recipes-connectivity/folks/folks_0.15.9.bb
@@ -19,7 +19,7 @@ PACKAGECONFIG[bluez] = "-Dbluez_backend=true,-Dbluez_backend=false,evolution-dat
 PACKAGECONFIG[ofono] = "-Deds_backend=true -Dofono_backend=true,-Dofono_backend=false,evolution-data-server"
 PACKAGECONFIG[telepathy] = "-Dtelepathy_backend=true,-Dtelepathy_backend=false,telepathy-glib dbus-glib"
 PACKAGECONFIG[import_tool] = "-Dimport_tool=true,-Dimport_tool=false,libxml2"
-PACKAGECONFIG[inspect_tool] = "-Dinspect_tool=true,-Dinspect_tool=false"
+PACKAGECONFIG[inspect_tool] = "-Dinspect_tool=true,-Dinspect_tool=false,readline"
 PACKAGECONFIG ??= ""
diff --git a/meta-gnome/recipes-connectivity/geary/geary/0001-application-client.vala-hardcode-some-paths.patch b/meta-gnome/recipes-connectivity/geary/geary/0001-application-client.vala-hardcode-some-paths.patch
new file mode 100644
index 0000000000..8162e50d9b
--- /dev/null
+++ b/meta-gnome/recipes-connectivity/geary/geary/0001-application-client.vala-hardcode-some-paths.patch
@@ -0,0 +1,40 @@
+From 98243ca43e40116c22f7b867e32ad27ffd314505 Mon Sep 17 00:00:00 2001
+From: Markus Volk <f_l_k@t-online.de>
+Date: Tue, 16 Jul 2024 07:30:09 +0200
+Subject: [PATCH] application-client.vala: hardcode some paths
+Otherwise the build values will be stored in the binary and used if geary was not installed
+https://gitlab.gnome.org/GNOME/geary/-/blob/main/src/client/application/application-client.vala?ref_type=heads#L798
+https://gitlab.gnome.org/GNOME/geary/-/blob/main/src/client/application/application-client.vala?ref_type=heads#L365
+This breaks reproducibility
+WARNING: geary-46.0-r0 do_package_qa: QA Issue: File /usr/lib/geary/libgeary-client-46.0.so in package geary contains reference to TMPDIR [buildpaths]
+WARNING: geary-46.0-r0 do_package_qa: QA Issue: File /usr/lib/geary/.debug/libgeary-client-46.0.so in package geary-dbg contains reference to TMPDIR [buildpaths]
+Upstream-Status: Inappropriate [oe-specific]
+Signed-off-by: Markus Volk <f_l_k@t-online.de>
+---
+ src/client/application/application-client.vala | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+diff --git a/src/client/application/application-client.vala b/src/client/application/application-client.vala
+index 51d0f632e..acc53a65f 100644
+--- a/src/client/application/application-client.vala
+++ b/src/client/application/application-client.vala
+@@ -39,9 +39,9 @@ public class Application.Client : Gtk.Application {
+ 
+     public const string VERSION = _VERSION;
+     public const string INSTALL_PREFIX = _INSTALL_PREFIX;
+-    public const string GSETTINGS_DIR = _GSETTINGS_DIR;
+-    public const string SOURCE_ROOT_DIR = _SOURCE_ROOT_DIR;
+-    public const string BUILD_ROOT_DIR = _BUILD_ROOT_DIR;
+    public const string GSETTINGS_DIR = "/usr/share/applications";
+    public const string SOURCE_ROOT_DIR = "/usr/src";
+    public const string BUILD_ROOT_DIR = "/usr/src";
+ 
+     // keep these in sync with meson_options.txt
+     public const string PROFILE_RELEASE = "release";
+-- 
+2.45.2
diff --git a/meta-gnome/recipes-connectivity/geary/geary/0001-meson-Do-not-check-for-iso-xml-files-during-build.patch b/meta-gnome/recipes-connectivity/geary/geary/0001-meson-Do-not-check-for-iso-xml-files-during-build.patch
new file mode 100644
index 0000000000..ecab7155e6
--- /dev/null
+++ b/meta-gnome/recipes-connectivity/geary/geary/0001-meson-Do-not-check-for-iso-xml-files-during-build.patch
@@ -0,0 +1,28 @@
+From 474cd5a9d22ef9f25c37194d3c8ce1bc4d18102d Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 22 Nov 2024 00:44:49 -0800
+Subject: [PATCH] meson: Do not check for iso xml files during build
+These files are needed during runtime and may exist in a different
+path ( staging area ) when cross-compiled, therefore its not completely
+valid to check for these files to exist during build-time
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+diff --git a/meson.build b/meson.build
+index 87261baee..032629f5f 100644
+--- a/meson.build
+++ b/meson.build
+@@ -219,8 +219,6 @@ if iso_3166_xml == ''
+   iso_3166_xml = iso_codes_dir / 'iso_3166.xml'
+ endif
+ 
+-files(iso_639_xml, iso_3166_xml) # Check to make sure these exist
+-
+ # Post-install script
+ gnome.post_install(
+   gtk_update_icon_cache: true,
diff --git a/meta-gnome/recipes-connectivity/geary/geary/0001-meson-Use-PKG_CONFIG_SYSROOT_DIR-when-using-pkg-conf.patch b/meta-gnome/recipes-connectivity/geary/geary/0001-meson-Use-PKG_CONFIG_SYSROOT_DIR-when-using-pkg-conf.patch
deleted file mode 100644
index 1e0640a666..0000000000
--- a/meta-gnome/recipes-connectivity/geary/geary/0001-meson-Use-PKG_CONFIG_SYSROOT_DIR-when-using-pkg-conf.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From a300be5877f35379bb569313eec901bda9c8d762 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 30 Apr 2023 22:08:39 -0700
-Subject: [PATCH] meson: Use PKG_CONFIG_SYSROOT_DIR when using pkg-config
-OE cross-builds and absolute paths found by pkg-config points to
-non-sysroot'ed locations which are not correct as they point into native
-sysroot from build machine which is incorrect.
-Upstream-Status: Inappropriate [OE-specific]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- meson.build | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-diff --git a/meson.build b/meson.build
-index d563dd08..9b72aeb4 100644
--- a/meson.build
-+++ b/meson.build
-@@ -38,6 +38,9 @@ metadata_dir = meson.project_source_root() / 'bindings'/ 'metadata'
- po_dir = meson.project_source_root() / 'po'
- vapi_dir = meson.project_source_root() / 'bindings' / 'vapi'
- 
-+# pkg-config sysroot location
-+pkgconf_sysroot = run_command('python3', '-c', 'import os; print(os.environ.get("PKG_CONFIG_SYSROOT_DIR"))').stdout().strip()
-+
- # Compiler configuration
- add_project_arguments([
-     # Make sure Meson can find custom VAPIs
-@@ -120,7 +123,7 @@ icu_uc = declare_dependency(
- if libunwind_dep.found()
-   # We need to add native lib to the search path for these so Flatpak
-   # builds can find it.
-  unwind_lib = libunwind_dep.get_variable(pkgconfig: 'libdir')
-+  unwind_lib = pkgconf_sysroot + libunwind_dep.get_variable(pkgconfig: 'libdir')
-   libunwind = declare_dependency(
-      dependencies: [
-        valac.find_library('libunwind', dirs: [vapi_dir, unwind_lib]),
-@@ -207,8 +210,7 @@ vala_unit_proj = subproject(
- vala_unit_dep = vala_unit_proj.get_variable('vala_unit_dep')
- 
- # Language detection
-
-iso_codes_dir = iso_codes.get_variable(pkgconfig: 'prefix')/'share'/'xml'/'iso-codes'
-+iso_codes_dir = pkgconf_sysroot + iso_codes.get_variable(pkgconfig: 'prefix')/'share'/'xml'/'iso-codes'
- 
- iso_639_xml = get_option('iso_639_xml')
- if iso_639_xml == ''
-- 
-2.40.1
diff --git a/meta-gnome/recipes-connectivity/geary/geary_44.1.bb b/meta-gnome/recipes-connectivity/geary/geary_46.0.bb
index decae6b2c7..2012534993 100644
--- a/meta-gnome/recipes-connectivity/geary/geary_44.1.bb
+++ b/meta-gnome/recipes-connectivity/geary/geary_46.0.bb
@@ -18,11 +18,13 @@ DEPENDS = " \
    gtk+3 \
    icu \
    iso-codes \
+    itstool-native \
    json-glib \
    libhandy \
    libical \
-    libpeas \
+    libpeas-1 \
    libsecret \
+    libsoup \
    libstemmer \
    libxml2 \
    sqlite3 \
@@ -31,31 +33,30 @@ DEPENDS = " \
 RDEPENDS:${PN} = "gnome-keyring"
-inherit meson pkgconfig mime-xdg gtk-icon-cache gobject-introspection vala features_check
+inherit meson pkgconfig mime-xdg gsettings gtk-icon-cache gobject-introspection vala features_check
 SRC_URI = " \
        git://github.com/GNOME/geary.git;nobranch=1;protocol=https \
-        file://0001-meson-Use-PKG_CONFIG_SYSROOT_DIR-when-using-pkg-conf.patch \
+        file://0001-application-client.vala-hardcode-some-paths.patch \
+        file://0001-meson-Do-not-check-for-iso-xml-files-during-build.patch \
 "
-S = "${WORKDIR}/git"
+SRCREV = "46e93c0c0dafc381e8a308b1befb07e908121722"
-SRCREV = "37c378a563d5b1c269d57c34671edc940d1cd180"
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
 REQUIRED_DISTRO_FEATURES = "gobject-introspection-data opengl"
 GIR_MESON_OPTION = ""
-EXTRA_OEMESON = "-Dprofile=release"
+EXTRA_OEMESON = "-Dprofile=release \
+                 -Diso_639_xml=${datadir}/xml/iso-codes/iso_639.xml \
+                 -Diso_3166_xml=${datadir}/xml/iso-codes/iso_3166.xml \
+                 "
 PACKAGECONFIG[libunwind] = "-Dlibunwind=enabled,-Dlibunwind=disabled,libunwind"
 PACKAGECONFIG[tnef] = "-Dtnef=enabled,-Dtnef=disabled,libytnef"
 PACKAGECONFIG[valadoc] = "-Dvaladoc=enabled,-Dvaladoc=disabled"
 PACKAGECONFIG ??= ""
-# rfc822/rfc822-message.c:2097:12: error: incompatible pointer to integer conversion returning 'void *' from a function with result type 'gboolean' (aka 'int') [-Wint-conversion]
-#|                                 return NULL;
-#|                                        ^~~~
-CFLAGS:append:toolchain-clang = " -Wno-error=int-conversion"
 FILES:${PN} += "${datadir}"
diff --git a/meta-gnome/recipes-connectivity/gtk-vnc/gtk-vnc_1.3.1.bb b/meta-gnome/recipes-connectivity/gtk-vnc/gtk-vnc_1.5.0.bb
index 8bd37f754c..e9cb53c97c 100644
--- a/meta-gnome/recipes-connectivity/gtk-vnc/gtk-vnc_1.3.1.bb
+++ b/meta-gnome/recipes-connectivity/gtk-vnc/gtk-vnc_1.5.0.bb
@@ -27,4 +27,4 @@ inherit pkgconfig gnomebase gettext gobject-introspection vala features_check
 PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
-SRC_URI[archive.sha256sum] = "512763ac4e0559d0158b6682ca5dd1a3bd633f082f5e4349d7158e6b5f80f1ce"
+SRC_URI[archive.sha256sum] = "c0beb4747528ad931da43acc567c6a0190f7fc624465571ed9ccece02c34dd23"
diff --git a/meta-gnome/recipes-extended/gparted/gparted_1.6.0.bb b/meta-gnome/recipes-extended/gparted/gparted_1.7.0.bb
index ab2890679a..ec221a140f 100644
--- a/meta-gnome/recipes-extended/gparted/gparted_1.6.0.bb
+++ b/meta-gnome/recipes-extended/gparted/gparted_1.7.0.bb
@@ -11,7 +11,7 @@ SRC_URI = " \
    ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BPN}-${PV}/${BPN}-${PV}.tar.gz \
    ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'file://0001-Install-polkit-action-unconditionally-executable-pke.patch', '', d)} \
 "
-SRC_URI[sha256sum] = "9b9f51b3ce494ddcb59a55e1ae6679c09436604e331dbf5a536d60ded6c6ea5b"
+SRC_URI[sha256sum] = "84ae3b9973e443a2175f07aa0dc2aceeadb1501e0f8953cec83b0ec3347b7d52"
 UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/gparted/files/gparted/"
 UPSTREAM_CHECK_REGEX = "gparted-(?P<pver>\d+\.(\d+)+(\.\d+)+)"
diff --git a/meta-gnome/recipes-extended/polkit-gnome/polkit-gnome_0.105.bb b/meta-gnome/recipes-extended/polkit-gnome/polkit-gnome_0.105.bb
index af1a7d8673..032532456d 100644
--- a/meta-gnome/recipes-extended/polkit-gnome/polkit-gnome_0.105.bb
+++ b/meta-gnome/recipes-extended/polkit-gnome/polkit-gnome_0.105.bb
@@ -19,7 +19,6 @@ SRC_URI = " \
    file://polkit-gnome-authentication-agent-1.desktop \
 "
 SRCREV = "a0763a246a81188f60b0f9810143e49224dc752f"
-S = "${WORKDIR}/git"
 do_install:append() {
diff --git a/meta-gnome/recipes-gimp/babl/babl_0.1.108.bb b/meta-gnome/recipes-gimp/babl/babl_0.1.114.bb
index e0685f781d..172517517e 100644
--- a/meta-gnome/recipes-gimp/babl/babl_0.1.108.bb
+++ b/meta-gnome/recipes-gimp/babl/babl_0.1.114.bb
@@ -10,7 +10,7 @@ inherit setuptools3 gnomebase gobject-introspection vala
 DEPENDS += "lcms"
 SRC_URI = "https://download.gimp.org/pub/${BPN}/0.1/${BP}.tar.xz"
-SRC_URI[sha256sum] = "26defe9deaab7ac4d0e076cab49c2a0d6ebd0df0c31fd209925a5f07edee1475"
+SRC_URI[sha256sum] = "bcbb7786c1e447703db3bc7fa34d62d0d2d117b22f04d8834c7b2d5ded456487"
 FILES:${PN} += "${libdir}/${BPN}-${@gnome_verdir("${PV}")}"
diff --git a/meta-gnome/recipes-gimp/gegl/gegl_0.4.48.bb b/meta-gnome/recipes-gimp/gegl/gegl_0.4.62.bb
index 34e001a5f7..9dd9e31131 100644
--- a/meta-gnome/recipes-gimp/gegl/gegl_0.4.48.bb
+++ b/meta-gnome/recipes-gimp/gegl/gegl_0.4.62.bb
@@ -11,6 +11,8 @@ DEPENDS = " \
    zlib \
    \
    json-glib \
+    libpng \
+    jpeg \
 "
 DEPENDS:append:toolchain-clang  = " openmp"
@@ -26,26 +28,24 @@ ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
 SHPV = "${@gnome_verdir("${PV}")}"
 SRC_URI = "https://download.gimp.org/pub/${BPN}/${SHPV}/${BP}.tar.xz"
-SRC_URI[sha256sum] = "418c26d94be8805d7d98f6de0c6825ca26bd74fcacb6c188da47533d9ee28247"
+SRC_URI[sha256sum] = "5887576371ebf1d9e90797d10e4b9a7f1658228d4827583e79e1db3d94505c6c"
-PACKAGECONFIG ??= "gexiv2 jpeg libpng libraw librsvg pango poppler sdl2"
+PACKAGECONFIG ??= "gexiv2 libraw librsvg pango poppler sdl2"
-PACKAGECONFIG:class-native = "libpng librsvg"
+PACKAGECONFIG:class-native = "librsvg"
 PACKAGECONFIG[jasper] = "-Djasper=enabled,-Djasper=disabled,jasper"
 PACKAGECONFIG[gexiv2] = "-Dgexiv2=enabled,-Dgexiv2=disabled,gexiv2"
 PACKAGECONFIG[graphviz] = "-Dgraphviz=enabled,-Dgraphviz=disabled,graphviz"
-PACKAGECONFIG[jpeg] = "-Dlibjpeg=enabled,-Dlibjpeg=disabled,jpeg"
 PACKAGECONFIG[lcms] = "-Dlcms=enabled,-Dlcms=disabled,lcms"
 PACKAGECONFIG[libav] = "-Dlibav=enabled,-Dlibav=disabled,libav"
-PACKAGECONFIG[libpng] = "-Dlibpng=enabled,-Dlibpng=disabled,libpng"
 PACKAGECONFIG[libraw] = "-Dlibraw=enabled,-Dlibraw=disabled,libraw"
 PACKAGECONFIG[librsvg] = "-Dlibrsvg=enabled,-Dlibrsvg=disabled,librsvg"
 PACKAGECONFIG[pango] = "-Dpango=enabled -Dpangocairo=enabled,-Dpango=disabled -Dpangocairo=disabled,pango"
 PACKAGECONFIG[poppler] = "-Dpoppler=enabled,-Dpoppler=disabled,poppler"
 PACKAGECONFIG[sdl] = "-Dsdl1=enabled,-Dsdl1=disabled,libsdl"
-PACKAGECONFIG[sdl2] = "-Dsdl2=enabled,-Dsdl2=disabled,libsdl2"
+PACKAGECONFIG[sdl2] = "-Dsdl2=enabled,-Dsdl2=disabled,virtual/libsdl2"
 PACKAGECONFIG[tiff] = "-Dlibtiff=enabled,-Dlibtiff=disabled,tiff"
-PACKAGECONFIG[webp] = "-Dwebp=enabled,-Dwebp=disabled,webp"
+PACKAGECONFIG[webp] = "-Dwebp=enabled,-Dwebp=disabled,libwebp"
 # There are a couple of non-symlink .so files installed into libdir, which need to go into main package
 FILES:${PN} += " \
diff --git a/meta-gnome/recipes-gimp/gimp/gimp/0001-configure-Keep-first-line-of-compiler-version-string.patch b/meta-gnome/recipes-gimp/gimp/gimp/0001-configure-Keep-first-line-of-compiler-version-string.patch
deleted file mode 100644
index 618b4cc7a7..0000000000
--- a/meta-gnome/recipes-gimp/gimp/gimp/0001-configure-Keep-first-line-of-compiler-version-string.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 5711ccfab40e304ced7f5be39a4083e3fcecff91 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 24 May 2023 22:22:41 -0700
-Subject: [PATCH] configure: Keep first line of compiler version string
-Full output of cc -v may contain additional information which could
-contain build path information, which is unnessasary
-Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gimp/-/merge_requests/926]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/configure.ac b/configure.ac
-index c25415d..68707a0 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -599,7 +599,7 @@ fi
- for CC_VERSION_OPT in $CC_VERSION_OPTS; do
-   # We run $CC, and escape and format its output, in a single step,
-   # since some shells expand escape sequences in "echo" arguments.
-  CC_VERSION="`$CC $CC_VERSION_OPT 2>&1 | sed -e 's/\\\\/\\\\\\\\\\\\\\\\/g;s/^/\\\\t/;s/$/\\\\n/' | tr -d '\n'`"
-+  CC_VERSION="`$CC $CC_VERSION_OPT 2>&1 | head -1 | sed -e 's/\\\\/\\\\\\\\\\\\\\\\/g;s/^/\\\\t/;s/$/\\\\n/' | tr -d '\n'`"
-   if test $? -eq 0; then
-     break
-   fi
-- 
-2.40.1
diff --git a/meta-gnome/recipes-gimp/gimp/gimp/0001-file-tiff-load-fix-mismatching-variable-type.patch b/meta-gnome/recipes-gimp/gimp/gimp/0001-file-tiff-load-fix-mismatching-variable-type.patch
deleted file mode 100644
index 13b3dda144..0000000000
--- a/meta-gnome/recipes-gimp/gimp/gimp/0001-file-tiff-load-fix-mismatching-variable-type.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From a2458f1528e5733574bb26ff5452b1329116e6db Mon Sep 17 00:00:00 2001
-From: Simon Budig <simon@budig.de>
-Date: Sat, 20 May 2023 18:40:41 +0200
-Subject: [PATCH] file-tiff-load: fix mismatching variable type
-Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gimp/-/commit/a2458f1528e5733574bb26ff5452b1329116e6db]
-Signed-off-by: Khem Raj <raj.khem@gmai.com>
---
- plug-ins/file-tiff/file-tiff-load.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
--- a/plug-ins/file-tiff/file-tiff-load.c
-+++ b/plug-ins/file-tiff/file-tiff-load.c
-@@ -1301,8 +1301,8 @@ load_image (GFile        *file,
- 
-       /* any resolution info in the file? */
-       {
-        gfloat   xres = 72.0;
-        gfloat   yres = 72.0;
-+        gdouble   xres = 72.0;
-+        gdouble   yres = 72.0;
-         gushort  read_unit;
-         GimpUnit unit = GIMP_UNIT_PIXEL; /* invalid unit */
- 
diff --git a/meta-gnome/recipes-gimp/gimp/gimp/0001-gimp-cross-compile-fix-for-bz2.patch b/meta-gnome/recipes-gimp/gimp/gimp/0001-gimp-cross-compile-fix-for-bz2.patch
new file mode 100644
index 0000000000..721225c8b3
--- /dev/null
+++ b/meta-gnome/recipes-gimp/gimp/gimp/0001-gimp-cross-compile-fix-for-bz2.patch
@@ -0,0 +1,30 @@
+From a7e40e19d17404cf5ec4135fc1becd5a90f5e1e1 Mon Sep 17 00:00:00 2001
+From: Markus Volk <f_l_k@t-online.de>
+Date: Wed, 25 Dec 2024 07:27:04 +0100
+Subject: [PATCH] gimp: cross-compile fix for bz2
+autotools bzip2 build does not create pkgconfig files so looking for the dependency fails.
+Signed-off-by: Markus Volk <f_l_k@t-online.de>
+Upstream-Status: Inappropriate [can probably be removed once bzip2 is built with meson or cmake]
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/meson.build b/meson.build
+index 4e48f8c64c..d5dce47015 100644
+--- a/meson.build
+++ b/meson.build
+@@ -765,7 +765,7 @@ zlib = dependency('zlib')
+ MIMEtypes += 'image/x-psp'
+ 
+ # Compiler-provided headers can't be found in crossroads environment
+-if not meson.is_cross_build()
+if true
+   bz2 = cc.find_library('bz2')
+ else
+   bz2 = dependency('bzip2')
+-- 
+2.47.1
diff --git a/meta-gnome/recipes-gimp/gimp/gimp/0001-libtool-Do-not-add-build-time-library-paths-to-LD_LI.patch b/meta-gnome/recipes-gimp/gimp/gimp/0001-libtool-Do-not-add-build-time-library-paths-to-LD_LI.patch
deleted file mode 100644
index cec0055284..0000000000
--- a/meta-gnome/recipes-gimp/gimp/gimp/0001-libtool-Do-not-add-build-time-library-paths-to-LD_LI.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From c720df90dfe3a3e92e34bfb36a04cc792064a501 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 24 May 2023 22:39:02 -0700
-Subject: [PATCH] libtool: Do not add build time library paths to
- LD_LIBRARY_PATH
-This does not serve much purpose on cross builds as it will add build
-time paths which are only useful when trying to run these tools from
-build area but when they are cross built this is not possible to run
-them like this.
-Upstream-Status: Inappropriate [Cross-compile specific]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- ltmain.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/ltmain.sh b/ltmain.sh
-index 134902c..068d74a 100644
--- a/ltmain.sh
-+++ b/ltmain.sh
-@@ -5748,7 +5748,7 @@ func_exec_program ()
-        if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-          $ECHO "\
-     # Add our own library path to $shlibpath_var
-    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
-+    $shlibpath_var=\"$shlibpath_var\"
- 
-     # Some systems cannot cope with colon-terminated $shlibpath_var
-     # The second colon is a workaround for a bug in BeOS R4 sed
-- 
-2.40.1
diff --git a/meta-gnome/recipes-gimp/gimp/gimp/0001-meson.build-dont-check-for-lgi.patch b/meta-gnome/recipes-gimp/gimp/gimp/0001-meson.build-dont-check-for-lgi.patch
new file mode 100644
index 0000000000..63a9159a43
--- /dev/null
+++ b/meta-gnome/recipes-gimp/gimp/gimp/0001-meson.build-dont-check-for-lgi.patch
@@ -0,0 +1,35 @@
+From e56a6330f1e29e489601ea3e7cb31bfd2ebb787a Mon Sep 17 00:00:00 2001
+From: Markus Volk <f_l_k@t-online.de>
+Date: Thu, 27 Mar 2025 21:02:22 +0100
+Subject: [PATCH] meson.build: dont check for lgi
+Checking if host can run lgi is pointless for cross-compile
+Set to be always true because we ensure to install lgi via PACKAGECONFIG
+Signed-off-by: Markus Volk <f_l_k@t-online.de>
+Upstream-Status: Inappropriate [oe-specific]
+---
+ meson.build | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+diff --git a/meson.build b/meson.build
+index c91e8fc97d..efbc2d8175 100644
+--- a/meson.build
+++ b/meson.build
+@@ -1235,11 +1235,7 @@ if have_lua
+       endif
+ 
+       if is_supported_lua
+-        have_lua_lgi = run_command(lua, '-e',
+-                                   '''
+-                                   local lgi = require 'lgi'
+-                                   ''',
+-                                   check: false).returncode() == 0
+        have_lua_lgi = true
+       endif
+ 
+       if have_lua_lgi
+-- 
+2.49.0
diff --git a/meta-gnome/recipes-gimp/gimp/gimp/0001-meson.build-require-iso-codes-native.patch b/meta-gnome/recipes-gimp/gimp/gimp/0001-meson.build-require-iso-codes-native.patch
new file mode 100644
index 0000000000..ffb8ef29df
--- /dev/null
+++ b/meta-gnome/recipes-gimp/gimp/gimp/0001-meson.build-require-iso-codes-native.patch
@@ -0,0 +1,35 @@
+From 8ccd12d6ec3330e9646ae9db6fd491226d516dc3 Mon Sep 17 00:00:00 2001
+From: Markus Volk <f_l_k@t-online.de>
+Date: Fri, 28 Mar 2025 01:33:00 +0100
+Subject: [PATCH] meson.build: require iso-codes-native
+This fixes:
+FAILED: app/widgets/gimplanguagestore-data.h
+/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux-musl/gimp/3.0.2/build/tools/gen-languages
+gimp_language_store_parser_init: 0.006277 seconds
+ERROR: parse_iso_codes: error parsing '/usr/share/xml/iso-codes/iso_639_3.xml': No such file or directory
+Upstream-Status: Denied [https://gitlab.gnome.org/GNOME/gimp/-/merge_requests/2185]
+Upstream argues that iso-codes locale (.mo files) are required on the target
+Signed-off-by: Markus Volk <f_l_k@t-online.de>
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/meson.build b/meson.build
+index efbc2d8175..fd050f4d3c 100644
+--- a/meson.build
+++ b/meson.build
+@@ -1135,7 +1135,7 @@ endif
+ ################################################################################
+ # ISO codes
+ 
+-isocodes = dependency('iso-codes', required: false)
+isocodes = dependency('iso-codes', required: false, native: true)
+ if isocodes.found()
+   isocodes_prefix = isocodes.get_variable(pkgconfig: 'prefix')
+   isocodes_location = isocodes_prefix / 'share' / 'xml' / 'iso-codes'
+-- 
+2.49.0
diff --git a/meta-gnome/recipes-gimp/gimp/gimp/0001-metadata-shut-up-a-weird-warning.patch b/meta-gnome/recipes-gimp/gimp/gimp/0001-metadata-shut-up-a-weird-warning.patch
deleted file mode 100644
index 4f04ac8250..0000000000
--- a/meta-gnome/recipes-gimp/gimp/gimp/0001-metadata-shut-up-a-weird-warning.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 51311f913d9f417d121f59b83d560c7b4b853d1c Mon Sep 17 00:00:00 2001
-From: Simon Budig <simon@budig.de>
-Date: Sat, 20 May 2023 22:25:40 +0200
-Subject: [PATCH] metadata: shut up a weird warning
-Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gimp/-/commit/51311f913d9f417d121f59b83d560c7b4b853d1c]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- plug-ins/metadata/metadata-editor.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/plug-ins/metadata/metadata-editor.c
-+++ b/plug-ins/metadata/metadata-editor.c
-@@ -2140,7 +2140,7 @@ metadata_dialog_editor_set_metadata (GEx
-                             }
-                           else
-                             {
-                              if (! g_strv_contains (values, equiv_values[evi]))
-+                              if (! g_strv_contains ((const gchar * const *) values, equiv_values[evi]))
-                                 {
-                                   gchar *tmpvalue;
- 
diff --git a/meta-gnome/recipes-gimp/gimp/gimp/0002-meson.build-reproducibility-fix.patch b/meta-gnome/recipes-gimp/gimp/gimp/0002-meson.build-reproducibility-fix.patch
new file mode 100644
index 0000000000..532715d588
--- /dev/null
+++ b/meta-gnome/recipes-gimp/gimp/gimp/0002-meson.build-reproducibility-fix.patch
@@ -0,0 +1,56 @@
+From bf19c5687703769e406a8086036d4ed6421c33cb Mon Sep 17 00:00:00 2001
+From: Markus Volk <f_l_k@t-online.de>
+Date: Mon, 13 Jan 2025 10:04:33 +0100
+Subject: [PATCH] meson.build: reproducibility fix
+Signed-off-by: Markus Volk <f_l_k@t-online.de>
+Upstream-Status: Inappropriate [oe-specific]
+---
+ meson.build | 28 ++++++++++++++--------------
+ 1 file changed, 14 insertions(+), 14 deletions(-)
+diff --git a/meson.build b/meson.build
+index 97cd621780..e47180db87 100644
+--- a/meson.build
+++ b/meson.build
+@@ -1599,23 +1599,23 @@ conf.set('HAVE_FUNC_ATTRIBUTE_DESTRUCTOR',
+ conf.set_quoted('CC',             cc.get_id())
+ 
+ cc_version=''
+-if cc.get_id() == 'gcc' or cc.get_id() == 'clang'
+-  cc_cmd = run_command(cc, '-v', check: false)
+#if cc.get_id() == 'gcc' or cc.get_id() == 'clang'
+#  cc_cmd = run_command(cc, '-v', check: false)
+   # Note: the call might actually fail when using ccache.
+   # See: https://github.com/mesonbuild/meson/issues/6174
+-  if cc_cmd.returncode() == 0
+-    cc_version = cc_cmd.stdout() + cc_cmd.stderr()
+-  endif
+-else
+#  if cc_cmd.returncode() == 0
+#    cc_version = cc_cmd.stdout() + cc_cmd.stderr()
+#  endif
+#else
+   # Various compilers have various options. Try most common ones. This
+   # list of options comes from autotools checks.
+-  foreach arg : [ '--version', '-v', '-V', '-qversion' ]
+-    cc_cmd = run_command(cc, arg, check: false)
+-    if cc_cmd.returncode() == 0
+-      cc_version = cc_cmd.stdout()
+-    endif
+-  endforeach
+-endif
+#  foreach arg : [ '--version', '-v', '-V', '-qversion' ]
+#    cc_cmd = run_command(cc, arg, check: false)
+#    if cc_cmd.returncode() == 0
+#      cc_version = cc_cmd.stdout()
+#    endif
+#  endforeach
+#endif
+ if cc_version == ''
+   # We didn't manage to get a meaningful verbose version from the
+   # compiler. Just save its name and version.
+-- 
+2.47.1
diff --git a/meta-gnome/recipes-gimp/gimp/gimp_2.10.38.bb b/meta-gnome/recipes-gimp/gimp/gimp_2.10.38.bb
deleted file mode 100644
index 833341f850..0000000000
--- a/meta-gnome/recipes-gimp/gimp/gimp_2.10.38.bb
+++ /dev/null
@@ -1,75 +0,0 @@
-SUMMARY = "The GIMP is the GNU Image Manipulation Program"
-HOMEPAGE = "http://www.gimp.org"
-SECTION = "x11/graphics"
-LICENSE = "GPL-3.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e"
-DEPENDS = " \
-    alsa-lib \
-    atk \
-    cairo \
-    fontconfig \
-    freetype \
-    gdk-pixbuf-native \
-    intltool-native \
-    libxslt-native \
-    gegl-native \
-    dbus-glib \
-    gtk+ \
-    babl \
-    gegl \
-    libmypaint \
-    mypaint-brushes-1.0 \
-    gexiv2 \
-    jpeg \
-    libmng \
-    libpng \
-    libexif \
-    tiff \
-    lcms \
-    poppler \
-    poppler-data \
-    jasper \
-    bzip2 \
-    libgudev \
-    libmng \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxmu libxpm', '', d)} \
-"
-DEPENDS:append:libc-musl = " libexecinfo"
-GNOMEBASEBUILDCLASS = "autotools"
-inherit features_check gnomebase gtk-icon-cache gtk-doc mime-xdg
-REQUIRED_DISTRO_FEATURES = "x11"
-SHPV = "${@gnome_verdir("${PV}")}"
-SRC_URI = "https://download.gimp.org/pub/${BPN}/v${SHPV}/${BP}.tar.bz2 \
-           file://0001-configure-Keep-first-line-of-compiler-version-string.patch \
-           file://0001-libtool-Do-not-add-build-time-library-paths-to-LD_LI.patch \
-           file://0001-file-tiff-load-fix-mismatching-variable-type.patch \
-           file://0001-metadata-shut-up-a-weird-warning.patch \
-           "
-SRC_URI[sha256sum] = "50a845eec11c8831fe8661707950f5b8446e35f30edfb9acf98f85c1133f856e"
-EXTRA_OECONF = "--disable-python \
-                --without-webkit \
-                --disable-check-update \
-                --without-wmf"
-EXTRA_OECONF += "${@oe.utils.conditional('SITEINFO_BITS', '32', ' --disable-vector-icons', '', d)}"
-do_configure:append() {
-    find ${B} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
-    find ${B} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g
-}
-do_compile:prepend() {
-    # Let native babl/gegl find their plugins
-    export BABL_PATH=`find ${STAGING_LIBDIR_NATIVE} -maxdepth 1 -name 'babl-*'`
-    export GEGL_PATH=`find ${STAGING_LIBDIR_NATIVE} -maxdepth 1 -name 'gegl-*'`
-}
-FILES:${PN}  += "${datadir}/metainfo"
-RDEPENDS:${PN} += "mypaint-brushes-1.0"
diff --git a/meta-gnome/recipes-gimp/gimp/gimp_3.0.4.bb b/meta-gnome/recipes-gimp/gimp/gimp_3.0.4.bb
new file mode 100644
index 0000000000..414f9c5203
--- /dev/null
+++ b/meta-gnome/recipes-gimp/gimp/gimp_3.0.4.bb
@@ -0,0 +1,136 @@
+SUMMARY = "The GIMP is the GNU Image Manipulation Program"
+HOMEPAGE = "http://www.gimp.org"
+SECTION = "graphics"
+LICENSE = "GPL-3.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e"
+DEPENDS = " \
+    appstream-glib \
+    atk \
+    babl \
+    bzip2 \
+    bison-native \
+    cairo \
+    fontconfig \
+    freetype \
+    gdk-pixbuf-native \
+    gegl \
+    gexiv2 \
+    glib-2.0 \
+    glib-2.0-native \
+    gtk+3 \
+    harfbuzz \
+    iso-codes-native \
+    jpeg \
+    json-glib \
+    lcms \
+    libarchive \
+    libexif \
+    libmypaint \
+    libpng \
+    librsvg \
+    librsvg-native \
+    libxmu \
+    libxslt-native \
+    mypaint-brushes-1.0 \
+    pango \
+    poppler \
+    poppler-data \
+    python3-pygobject-native \
+    tiff \
+    xz \
+    zlib \
+"
+DEPENDS:append:libc-musl = " libexecinfo"
+LDFLAGS:append:libc-musl = " -lexecinfo"
+inherit meson gtk-icon-cache mime-xdg pkgconfig gettext gobject-introspection vala
+GIR_MESON_OPTION = 'can-crosscompile-gir'
+VALA_MESON_OPTION = "vala"
+VALA_MESON_ENABLE_FLAG = "enabled"
+VALA_MESON_DISABLE_FLAG = "disabled"
+GIDOCGEN_MESON_OPTION = "gi-docgen"
+GIDOCGEN_MESON_ENABLE_FLAG = "enabled"
+GIDOCGEN_MESON_DISABLE_FLAG = "disabled"
+SRC_URI = "gitsm://gitlab.gnome.org/GNOME/gimp.git;protocol=https;branch=master"
+SRC_URI += "file://0001-gimp-cross-compile-fix-for-bz2.patch"
+SRC_URI += "file://0002-meson.build-reproducibility-fix.patch"
+SRC_URI += "file://0001-meson.build-dont-check-for-lgi.patch"
+SRC_URI += "file://0001-meson.build-require-iso-codes-native.patch"
+SRCREV = "c1901c5be644ab8dcaf779b1f383bf5370bc90c6"
+PACKAGECONFIG[aa] = "-Daa=enabled,-Daa=disabled,aalib"
+PACKAGECONFIG[alsa] = "-Dalsa=enabled,-Dalsa=disabled,alsa-lib"
+PACKAGECONFIG[appdata-test] = "-Dappdata-test=enabled,-Dappdata-test=disabled,appstream-native"
+PACKAGECONFIG[cairo-pdf] = "-Dcairo-pdf=enabled,-Dcairo-pdf=disabled"
+PACKAGECONFIG[check-update] = "-Dcheck-update=yes,-Dcheck-update=no"
+PACKAGECONFIG[ghostscript] = "-Dghostscript=enabled,-Dghostscript=disabled,ghostscript,ghostscript"
+PACKAGECONFIG[gudev] = "-Dgudev=enabled,-Dgudev=disabled,libgudev"
+PACKAGECONFIG[heif] = "-Dheif=enabled,-Dheif=disabled,libheif"
+PACKAGECONFIG[javascript] = "-Djavascript=enabled,-Djavascript=disabled,,gjs"
+PACKAGECONFIG[jpeg2000] = "-Djpeg2000=enabled,-Djpeg2000=disabled,jasper"
+PACKAGECONFIG[jpeg-xl] = "-Djpeg-xl=enabled,-Djpeg-xl=disabled,libjxl"
+PACKAGECONFIG[libunwind] = "-Dlibunwind=true,-Dlibunwind=false,libunwind"
+PACKAGECONFIG[libbacktrace] = "-Dlibbacktrace=true,-Dlibbacktrace=false,libbacktrace"
+PACKAGECONFIG[lua] = "-Dlua=true,-Dlua=false,,luajit lua-lgi"
+PACKAGECONFIG[mng] = "-Dmng=enabled,-Dmng=disabled,libmng"
+PACKAGECONFIG[openmp] = "-Dopenmp=enabled,-Dopenmp=disabled,gcc-runtime"
+PACKAGECONFIG[vector-icons] = "-Dvector-icons=true,-Dvector-icons=false,librsvg shared-mime-info"
+PACKAGECONFIG[webp] = "-Dwebp=enabled,-Dwebp=disabled,libwebp"
+PACKAGECONFIG[xcursor] = "-Dxcursor=enabled,-Dxcursor=disabled,libxcursor"
+PACKAGECONFIG[x11] = "-Dxpm=enabled,-Dxpm=disabled,libxpm libxext libxfixes"
+PACKAGECONFIG ?= " \
+    alsa \
+    cairo-pdf \
+    ghostscript \
+    gudev \
+    javascript \
+    jpeg2000 \
+    jpeg-xl \
+    lua \
+    mng \
+    webp \
+    ${@oe.utils.conditional('SITEINFO_BITS', '32', '', 'vector-icons', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcursor', '', d)} \
+"
+PACKAGECONFIG:remove:riscv32 = "lua"
+PACKAGECONFIG:remove:riscv64 = "lua"
+PACKAGECONFIG:remove:powerpc64 = "lua"
+PACKAGECONFIG:remove:powerpc64le = "lua"
+EXTRA_OEMESON += " \
+    -Dshmem-type=posix \
+    -Dlinux-input=enabled \
+    --buildtype release \
+    --cross-file=${WORKDIR}/meson-${PN}.cross \
+"
+do_write_config:append() {
+    cat >${WORKDIR}/meson-${PN}.cross <<EOF
+[binaries]
+gjs = '${bindir}/gjs'
+luajit = '${bindir}/luajit'
+EOF
+}
+do_configure:append () {
+    sed -i -e "s|build_by_default: true|build_by_default: false|" ${S}/gimp-data/images/meson.build
+}
+do_install:prepend() {
+    sed -i -e "s|${B}||" ${B}/app/widgets/gimplanguagestore-data.h
+    sed -i -e "s|${B}||" ${B}/plug-ins/file-bmp/huffman.h
+}
+FILES:${PN} += "${datadir}/metainfo"
+RDEPENDS:${PN} = "mypaint-brushes-1.0 glib-networking python3-pygobject"
+CVE_STATUS[CVE-2007-3741] = "not-applicable-platform: This only applies for Mandriva Linux"
diff --git a/meta-gnome/recipes-gimp/mypaint/libmypaint_git.bb b/meta-gnome/recipes-gimp/mypaint/libmypaint_git.bb
index d509aa3dd0..b64e91a765 100644
--- a/meta-gnome/recipes-gimp/mypaint/libmypaint_git.bb
+++ b/meta-gnome/recipes-gimp/mypaint/libmypaint_git.bb
@@ -16,11 +16,13 @@ SRC_URI = "git://github.com/mypaint/libmypaint.git;protocol=https;branch=libmypa
           file://0001-make-build-compatible-w.-autoconf-2.7.patch \
          "
 SRCREV = "2768251dacce3939136c839aeca413f4aa4241d0"
 PV = "1.6.1"
-S = "${WORKDIR}/git"
+EXTRA_AUTORECONF += "-I m4"
 do_configure:append() {
    # autogen uses python2 so generate headers ourselves
-    cd ${S}
+    (cd ${S} && python3 generate.py mypaint-brush-settings-gen.h brushsettings-gen.h)
-    python3 generate.py mypaint-brush-settings-gen.h brushsettings-gen.h
 }
diff --git a/meta-gnome/recipes-gimp/mypaint/mypaint-brushes-1.0_git.bb b/meta-gnome/recipes-gimp/mypaint/mypaint-brushes-1.0_git.bb
index ca3912da88..b6b8ff8c1f 100644
--- a/meta-gnome/recipes-gimp/mypaint/mypaint-brushes-1.0_git.bb
+++ b/meta-gnome/recipes-gimp/mypaint/mypaint-brushes-1.0_git.bb
@@ -7,6 +7,5 @@ inherit autotools allarch
 SRC_URI = "git://github.com/mypaint/mypaint-brushes.git;protocol=https;branch=v1.3.x"
 SRCREV = "8a0124ac0675103eae8fa41fad533851768ae1ce"
 PV = "1.3.1"
-S = "${WORKDIR}/git"
 FILES:${PN} += "${datadir}/mypaint-data"
diff --git a/meta-gnome/recipes-gnome/cheese/cheese/0001-libcheese-Add-GtkWidget-cast-to-avoid-an-incompatibl.patch b/meta-gnome/recipes-gnome/cheese/cheese/0001-libcheese-Add-GtkWidget-cast-to-avoid-an-incompatibl.patch
new file mode 100644
index 0000000000..8d2d413149
--- /dev/null
+++ b/meta-gnome/recipes-gnome/cheese/cheese/0001-libcheese-Add-GtkWidget-cast-to-avoid-an-incompatibl.patch
@@ -0,0 +1,29 @@
+From d8b8f27730cca948a5e5346b8ed2db0793bb16e7 Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Fri, 19 Jan 2024 21:31:33 +0100
+Subject: [PATCH] libcheese: Add GtkWidget cast to avoid an
+ incompatible-pointer-types error
+This is required for compilation with GCC 14.
+Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/cheese/-/merge_requests/70]
+---
+ libcheese/cheese-flash.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/libcheese/cheese-flash.c b/libcheese/cheese-flash.c
+index 59959dbd..e4023221 100644
+--- a/libcheese/cheese-flash.c
+++ b/libcheese/cheese-flash.c
+@@ -132,7 +132,7 @@ cheese_flash_set_property (GObject      *object,
+       GObject *parent;
+       parent = g_value_get_object (value);
+       if (object != NULL)
+-        priv->parent = g_object_ref (parent);
+        priv->parent = GTK_WIDGET (g_object_ref (parent));
+       else
+         priv->parent = NULL;
+     }
+-- 
+2.45.2
diff --git a/meta-gnome/recipes-gnome/cheese/cheese_44.1.bb b/meta-gnome/recipes-gnome/cheese/cheese_44.1.bb
new file mode 100644
index 0000000000..180f3f6319
--- /dev/null
+++ b/meta-gnome/recipes-gnome/cheese/cheese_44.1.bb
@@ -0,0 +1,26 @@
+SUMMARY = "Take photos and videos with your webcam, with fun graphical effects"
+SECTION = "x11/gnome"
+LICENSE = "GPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://COPYING;md5=a17cb0a873d252440acfdf9b3d0e7fbf"
+inherit gnomebase gobject-introspection vala itstool gtk-icon-cache gsettings gnome-help gtk-doc
+SRC_URI += "file://0001-libcheese-Add-GtkWidget-cast-to-avoid-an-incompatibl.patch"
+SRC_URI[archive.sha256sum] = "5f2185c4c99e54ddf2b8baf60c82819950e54952e132e8639875f3edcbf8f68e"
+DEPENDS += " \
+    clutter-1.0 \
+    clutter-gst-3.0 \
+    clutter-gtk-1.0 \
+    gnome-desktop \
+    libcanberra \
+    libxslt-native \
+"
+GTKDOC_MESON_OPTION = "gtk_doc"
+# Man page build wants to access sourceforge
+EXTRA_OEMESON += "-Dman=false"
+FILES:${PN} += "${datadir}"
diff --git a/meta-gnome/recipes-gnome/devilspie/devilspie2_0.44.bb b/meta-gnome/recipes-gnome/devilspie/devilspie2_0.44.bb
index 9e641daa5a..2bbf73dffc 100644
--- a/meta-gnome/recipes-gnome/devilspie/devilspie2_0.44.bb
+++ b/meta-gnome/recipes-gnome/devilspie/devilspie2_0.44.bb
@@ -15,7 +15,6 @@ SRC_URI = "git://github.com/dsalt/devilspie2;branch=master;protocol=https \
    file://devilspie2.desktop \
 "
-S = "${WORKDIR}/git"
 inherit features_check pkgconfig gettext
diff --git a/meta-gnome/recipes-gnome/eog/eog_45.3.bb b/meta-gnome/recipes-gnome/eog/eog_47.0.bb
index 00fe266698..a82cd60cc9 100644
--- a/meta-gnome/recipes-gnome/eog/eog_45.3.bb
+++ b/meta-gnome/recipes-gnome/eog/eog_47.0.bb
@@ -3,13 +3,14 @@ LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 DEPENDS = " \
+    itstool-native \
    librsvg \
    gnome-desktop \
    gsettings-desktop-schemas \
    gdk-pixbuf \
    gtk+3 \
    libhandy \
-    libpeas \
+    libpeas-1 \
    libportal \
    libexif \
    lcms \
@@ -21,7 +22,7 @@ inherit gnomebase pkgconfig gsettings gobject-introspection gettext mime-xdg fea
 # FIXME: whilst eog uses libpeas <2, g-i is needed. This can be removed when libpeas2 is used.
 REQUIRED_DISTRO_FEATURES = "opengl gobject-introspection-data"
-SRC_URI[archive.sha256sum] = "8650f662d4921d83a7904f6bb9ca245baf735f717b47fac5b37f0d90e5e891a8"
+SRC_URI[archive.sha256sum] = "db5edbf5224d75126a7b7d8ee4e9272a2f30a953331d5baf6d3f3c0ce0cbde66"
 GTKDOC_MESON_OPTION = "gtk_doc"
diff --git a/meta-gnome/recipes-gnome/evince/evince_46.3.bb b/meta-gnome/recipes-gnome/evince/evince_48.0.bb
index 47c0950b61..31345542f2 100644
--- a/meta-gnome/recipes-gnome/evince/evince_46.3.bb
+++ b/meta-gnome/recipes-gnome/evince/evince_48.0.bb
@@ -33,7 +33,7 @@ REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'open
 def gnome_verdir(v):
    return oe.utils.trim_version(v, 1)
-SRC_URI[archive.sha256sum] = "bc0d1d41b9d7ffc762e99d2abfafacbf745182f0b31d86db5eec8c67f5f3006b"
+SRC_URI[archive.sha256sum] = "cd2f658355fa9075fdf9e5b44aa0af3a7e0928c55614eb1042b36176cf451126"
 GTKDOC_MESON_OPTION = "gtk_doc"
@@ -46,8 +46,8 @@ RRECOMMENDS:${PN} = "adwaita-icon-theme"
 PACKAGES =+ "${PN}-nautilus-extension"
 do_install:prepend() {
-    sed -i -e 's|${B}/../${PN}-${PV}|${TARGET_DBGSRC_DIR}|g' ${B}/libview/ev-view-type-builtins.c
+    sed -i -e 's|${B}/../sources/${BP}|${TARGET_DBGSRC_DIR}|g' ${B}/libview/ev-view-type-builtins.c
-    sed -i -e 's|${B}/../${PN}-${PV}|${TARGET_DBGSRC_DIR}|g' ${B}/libdocument/ev-document-type-builtins.c
+    sed -i -e 's|${B}/../sources/${BP}|${TARGET_DBGSRC_DIR}|g' ${B}/libdocument/ev-document-type-builtins.c
 }
 FILES:${PN} += "${datadir}/dbus-1 \
diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb
index fc19253142..c3c4e3eae5 100644
--- a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb
+++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb
@@ -1,24 +1,24 @@
 require ${BPN}.inc
 DEPENDS = " \
-    ${BPN}-native gperf-native \
+    ${BPN}-native cairo gperf-native \
-    glib-2.0 json-glib gtk4 libxml2 icu \
+    glib-2.0 json-glib gtk+3 gtk4 libxml2 icu \
-    dbus db virtual/libiconv zlib libsoup-3.0 libical nss libsecret \
+    dbus db virtual/libiconv zlib libsoup nspr libical nss libsecret \
 "
-inherit pkgconfig gsettings gobject-introspection features_check gtk-doc gettext perlnative vala
+inherit pkgconfig gsettings gobject-introspection mime-xdg features_check gtk-doc gettext perlnative vala
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
 REQUIRED_DISTRO_FEATURES = "opengl"
-SRC_URI += " \
+SRC_URI += "file://0001-cmake-Do-not-export-CC-into-gir-compiler.patch \
-    file://0001-cmake-Do-not-export-CC-into-gir-compiler.patch \
+           file://0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch \
-    file://0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch \
+           file://0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch \
-    file://0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch \
+           file://0003-contact-Replace-the-Novell-sample-contact-with-somet.patch \
-    file://0003-contact-Replace-the-Novell-sample-contact-with-somet.patch \
+           file://0004-call-native-helpers.patch \
-    file://0004-call-native-helpers.patch \
+           file://0001-data-CMakeLists.txt-dont-create-automatic-google-log.patch \
-    file://iconv-detect.h \
+           file://iconv-detect.h \
-"
+           "
 LKSTRFTIME = "HAVE_LKSTRFTIME=ON"
 LKSTRFTIME:libc-musl = "HAVE_LKSTRFTIME=OFF"
@@ -42,7 +42,7 @@ EXTRA_OECMAKE:append:class-target = " -DG_IR_SCANNER=${STAGING_BINDIR}/g-ir-scan
 PACKAGECONFIG ?= "goa oauth"
 PACKAGECONFIG[canberra] = "-DENABLE_CANBERRA=ON,-DENABLE_CANBERRA=OFF,libcanberra"
-PACKAGECONFIG[oauth]    = "-DENABLE_OAUTH2_WEBKITGTK4=ON -DENABLE_OAUTH2_WEBKITGTK=OFF,-DENABLE_OAUTH2_WEBKITGTK4=OFF -DENABLE_OAUTH2_WEBKITGTK=OFF,webkitgtk json-glib"
+PACKAGECONFIG[oauth]    = "-DENABLE_OAUTH2_WEBKITGTK4=ON -DENABLE_OAUTH2_WEBKITGTK=ON,-DENABLE_OAUTH2_WEBKITGTK4=OFF -DENABLE_OAUTH2_WEBKITGTK=OFF,webkitgtk json-glib"
 PACKAGECONFIG[goa]    = "-DENABLE_GOA=ON,-DENABLE_GOA=OFF,gnome-online-accounts"
 PACKAGECONFIG[kerberos]    = "-DWITH_KRB5=ON,-DWITH_KRB5=OFF,krb5"
 # BROKEN: due missing pkg-config in openldap eds' cmake finds host-libs when
@@ -55,7 +55,7 @@ PACKAGECONFIG[weather] = "-DENABLE_WEATHER=ON,-DENABLE_WEATHER=OFF,libgweather4"
 LDFLAGS += "-lpthread -lgmodule-2.0 -lgthread-2.0"
 # invokes libraries from build host
-GI_DATA_ENABLED:libc-musl="False"
+GI_DATA_ENABLED:libc-musl = "False"
 do_configure:append () {
    cp ${UNPACKDIR}/iconv-detect.h ${S}/src
diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc
index 33190c461c..54eb593e5f 100644
--- a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc
+++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc
@@ -4,11 +4,12 @@ BUGTRACKER = "https://bugzilla.gnome.org/"
 LICENSE = "LGPL-2.0-only & LGPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \
-                    file://src/camel/camel.h;endline=24;md5=342fc5e9357254bc30c24e43ae47d9a1 \
+                    file://src/camel/camel.h;endline=24;md5=4150eec6c74e359401d8ed7f266984b9 \
-                    file://src/libedataserver/e-data-server-util.h;endline=20;md5=8f21a9c80ea82a4fb80b5f959f672543"
+                    file://src/libedataserver/e-data-server-util.h;endline=20;md5=fa7fca32c1bf07f87a52094b414fe7a8 \
+                    "
 GNOMEBASEBUILDCLASS = "cmake"
 inherit gnomebase upstream-version-is-even
-SRC_URI[archive.sha256sum] = "91f4ffc38a1b8d2fe8939834449ac541c0bff4a39b444edc2a9529344a28e98a"
+SRC_URI[archive.sha256sum] = "df4ec29950f29a76eac6fbe0f814c48d2cef7d3fdb905002a4a883dd761ce93c"
-PV = "3.50.1"
+PV = "3.56.2"
diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch
index e8c6d6a763..9a00d01678 100644
--- a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch
+++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch
@@ -1,4 +1,4 @@
-From 131b88a81aba3d72d566bc8a9d968941a98e0007 Mon Sep 17 00:00:00 2001
+From ab25af06d6eed4dfb785b4593e38112f8f376230 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
 Date: Sun, 31 Mar 2019 18:11:55 +0200
 Subject: [PATCH] CMakeLists.txt: Remove TRY_RUN for iconv
@@ -17,10 +17,10 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
 1 file changed, 11 deletions(-)
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1672daf..0b3e4e0 100644
+index 5ccbf9c..5dfe9ee 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -524,17 +524,6 @@ if(NOT HAVE_ICONV)
+@@ -569,17 +569,6 @@ if(NOT HAVE_ICONV)
        message(FATAL_ERROR "You need to install a working iconv implementation, such as ftp://ftp.gnu.org/pub/gnu/libiconv")
 endif(NOT HAVE_ICONV)
 
@@ -38,6 +38,3 @@ index 1672daf..0b3e4e0 100644
 # ******************************
 # Backtraces for debugging
 # ******************************
-- 
-2.20.1
diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-cmake-Do-not-export-CC-into-gir-compiler.patch b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-cmake-Do-not-export-CC-into-gir-compiler.patch
index 118d93a72a..b89d5f25c3 100644
--- a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-cmake-Do-not-export-CC-into-gir-compiler.patch
+++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-cmake-Do-not-export-CC-into-gir-compiler.patch
@@ -1,7 +1,16 @@
-Use G_IR_SCANNER without passing additional environment
+From 0f9763c77dcf44b1061517539287c79a59a6aede Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 6 Mar 2022 18:16:31 +0100
+Subject: [PATCH] Use G_IR_SCANNER without passing additional environment
 Upstream-Status: Inappropriate [OE-specific]
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ cmake/modules/GObjectIntrospection.cmake | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+diff --git a/cmake/modules/GObjectIntrospection.cmake b/cmake/modules/GObjectIntrospection.cmake
+index 9d2e6e7..3d8bb8c 100644
 --- a/cmake/modules/GObjectIntrospection.cmake
 +++ b/cmake/modules/GObjectIntrospection.cmake
 @@ -122,9 +122,7 @@ macro(gir_add_introspection gir)
@@ -15,7 +24,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
                                ${INTROSPECTION_SCANNER_ARGS}
                                --namespace=${_gir_namespace}
                                --nsversion=${_gir_version}
-@@ -240,7 +238,6 @@ macro(gir_add_introspection_simple gir_l
+@@ -240,7 +238,6 @@ macro(gir_add_introspection_simple gir_library pkg_export_prefix gir_library_ver
                ${_gir_identifies_prefixes}
                ${_gir_deps}
                --add-include-path=${SHARE_INSTALL_PREFIX}/gir-1.0
diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-data-CMakeLists.txt-dont-create-automatic-google-log.patch b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-data-CMakeLists.txt-dont-create-automatic-google-log.patch
new file mode 100644
index 0000000000..d23eb8b6e0
--- /dev/null
+++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-data-CMakeLists.txt-dont-create-automatic-google-log.patch
@@ -0,0 +1,39 @@
+From 9b949bd47ed9e5596a9d37c60aa947def9c41db9 Mon Sep 17 00:00:00 2001
+From: Markus Volk <f_l_k@t-online.de>
+Date: Sun, 15 Sep 2024 22:31:49 +0200
+Subject: [PATCH] data/CMakeLists.txt: dont create automatic google login
+Inappropriate for cross-compiling
+Upstream-Status: Inappropriate [oe-specific]
+Signed-off-by: Markus Volk <f_l_k@t-online.de>
+---
+ data/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
+index 8fa642909..bb1b0c4da 100644
+--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
+@@ -29,7 +29,7 @@ add_icon_cache_files("${SHARE_INSTALL_PREFIX}" alarm_notify_icon)
+ # ********************************
+ 
+ set(OAUTH2_SCHEMES "x-scheme-handler/eds-oauth2;")
+-if(NOT WITH_GOOGLE_CLIENT_ID STREQUAL "")
+if(0)
+        set(CMAKE_REQUIRED_DEFINITIONS ${DATA_SERVER_CFLAGS})
+        set(CMAKE_REQUIRED_INCLUDES ${CMAKE_BINARY_DIR} ${DATA_SERVER_INCLUDE_DIRS})
+        set(CMAKE_REQUIRED_LIBRARIES ${DATA_SERVER_LDFLAGS})
+@@ -50,7 +50,7 @@ if(NOT WITH_GOOGLE_CLIENT_ID STREQUAL "")
+                set(OAUTH2_SCHEMES "x-scheme-handler/${_google_oauth2_scheme};${OAUTH2_SCHEMES}")
+        endif(NOT _google_oauth2_scheme STREQUAL "")
+        unset(_google_oauth2_scheme)
+-endif(NOT WITH_GOOGLE_CLIENT_ID STREQUAL "")
+endif(0)
+ 
+ configure_file(org.gnome.evolution-data-server.OAuth2-handler.desktop.in
+        org.gnome.evolution-data-server.OAuth2-handler.desktop.in
+-- 
+2.46.0
diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch
index 51eaf7cfef..b26d8f3b20 100644
--- a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch
+++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch
@@ -1,7 +1,7 @@
-From 20bd8946a5c73290d961df151e82033171639c0d Mon Sep 17 00:00:00 2001
+From 57dcb88745bea5e14a8d8d2d0e3d0d3876ee8c8a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
 Date: Tue, 19 Dec 2017 16:55:13 +0100
-Subject: [PATCH 2/7] CMakeLists.txt: remove CHECK_C_SOURCE_RUNS check
+Subject: [PATCH] CMakeLists.txt: remove CHECK_C_SOURCE_RUNS check
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -16,10 +16,10 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
 1 file changed, 23 deletions(-)
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ed99904..9a2e99f 100644
+index 5dfe9ee..42721b3 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -579,29 +579,6 @@ CHECK_C_SOURCE_COMPILES("#include <langinfo.h>
+@@ -619,29 +619,6 @@ CHECK_C_SOURCE_COMPILES("#include <langinfo.h>
 CHECK_C_SOURCE_COMPILES("#include <langinfo.h>
                        int main(void) { char *detail = nl_langinfo (_NL_ADDRESS_COUNTRY_AB2); return 0; }" HAVE__NL_ADDRESS_COUNTRY_AB2)
 
@@ -49,6 +49,3 @@ index ed99904..9a2e99f 100644
 # ******************************
 # system mail stuff
 # ******************************
-- 
-2.21.0
diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0004-call-native-helpers.patch b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0004-call-native-helpers.patch
index 82f6972501..c1d38bd0af 100644
--- a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0004-call-native-helpers.patch
+++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0004-call-native-helpers.patch
@@ -1,4 +1,4 @@
-From 9c375e3fcf8ff778a5010a07a7da4b6a58adec7c Mon Sep 17 00:00:00 2001
+From 621c3fe47376fe3bb28625114613eb4f636cdba7 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
 Date: Sun, 31 Mar 2019 19:11:31 +0200
 Subject: [PATCH] call native helpers
@@ -15,7 +15,7 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
 2 files changed, 2 insertions(+), 2 deletions(-)
 diff --git a/src/addressbook/libebook-contacts/CMakeLists.txt b/src/addressbook/libebook-contacts/CMakeLists.txt
-index e9e3259..e749d1b 100644
+index 480e3f6..fc40b20 100644
 --- a/src/addressbook/libebook-contacts/CMakeLists.txt
 +++ b/src/addressbook/libebook-contacts/CMakeLists.txt
 @@ -25,7 +25,7 @@ target_link_libraries(gen-western-table
@@ -28,10 +28,10 @@ index e9e3259..e749d1b 100644
 )
 
 diff --git a/src/camel/CMakeLists.txt b/src/camel/CMakeLists.txt
-index be626a8..14ac8b8 100644
+index 59bc77a..c5da19c 100644
 --- a/src/camel/CMakeLists.txt
 +++ b/src/camel/CMakeLists.txt
-@@ -10,7 +10,7 @@ target_include_directories(camel-gen-tables PUBLIC
+@@ -20,7 +20,7 @@ target_include_directories(camel-gen-tables PUBLIC
 
 add_custom_command(
        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/camel-mime-tables.c
@@ -40,6 +40,3 @@ index be626a8..14ac8b8 100644
        DEPENDS camel-gen-tables
 )
 
-- 
-2.20.1
diff --git a/meta-gnome/recipes-gnome/faenza-icon-theme/faenza-icon-theme_1.3.bb b/meta-gnome/recipes-gnome/faenza-icon-theme/faenza-icon-theme_1.3.bb
index 5db9457122..922c93cc53 100644
--- a/meta-gnome/recipes-gnome/faenza-icon-theme/faenza-icon-theme_1.3.bb
+++ b/meta-gnome/recipes-gnome/faenza-icon-theme/faenza-icon-theme_1.3.bb
@@ -6,8 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 inherit allarch gtk-icon-cache
-S = "${WORKDIR}/sources"
+S = "${UNPACKDIR}"
-UNPACKDIR = "${S}"
 SRC_URI = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${BPN}/${BPN}_${PV}.zip"
 SRC_URI[sha256sum] = "d4486fda0413f8a81a87e0dd2329f50f2a8a7cb4147b48cf147f0160add8174a"
diff --git a/meta-gnome/recipes-gnome/file-roller/file-roller_44.3.bb b/meta-gnome/recipes-gnome/file-roller/file-roller_44.5.bb
index a195d43f0c..050f6803c7 100644
--- a/meta-gnome/recipes-gnome/file-roller/file-roller_44.3.bb
+++ b/meta-gnome/recipes-gnome/file-roller/file-roller_44.5.bb
@@ -1,5 +1,5 @@
 SUMMARY = "An archive manager utility for the  GNOME Environment"
-LICENSE="GPL-2.0-only"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
@@ -17,14 +17,12 @@ DEPENDS = " \
 inherit gnomebase gsettings itstool gobject-introspection gnome-help gettext upstream-version-is-even mime-xdg gtk-icon-cache features_check
+SRC_URI[archive.sha256sum] = "dfaf4bb989c0b8986be8bdae9fffeab8d0f30669ae3a627e8c3df94f23888339"
 REQUIRED_DISTRO_FEATURES = "opengl"
 EXTRA_OEMESON += "-Dintrospection=enabled"
-SRC_URI = "git://gitlab.gnome.org/GNOME/file-roller.git;protocol=https;branch=master"
-SRCREV = "d4f3b970bd7dd07d8f539433628eba10551aa629"
-S = "${WORKDIR}/git"
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[nautilus] = "-Dnautilus-actions=enabled,-Dnautilus-actions=disabled,nautilus"
diff --git a/meta-gnome/recipes-gnome/gdm/gdm/a3e0aca75e16aeafc171751028406b54f5ed8397.patch b/meta-gnome/recipes-gnome/gdm/gdm/a3e0aca75e16aeafc171751028406b54f5ed8397.patch
new file mode 100644
index 0000000000..8363a7f41d
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gdm/gdm/a3e0aca75e16aeafc171751028406b54f5ed8397.patch
@@ -0,0 +1,56 @@
+From 2fbc2ac50b9f143eb594e5f77a8051222ffbd2c9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Mon, 27 Jan 2025 14:01:23 +0100
+Subject: [PATCH] gdm-settings-utils: rename variable to fix build with gcc 15
+In GNU23 C, bool is a keyword. Rename the variable to avoid syntax error.
+---
+ common/gdm-settings-utils.c | 8 ++++----
+ common/gdm-settings-utils.h | 2 +-
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+ 
+ Signed-off-by: Markus Volk <f_l_k@t-online.de>
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gdm/-/commit/a3e0aca75e16aeafc171751028406b54f5ed8397.patch]
+diff --git a/common/gdm-settings-utils.c b/common/gdm-settings-utils.c
+index 636be3a9e..da4c7aefb 100644
+--- a/common/gdm-settings-utils.c
+++ b/common/gdm-settings-utils.c
+@@ -287,16 +287,16 @@ gdm_settings_parse_boolean_as_value  (gboolean boolval)
+ /* adapted from GKeyFile */
+ gboolean
+ gdm_settings_parse_value_as_boolean (const char *value,
+-                                     gboolean   *bool)
+                                     gboolean   *boolval)
+ {
+         g_return_val_if_fail (value != NULL, FALSE);
+-        g_return_val_if_fail (bool != NULL, FALSE);
+        g_return_val_if_fail (boolval != NULL, FALSE);
+ 
+         if (g_ascii_strcasecmp (value, "true") == 0 || strcmp (value, "1") == 0) {
+-                *bool = TRUE;
+                *boolval = TRUE;
+                 return TRUE;
+         } else if (g_ascii_strcasecmp (value, "false") == 0 || strcmp (value, "0") == 0) {
+-                *bool = FALSE;
+                *boolval = FALSE;
+                 return TRUE;
+         } else {
+                 return FALSE;
+diff --git a/common/gdm-settings-utils.h b/common/gdm-settings-utils.h
+index 4f2362ce7..734d625c7 100644
+--- a/common/gdm-settings-utils.h
+++ b/common/gdm-settings-utils.h
+@@ -44,7 +44,7 @@ gboolean                  gdm_settings_parse_schemas           (const char  *fil
+                                                                 GSList     **list);
+ 
+ gboolean                  gdm_settings_parse_value_as_boolean  (const char *value,
+-                                                                gboolean   *bool);
+                                                                gboolean   *boolval);
+ gboolean                  gdm_settings_parse_value_as_integer  (const char *value,
+                                                                 int        *intval);
+ gboolean                  gdm_settings_parse_value_as_double   (const char *value,
+-- 
+GitLab
diff --git a/meta-gnome/recipes-gnome/gdm/gdm_46.0.bb b/meta-gnome/recipes-gnome/gdm/gdm_48.0.bb
index ec1d6ad39f..92ddc143f6 100644
--- a/meta-gnome/recipes-gnome/gdm/gdm_46.0.bb
+++ b/meta-gnome/recipes-gnome/gdm/gdm_48.0.bb
@@ -1,5 +1,5 @@
 SUMMARY = "GNOME Display Manager"
-LICENSE="GPL-2.0-only"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 DEPENDS = " \
@@ -21,10 +21,13 @@ GIR_MESON_OPTION = ""
 inherit gnomebase gsettings pkgconfig gobject-introspection gettext systemd useradd itstool gnome-help features_check
-SRC_URI[archive.sha256sum] = "8d6cb52176eca48b6bbf1cfe2fdae08d9677b5a0f2bca600dee4604de0dd1efc"
+SRC_URI += "file://a3e0aca75e16aeafc171751028406b54f5ed8397.patch"
+SRC_URI[archive.sha256sum] = "1bc06daff093ec7b5e37ecb4f92e5da3474a1b1ba076edb9151ee967d1c30adf"
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[plymouth] = "-Dplymouth=enabled,-Dplymouth=disabled,plymouth"
 EXTRA_OEMESON = " \
-    -Dplymouth=disabled \
    -Ddefault-pam-config=openembedded \
    -Dpam-mod-dir=${base_libdir}/security \
 "
@@ -38,10 +41,14 @@ do_install:prepend() {
 do_install:append() {
    rm -rf ${D}/run ${D}${localstatedir}/run
+    echo "auth       optional     pam_gnome_keyring.so" >> ${D}${sysconfdir}/pam.d/gdm-password
+    echo "session    optional     pam_gnome_keyring.so auto_start" >> ${D}${sysconfdir}/pam.d/gdm-password
+    install -d ${D}${sysconfdir}/tmpfiles.d
+    echo "d ${localstatedir}/lib/gdm 700 gdm gdm - -" > ${D}${sysconfdir}/tmpfiles.d/gdm.conf
 }
 USERADD_PACKAGES = "${PN}"
-USERADD_PARAM:${PN} = "--system --no-create-home --home ${localstatedir}/lib/gdm --user-group gdm"
+USERADD_PARAM:${PN} = "--system --groups video --home ${localstatedir}/lib/gdm  gdm"
 SYSTEMD_SERVICE:${PN} = "${BPN}.service"
@@ -60,7 +67,6 @@ CONFFILES:${PN} += "${sysconfdir}/gdm/custom.conf"
 FILES:${PN} += " \
    ${datadir}/dconf \
    ${base_libdir}/security/pam_gdm.so \
-    ${localstatedir} \
    ${systemd_unitdir} ${systemd_user_unitdir} \
 "
diff --git a/meta-gnome/recipes-gnome/gedit/gedit_46.2.bb b/meta-gnome/recipes-gnome/gedit/gedit_46.2.bb
index 6cdc33c1cc..91b2221d7a 100644
--- a/meta-gnome/recipes-gnome/gedit/gedit_46.2.bb
+++ b/meta-gnome/recipes-gnome/gedit/gedit_46.2.bb
@@ -12,7 +12,7 @@ DEPENDS = " \
    gdk-pixbuf-native \
    gtk+3 \
    gsettings-desktop-schemas \
-    libpeas \
+    libpeas-1 \
    libsoup \
    gspell \
    tepl \
diff --git a/meta-gnome/recipes-gnome/gedit/libgedit-amtk_5.8.0.bb b/meta-gnome/recipes-gnome/gedit/libgedit-amtk_5.8.0.bb
index 11da836ff4..c2e7dd67e9 100644
--- a/meta-gnome/recipes-gnome/gedit/libgedit-amtk_5.8.0.bb
+++ b/meta-gnome/recipes-gnome/gedit/libgedit-amtk_5.8.0.bb
@@ -8,7 +8,6 @@ DEPENDS = "glib-2.0 gtk+3"
 inherit meson pkgconfig gobject-introspection features_check gtk-doc
 SRC_URI = "git://github.com/gedit-technology/libgedit-amtk.git;protocol=https;branch=main"
-S = "${WORKDIR}/git"
 SRCREV = "f6fbfd1c57de3d97cab2056a5c3088b0da49e8a4"
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
diff --git a/meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.2.1.bb b/meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.2.1.bb
index d66ce60802..4f21c3e569 100644
--- a/meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.2.1.bb
+++ b/meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.2.1.bb
@@ -8,7 +8,6 @@ DEPENDS = "glib-2.0 gtk+3 libxml2"
 inherit meson pkgconfig gobject-introspection features_check gtk-doc
 SRC_URI = "git://github.com/gedit-technology/libgedit-gtksourceview.git;protocol=https;branch=main"
-S = "${WORKDIR}/git"
 SRCREV = "eaafc892d033713c7c823d8ad602061e456b3c88"
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
diff --git a/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.14.2.bb b/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.14.5.bb
index 8fd6583104..fadae34608 100644
--- a/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.14.2.bb
+++ b/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.14.5.bb
@@ -8,7 +8,7 @@ GTKDOC_MESON_OPTION = "gtk_doc"
 inherit gnomebase gobject-introspection gtk-doc python3native vala
-SRC_URI[archive.sha256sum] = "2a0c9cf48fbe8b3435008866ffd40b8eddb0667d2212b42396fdf688e93ce0be"
+SRC_URI[archive.sha256sum] = "0913c53daabab1f1ab586afd55bb55370796f2b8abcc6e37640ab7704ad99ce1"
 EXTRA_OEMESON = " \
    ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-Dvapi=true', '-Dvapi=false', d)} \
@@ -20,8 +20,8 @@ RDEPENDS:${PN}-python3 = "${PN}"
 PACKAGE_PREPROCESS_FUNCS += "src_package_preprocess"
 src_package_preprocess () {
-        # Trim build paths from comments in generated sources to ensure reproducibility
+        # Trim build paths from code in generated sources to ensure reproducibility
-        sed -i -e "s,${B}/../${BPN}-${PV}/${BPN}/,,g" \
+        sed -i -e "s,${B}/../sources/${BP},${TARGET_DBGSRC_DIR},g" \
            ${B}/gexiv2/gexiv2-enums.cpp
 }
diff --git a/meta-gnome/recipes-gnome/gfbgraph/gfbgraph_0.2.5.bb b/meta-gnome/recipes-gnome/gfbgraph/gfbgraph_0.2.5.bb
deleted file mode 100644
index 9b1a02bb09..0000000000
--- a/meta-gnome/recipes-gnome/gfbgraph/gfbgraph_0.2.5.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-SUMMARY = "A GObject library for Facebook Graph API"
-SECTION = "x11/gnome"
-LICENSE = "LGPL-2.1-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=5804fe91d3294da4ac47c02b454bbc8a"
-DEPENDS = " \
-    glib-2.0 \
-    json-glib \
-    librest \
-    libsoup-2.4 \
-    gnome-online-accounts \
-"
-GNOMEBASEBUILDCLASS = "autotools"
-inherit gnomebase gtk-doc gobject-introspection pkgconfig features_check
-# for gnome-online-accounts
-REQUIRED_DISTRO_FEATURES = "x11 opengl"
-#SRC_URI += " file://0001-Update-rest-requirement-to-rest-1.0.patch"
-SRC_URI[archive.sha256sum] = "9cb381b3f78ba1136df97af3f06e3b11dcc2ab339ac08f74eda0f8057d6603e3"
-do_install:append() {
-    # they install all the autotools files (NEWS AUTHORS..) to /usr/doc which
-    # is not a standard path exactly
-    rm -rf ${D}${prefix}/doc
-}
diff --git a/meta-gnome/recipes-gnome/ghex/ghex_46.0.bb b/meta-gnome/recipes-gnome/ghex/ghex_46.2.bb
index 41d8391636..f29ddbb6fd 100644
--- a/meta-gnome/recipes-gnome/ghex/ghex_46.0.bb
+++ b/meta-gnome/recipes-gnome/ghex/ghex_46.2.bb
@@ -7,6 +7,7 @@ DEPENDS = " \
    desktop-file-utils-native  \
    glib-2.0-native \
    gtk4 \
+    itstool-native \
    libadwaita \
 "
@@ -15,7 +16,7 @@ GIR_MESON_DISABLE_FLAG = 'disabled'
 inherit gnomebase gsettings gtk-icon-cache gnome-help gettext gobject-introspection vala gi-docgen
-SRC_URI[archive.sha256sum] = "a1c46f3020cb358b8323025db3a539c97d994a4c46f701f48edc6357f7fbcbd1"
+SRC_URI[archive.sha256sum] = "a8f276a36397a70d20b862ff7c664243d9cf2891deb9be06d745a4f1ac661f31"
 REQUIRED_DISTRO_FEATURES = "opengl"
diff --git a/meta-gnome/recipes-gnome/gjs/gjs/0001-Support-cross-builds-a-bit-better.patch b/meta-gnome/recipes-gnome/gjs/gjs/0001-Support-cross-builds-a-bit-better.patch
index 12b4b08c7e..ab3b85b606 100644
--- a/meta-gnome/recipes-gnome/gjs/gjs/0001-Support-cross-builds-a-bit-better.patch
+++ b/meta-gnome/recipes-gnome/gjs/gjs/0001-Support-cross-builds-a-bit-better.patch
@@ -1,4 +1,4 @@
-From 8a78a7996b01aba21377ceb7547da673fd30a391 Mon Sep 17 00:00:00 2001
+From b6996f3683f0a1428657636c372ef7af8d0b43ff Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
 Date: Wed, 27 Oct 2021 20:18:47 +0200
 Subject: [PATCH] Support cross builds a bit better
@@ -17,10 +17,10 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
 1 file changed, 3 insertions(+), 1 deletion(-)
 diff --git a/meson.build b/meson.build
-index c9b26d6..3058e8c 100644
+index a969ce2..1885afc 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -262,6 +262,7 @@ release builds of SpiderMonkey. Try configuring SpiderMonkey with
+@@ -252,6 +252,7 @@ release builds of SpiderMonkey. Try configuring SpiderMonkey with
 --disable-debug.''')
 endif
 
@@ -28,15 +28,15 @@ index c9b26d6..3058e8c 100644
 # Check if a minimal SpiderMonkey program compiles, links, and runs. If not,
 # it's most likely the case that SpiderMonkey was configured incorrectly, for
 # example by building mozglue as a shared library.
-@@ -292,6 +293,7 @@ elif minimal_program.returncode() != 0
+@@ -282,6 +283,7 @@ elif minimal_program.returncode() != 0
 failed to execute. Most likely you should build it with a different
 configuration.''' + recommended_configuration)
 endif
 +endif # not meson.is_cross_build()
 
- have_printf_alternative_int = cc.compiles('''
+ ### Check for external programs ################################################
- #include <stdio.h>
+ 
-@@ -690,7 +692,7 @@ subdir('installed-tests')
+@@ -651,7 +653,7 @@ subdir('installed-tests')
 
 # Note: The test program in test/ needs to be ported
 #       to Windows before we can build it on Windows.
diff --git a/meta-gnome/recipes-gnome/gjs/gjs/0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch b/meta-gnome/recipes-gnome/gjs/gjs/0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch
index e932f06d27..9558ad75e2 100644
--- a/meta-gnome/recipes-gnome/gjs/gjs/0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch
+++ b/meta-gnome/recipes-gnome/gjs/gjs/0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch
@@ -1,4 +1,4 @@
-From 29221ae42e424c6100b8c313d2b61801430c872d Mon Sep 17 00:00:00 2001
+From d0424474da5d6b6a3360d081886c289852242378 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller=20installed=5Ftests=20is=20false?=
 <schnitzeltony@gmail.com>
 Date: Wed, 27 Oct 2021 20:04:02 +0200
@@ -11,6 +11,10 @@ MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gjs/-/merge_requests/690]
 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
@@ -19,12 +23,12 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
 1 file changed, 3 insertions(+), 1 deletion(-)
 diff --git a/meson.build b/meson.build
-index 3058e8c..06cf8da 100644
+index 1885afc..6333c06 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -688,7 +688,9 @@ endif
+@@ -649,7 +649,9 @@ gi_tests = subproject('gobject-introspection-tests',
- 
+     default_options: ['werror=false', 'cairo=true',
- ### Tests and test setups ######################################################
+         'install_dir=@0@'.format(installed_tests_execdir)])
 
 -subdir('installed-tests')
 +if get_option('installed_tests')
diff --git a/meta-gnome/recipes-gnome/gjs/gjs_1.80.2.bb b/meta-gnome/recipes-gnome/gjs/gjs_1.84.1.bb
index 1d781d078c..55bd38c97c 100644
--- a/meta-gnome/recipes-gnome/gjs/gjs_1.80.2.bb
+++ b/meta-gnome/recipes-gnome/gjs/gjs_1.84.1.bb
@@ -3,11 +3,11 @@ LICENSE = "MIT & LGPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=8dcea832f6acf45d856abfeb2d51ec48"
-DEPENDS = "mozjs-115 cairo"
+DEPENDS = "mozjs-128 cairo"
-inherit gnomebase gsettings gobject-introspection gettext features_check upstream-version-is-even pkgconfig
+inherit gnomebase gobject-introspection gettext features_check upstream-version-is-even pkgconfig multilib_script
-SRC_URI[archive.sha256sum] = "135e39c5ac591096233e557cfe577d64093f5054411d47cb2e214bad7d4199bd"
+SRC_URI[archive.sha256sum] = "44796b91318dbbe221a13909f00fd872ef92f38c68603e0e3574e46bc6bac32c"
 SRC_URI += " \
    file://0001-Support-cross-builds-a-bit-better.patch \
    file://0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch \
@@ -37,3 +37,9 @@ RDEPENDS:${PN}-valgrind += "valgrind"
 # Valgrind not yet available on rv32/rv64
 RDEPENDS:${PN}-valgrind:remove:riscv32 = "valgrind"
 RDEPENDS:${PN}-valgrind:remove:riscv64 = "valgrind"
+MULTILIB_SCRIPTS:append = "${PN}:${libexecdir}/installed-tests/gjs/GIMarshallingTests-1.0.typelib \
+                    ${PN}:${libexecdir}/installed-tests/gjs/Regress-1.0.typelib \
+                    ${PN}:${libexecdir}/installed-tests/gjs/Utility-1.0.typelib \
+                    ${PN}:${libexecdir}/installed-tests/gjs/WarnLib-1.0.typelib \
+                    "
diff --git a/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.4.4.bb b/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.4.5.bb
index 8d602eee44..d7325888d6 100644
--- a/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.4.4.bb
+++ b/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.4.5.bb
@@ -13,7 +13,7 @@ GTKDOC_MESON_OPTION = "gtk_doc"
 inherit gnomebase gobject-introspection gtk-doc vala
-SRC_URI[archive.sha256sum] = "c0afbe333bcf3cb1441a1f574cc8ec7b1b8197779145d4edeee2896fdacfc3c2"
+SRC_URI[archive.sha256sum] = "838c5306fc38bfaa2f23abe24262f4bf15771e3303fb5dcb74f5b9c7a615dabe"
 do_compile:prepend() {
    export GIR_EXTRA_LIBS_PATH="${B}/gnome-autoar/.libs"
diff --git a/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_46.0.bb b/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_48.0.bb
index d938ae94cb..d144cd0639 100644
--- a/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_46.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_48.0.bb
@@ -6,7 +6,7 @@ SECTION = "x11/gnome"
 inherit gnomebase gettext allarch
-SRC_URI[archive.sha256sum] = "4ddd3ac439a4a067876805921bb75f4d3c8b85a218d47c276dddde8928443c2e"
+SRC_URI[archive.sha256sum] = "2d6baa011ee97804c7561f7e1cbd8d4763e30b55b8818dda78f9f75afb8d8d05"
 FILES:${PN} += " \
    ${datadir}/backgrounds \
diff --git a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth3_3.34.5.bb b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth3_3.34.5.bb
index 2a97263125..1ceff5ffcf 100644
--- a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth3_3.34.5.bb
+++ b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth3_3.34.5.bb
@@ -9,7 +9,7 @@ SECTION = "x11/gnome"
 DEPENDS = "udev gtk+3 libnotify libcanberra bluez5"
 GNOMEBN = "gnome-bluetooth"
-S = "${WORKDIR}/${GNOMEBN}-${PV}"
+S = "${UNPACKDIR}/${GNOMEBN}-${PV}"
 GTKDOC_MESON_OPTION = "gtk_doc"
diff --git a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_46.0.bb b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_47.1.bb
index 1b29e52c75..e363db309d 100644
--- a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_46.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_47.1.bb
@@ -25,7 +25,7 @@ inherit features_check gnomebase gtk-icon-cache gtk-doc gobject-introspection
 REQUIRED_DISTRO_FEATURES = "x11 opengl"
-SRC_URI[archive.sha256sum] = "13fe1e75f317acdbdf5e80c9029d2e0632d60a9ccf72a43ae36eb7545021fbef"
+SRC_URI[archive.sha256sum] = "03e3e7403a15108ffc1496210a1da5c2961b2834a5c07eccc7a3f493195daba3"
 BT_PULSE_PACKS = " \
    pulseaudio-lib-bluez5-util \
diff --git a/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_46.1.bb b/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_48.0.bb
index f1a93ea833..b8433a2b5a 100644
--- a/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_46.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_48.0.bb
@@ -29,7 +29,7 @@ def gnome_verdir(v):
 REQUIRED_DISTRO_FEATURES = "x11 opengl"
-SRC_URI[archive.sha256sum] = "2d36750a73890086122cf3f0c83e68517891585615165306fa1596a918668247"
+SRC_URI[archive.sha256sum] = "07b627136bbfddb6142b324acc30440911f77f5137009103276a2d35ffd39510"
 FILES:${PN} += " \
    ${datadir}/dbus-1 \
diff --git a/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_46.1.bb b/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_48.0.bb
index eac768c8f5..44bde3774d 100644
--- a/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_46.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_48.0.bb
@@ -22,7 +22,7 @@ inherit gnomebase gsettings gtk-icon-cache gettext features_check upstream-versi
 REQUIRED_DISTRO_FEATURES = "x11 opengl"
-SRC_URI[archive.sha256sum] = "9861ff7b8abd5b7b20690ba55eb7542c7ec534b566269e29b5b1e858c1610897"
+SRC_URI[archive.sha256sum] = "e69a5a66be820105a4d823d4dba9b4e6ef9f6e7523978aaf33361ebbb993e604"
 do_install:prepend() {
    sed -i -e 's|${S}/src|${TARGET_DBGSRC_DIR}/src|g' ${B}/src/gcal-enum-types.h
diff --git a/meta-gnome/recipes-gnome/gnome-chess/gnome-chess_46.0.bb b/meta-gnome/recipes-gnome/gnome-chess/gnome-chess_48.0.bb
index bb53b58df7..3aa353748b 100644
--- a/meta-gnome/recipes-gnome/gnome-chess/gnome-chess_46.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-chess/gnome-chess_48.0.bb
@@ -13,8 +13,8 @@ DEPENDS = " \
    cairo \
    desktop-file-utils-native \
    glib-2.0 \
-    glib-2.0 \
    gtk4 \
+    itstool-native \
    libadwaita \
    librsvg \
    pango \
@@ -22,13 +22,12 @@ DEPENDS = " \
 RRECOMMENDS:${PN}  = "gnuchess"
-SRC_URI = "git://github.com/GNOME/gnome-chess.git;protocol=https;branch=master"
+SRC_URI = "git://github.com/GNOME/gnome-chess.git;protocol=https;branch=main"
 inherit meson pkgconfig gobject-introspection gtk-icon-cache vala features_check mime-xdg gsettings
 GIR_MESON_OPTION = ""
-S = "${WORKDIR}/git"
+SRCREV = "b0bf5288438f74fcb455e1e49f855b4964a2c7cb"
-SRCREV = "c3625ee59ab3acfd7566ef04300b15ddbadaaac3"
 FILES:${PN} += "${datadir}"
diff --git a/meta-gnome/recipes-gnome/gnome-chess/gnuchess_6.2.9.bb b/meta-gnome/recipes-gnome/gnome-chess/gnuchess_6.2.9.bb
index 78606b8a2a..9e2a21d4cc 100644
--- a/meta-gnome/recipes-gnome/gnome-chess/gnuchess_6.2.9.bb
+++ b/meta-gnome/recipes-gnome/gnome-chess/gnuchess_6.2.9.bb
@@ -8,7 +8,7 @@ SRC_URI = "https://git.savannah.gnu.org/cgit/chess.git/snapshot/chess-${PV}.tar.
           file://0001-Remove-register-storage-class-classifier.patch"
 SRC_URI[sha256sum] = "03f9e844ccdd48d20ee49314174404f8b643d83bb8ce9ec9d2e6a21f1b6fb9f5"
-S = "${WORKDIR}/chess-${PV}"
+S = "${UNPACKDIR}/chess-${PV}"
 inherit autotools gettext
diff --git a/meta-gnome/recipes-gnome/gnome-commander/gnome-commander_1.16.1.bb b/meta-gnome/recipes-gnome/gnome-commander/gnome-commander_1.16.1.bb
index bb36d59e56..d96371de3c 100644
--- a/meta-gnome/recipes-gnome/gnome-commander/gnome-commander_1.16.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-commander/gnome-commander_1.16.1.bb
@@ -25,7 +25,7 @@ PACKAGECONFIG[taglib] = "-Dtaglib=enabled,-Dtaglib=disabled,taglib"
 PACKAGECONFIG[libgsf] = "-Dlibgsf=enabled,-Dlibgsf=disabled,libgsf"
 PACKAGECONFIG[poppler] = "-Dpoppler=enabled,-Dpoppler=disabled,poppler"
 PACKAGECONFIG[samba] = "-Dsamba=enabled,-Dsamba=disabled,samba"
-PACKAGECONFIG[tests] = "-Dtests=enabled,-Dtests=disabled,"
+PACKAGECONFIG[tests] = "-Dtests=enabled,-Dtests=disabled,googletest"
 FILES:${PN} += "${datadir}/metainfo"
 FILES:${PN}-dev += "${libdir}/${BPN}/lib*${SOLIBSDEV}"
diff --git a/meta-gnome/recipes-gnome/gnome-console/gnome-console/0001-include-locale.h-for-setlocale.patch b/meta-gnome/recipes-gnome/gnome-console/gnome-console/0001-include-locale.h-for-setlocale.patch
new file mode 100644
index 0000000000..28f26476ce
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-console/gnome-console/0001-include-locale.h-for-setlocale.patch
@@ -0,0 +1,34 @@
+From e72f6da3d509561b75e223667a0380772e7bd48a Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 23 Sep 2024 20:38:09 -0700
+Subject: [PATCH] include locale.h for setlocale()
+This issue is surfaced on systems+clang
+Fixes
+../gnome-console-47.0/src/main.c:29:3: error: call to undeclared function 'setlocale'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
+   29 |   setlocale (LC_ALL, "");
+      |   ^
+../gnome-console-47.0/src/main.c:29:14: error: use of undeclared identifier 'LC_ALL'
+   29 |   setlocale (LC_ALL, "");
+      |              ^
+Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/console/-/merge_requests/171]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/main.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/src/main.c b/src/main.c
+index af9c5a5..5d16160 100644
+--- a/src/main.c
+++ b/src/main.c
+@@ -17,7 +17,7 @@
+  */
+ 
+ #include <glib/gi18n.h>
+-
+#include <locale.h>
+ #include <kgx.h>
+ 
+ int
diff --git a/meta-gnome/recipes-gnome/gnome-console/gnome-console_45.0.bb b/meta-gnome/recipes-gnome/gnome-console/gnome-console_47.1.bb
index d03b5fe04d..fd1e98a992 100644
--- a/meta-gnome/recipes-gnome/gnome-console/gnome-console_45.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-console/gnome-console_47.1.bb
@@ -17,8 +17,8 @@ DEPENDS = " \
    pcre2 \
    vte \
 "
+SRC_URI += "file://0001-include-locale.h-for-setlocale.patch"
-SRC_URI[archive.sha256sum] = "e7462128d2df2324a1d748062c40429cd0504af09e407067b33f3a9d0c59c8e1"
+SRC_URI[archive.sha256sum] = "d3f600b45b51716691aee92870332e9c9a8ca89d553565f3131d9e28074725d0"
 PACKAGECONFIG ?= ""
 PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false"
diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch
index c1bd34d14b..8515375638 100644
--- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch
+++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch
@@ -13,7 +13,7 @@ Upstream-Status: Inappropriate [OE specific]
 3 files changed, 3 insertions(+), 2 deletions(-)
 diff --git a/meson_options.txt b/meson_options.txt
-index b2302bf..5b9baf5 100644
+index 9aeeed313..6097263a6 100644
 --- a/meson_options.txt
 +++ b/meson_options.txt
 @@ -1,3 +1,4 @@
@@ -22,28 +22,29 @@ index b2302bf..5b9baf5 100644
 option('documentation', type: 'boolean', value: false, description: 'build documentation')
 option('location-services', type: 'feature', value: 'enabled', description: 'build with location services')
 diff --git a/panels/background/meson.build b/panels/background/meson.build
-index 6ced050..df1f808 100644
+index 8f9cbecdf..17f17d395 100644
 --- a/panels/background/meson.build
 +++ b/panels/background/meson.build
-@@ -24,7 +24,7 @@ common_sources += gnome.mkenums_simple(
+@@ -23,7 +23,7 @@ common_sources += gnome.mkenums_simple(
+ )
 
- enums = 'gdesktop-enums-types'
+ gdesktop_enums_header = files(
- enums_header = files(
 -  gsettings_desktop_dep.get_variable(pkgconfig: 'prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h'
-+  get_option('oe_sysroot') + gsettings_desktop_dep.get_variable(pkgconfig: 'prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h'
+  get_option('oe_sysroot') + gsettings_desktop_dep.get_variable(pkgconfig: 'prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h',
 )
 
- common_sources += gnome.mkenums(
+ common_sources += gnome.mkenums_simple(
 diff --git a/panels/system/meson.build b/panels/system/meson.build
-index 4fee822..979332a 100644
+index bbe004837..92e809fbe 100644
 --- a/panels/system/meson.build
 +++ b/panels/system/meson.build
-@@ -73,7 +73,7 @@ sources += gnome.compile_resources(
+@@ -68,7 +68,7 @@ sources += gnome.compile_resources(
 )
 
- enums_header = files(
+ gdesktop_enums_header = files(
-  gsettings_desktop_dep.get_variable(pkgconfig: 'prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h',
+-  gsettings_desktop_dep.get_variable(pkgconfig: 'prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h'
 +  get_option('oe_sysroot') + gsettings_desktop_dep.get_variable(pkgconfig: 'prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h',
-   'datetime/cc-datetime-page.h'
 )
 
+ sources += gnome.mkenums_simple(
+ 
diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.2.bb b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_48.0.bb
index 152e803b5d..340273aa33 100644
--- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.2.bb
+++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_48.0.bb
@@ -31,14 +31,15 @@ DEPENDS = " \
    tecla \
    udisks2 \
    upower \
+    ${@' libxslt-native docbook-xsl-stylesheets-native' if d.getVar('GIDOCGEN_ENABLED') == 'True' else ''} \
 "
-inherit gtk-icon-cache pkgconfig gnomebase gsettings gettext upstream-version-is-even bash-completion features_check useradd
+inherit gtk-icon-cache pkgconfig gnomebase gsettings gettext gi-docgen upstream-version-is-even bash-completion features_check
 REQUIRED_DISTRO_FEATURES += "opengl polkit pulseaudio systemd x11"
 SRC_URI += "file://0001-Add-meson-option-to-pass-sysroot.patch"
-SRC_URI[archive.sha256sum] = "6335c6cb8164e574db521fff61cfa3dfaa55f1db66ae3bca02750a193e1c4f3d"
+SRC_URI[archive.sha256sum] = "1652202db36a2be7441019b9daff3574e80428598e82395a87418015a8c06624"
 PACKAGECONFIG ??= "ibus ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}"
 PACKAGECONFIG[cups] = ",,cups,cups system-config-printer cups-pk-helper"
@@ -47,23 +48,13 @@ PACKAGECONFIG[wayland] = "-Dwayland=true, -Dwayland=false, wayland"
 PACKAGECONFIG[file-share] = ",,,gnome-user-share"
 PACKAGECONFIG[media-share] = ",,,rygel-meta tumbler"
 PACKAGECONFIG[malcontent] = "-Dmalcontent=true,-Dmalcontent=false,malcontent,malcontent-ui"
+PACKAGECONFIG[power-profiles] = ",,,power-profiles-daemon"
 EXTRA_OEMESON += "-Doe_sysroot=${STAGING_DIR_HOST}"
+GIDOCGEN_MESON_OPTION = 'documentation'
 export XDG_DATA_DIRS = "${STAGING_DATADIR}"
-USERADD_PACKAGES = "${PN}"
-USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd"
-do_install:append() {
-    if [ -d ${D}${datadir}/polkit-1/rules.d ]; then
-        chmod 700 ${D}${datadir}/polkit-1/rules.d
-        chown polkitd:root ${D}${datadir}/polkit-1/rules.d
-    fi
-}
-PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
 FILES:${PN} += " \
    ${datadir}/dbus-1 \
    ${datadir}/gnome-shell \
diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_44.0.bb b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_44.1.bb
index 19bae74ce2..629fe929a1 100644
--- a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_44.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_44.1.bb
@@ -6,30 +6,25 @@ LIC_FILES_CHKSUM = " \
    file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
 "
 inherit gnomebase itstool pkgconfig upstream-version-is-even gobject-introspection features_check gtk-doc
-REQUIRED_DISTRO_FEATURES = "x11 opengl"
+REQUIRED_DISTRO_FEATURES = "opengl"
 GIR_MESON_OPTION = ""
 SRC_URI += "file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch \
            file://0001-meson-Add-riscv32-to-seccomp-unsupported-list.patch"
-SRC_URI[archive.sha256sum] = "42c773745d84ba14bc1cf1c4c6f4606148803a5cd337941c63964795f3c59d42"
+SRC_URI[archive.sha256sum] = "ae7ca55dc9e08914999741523a17d29ce223915626bd2462a120bf96f47a79ab"
 DEPENDS += " \
    fontconfig \
    gdk-pixbuf \
    glib-2.0 \
    gsettings-desktop-schemas \
-    gtk+3 \
-    gtk4 \
    iso-codes \
-    xext \
    libseccomp \
    libxkbcommon \
    xkeyboard-config \
-    xrandr \
 "
 DEPENDS:remove:riscv32 = "libseccomp"
@@ -37,6 +32,10 @@ DEPENDS:remove:riscv32 = "libseccomp"
 GTKDOC_MESON_OPTION = "gtk_doc"
 EXTRA_OEMESON = "-Ddesktop_docs=false"
+PACKAGECONFIG ??= "gtk4 legacy"
+PACKAGECONFIG[gtk4] = "-Dbuild_gtk4=true,-Dbuild_gtk4=false,gtk4"
+PACKAGECONFIG[legacy] = "-Dlegacy_library=true,-Dlegacy_library=false,gtk+3"
 PACKAGES =+ "libgnome-desktop"
 RDEPENDS:${PN} += "libgnome-desktop"
 FILES:libgnome-desktop = " \
diff --git a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_46.0.bb b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_46.1.bb
index e4998f6276..6f910c4c13 100644
--- a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_46.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_46.1.bb
@@ -29,7 +29,7 @@ PACKAGECONFIG[systemd] = "-Dlogind=libsystemd,-Dlogind=none,systemd"
 PACKAGECONFIG[x11] = ",,libcanberra"
 SRC_URI:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'file://0001-gnome-disk-utility-remove-libcanberra-dependency.patch', '', d)}"
-SRC_URI[archive.sha256sum] = "464649148c6d6771f1ac2ebfe43a4e519205b11c2d914a09f2a001821d06957d"
+SRC_URI[archive.sha256sum] = "c24e9439a04d70bcfae349ca134c7005435fe2b6f452114df878bff0b89bbffe"
 EXTRA_OEMESON = "-Dman=false"
diff --git a/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer/0001-window-Fix-function-callback-definition.patch b/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer/0001-window-Fix-function-callback-definition.patch
deleted file mode 100644
index be4c002fc3..0000000000
--- a/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer/0001-window-Fix-function-callback-definition.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From ac4a07e7ef3d9d046a4ca2a803c5b649b6f7ddf4 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Sat, 8 Jul 2023 00:01:07 -0400
-Subject: [PATCH] window: Fix function callback definition
-Without this, the build fails with clang with
-CFLAGS=-Werror=incompatible-function-pointer-types
-```
-../src/font-view-window.c:864:77: error: incompatible function pointer types passing 'void (FontViewWindow *)' (aka 'void (struct _FontViewWindow *)') to parameter of type 'GtkWidgetActionActivateFunc' (aka 'void (*)(struct _GtkWidget *, const char *, struct _GVariant *)') [-Wincompatible-function-pointer-types]
-  gtk_widget_class_install_action (widget_class, "win.toggle-search", NULL, action_toggle_search_cb);
-                                                                            ^~~~~~~~~~~~~~~~~~~~~~~
-/usr/include/gtk-4.0/gtk/gtkwidget.h:956:87: note: passing argument to parameter 'activate' here
-                                                         GtkWidgetActionActivateFunc  activate);
-                                                                                      ^
-```
-Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gnome-font-viewer/-/merge_requests/54]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- src/font-view-window.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-diff --git a/src/font-view-window.c b/src/font-view-window.c
-index 639ac33..24461f7 100644
--- a/src/font-view-window.c
-+++ b/src/font-view-window.c
-@@ -758,8 +758,11 @@ font_view_window_show_overview (FontViewWindow *self)
- }
- 
- static void
-action_toggle_search_cb (FontViewWindow *self)
-+action_toggle_search_cb (GtkWidget  *widget,
-+                         const char *action_name,
-+                         GVariant   *parameter)
- {
-+  FontViewWindow *self = FONT_VIEW_WINDOW (widget);
- 
-  gtk_toggle_button_set_active (self->search_button,
-                                !gtk_toggle_button_get_active (self->search_button));
-- 
-2.45.1
diff --git a/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_46.0.bb b/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_48.0.bb
index ccf8262dcd..e8d51a12df 100644
--- a/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_46.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_48.0.bb
@@ -15,8 +15,7 @@ inherit gnomebase gtk-icon-cache gettext features_check mime-xdg
 REQUIRED_DISTRO_FEATURES = "x11 opengl"
-SRC_URI += "file://0001-window-Fix-function-callback-definition.patch"
+SRC_URI[archive.sha256sum] = "732624231b624ff5c7ac03a8ce71be12393daa53551d11550b20d7b0a3a872a7"
-SRC_URI[archive.sha256sum] = "592f401e485d02cc044d487bb5c8e04c961da6856216768a59f1ff98bd2d537c"
 FILES:${PN} += " \
    ${datadir}/dbus-1 \
diff --git a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_46.1.bb b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_46.2.bb
index 8df3710e6a..e173199088 100644
--- a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_46.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_46.2.bb
@@ -22,7 +22,7 @@ inherit gnomebase gsettings features_check gettext
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
-SRC_URI[archive.sha256sum] = "b1d3ae9132ff2f8b3f25a190790892968e3d0acf952a487e40f644a8550ce3f6"
+SRC_URI[archive.sha256sum] = "bf26c966b8a8b7f3285ecc8bb3e467b9c20f9535b94dc451c9c559ddcff61925"
 SRC_URI += " \
    file://0001-Set-paths-to-ssh-agent-and-ssh-add-by-configure-opti.patch \
    file://musl.patch \
diff --git a/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.50.2.bb b/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.54.3.bb
index adce70770f..98e67ad957 100644
--- a/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.50.2.bb
+++ b/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.54.3.bb
@@ -3,12 +3,12 @@ LICENSE = "LGPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=34c88b124db5fb2762c1676be7dadd36"
 GTKIC_VERSION = "4"
-inherit gnomebase gsettings gobject-introspection gtk-icon-cache mime-xdg vala features_check
+inherit gnomebase gsettings gobject-introspection gi-docgen gtk-icon-cache mime-xdg vala features_check
 REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'goabackend', 'opengl', '', d)}"
-DEPENDS += "gdk-pixbuf dbus glib-2.0 gcr"
+DEPENDS += "gdk-pixbuf dbus glib-2.0 gcr keyutils"
-SRC_URI[archive.sha256sum] = "df16ad975d139c6bfc4ebb2ec8bb8327297a791ef2bf0b977c78076af5faa98e"
+SRC_URI[archive.sha256sum] = "bcf655dd1ddc22bc25793b6840da19f5cad7ba0b7227ff969ed9c252f036aac5"
 PACKAGECONFIG ?= "goabackend kerberos owncloud google windows_live"
@@ -18,11 +18,14 @@ PACKAGECONFIG[exchange] = "-Dexchange=true, -Dexchange=false"
 PACKAGECONFIG[google] = "-Dgoogle=true, -Dgoogle=false"
 PACKAGECONFIG[owncloud] = "-Downcloud=true, -Downcloud=false"
 PACKAGECONFIG[windows_live] = "-Dwindows_live=true, -Dwindows_live=false"
+PACKAGECONFIG[man] = "-Dman=true, -Dman=false,libxslt-native docbook-xsl-stylesheets-native"
 FILES:${PN} += " \
    ${datadir}/dbus-1 \
    ${libdir}/goa-1.0/web-extensions/*.so \
 "
+GIDOCGEN_MESON_OPTION = 'documentation'
 # looked into pkg-config file: it is not a bug - they mean it
 FILES:${PN}-dev += "${libdir}/goa-1.0/include"
diff --git a/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_44.0.bb b/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_44.0.bb
index 4b05e52ca0..81c3c65a48 100644
--- a/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_44.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_44.0.bb
@@ -16,13 +16,14 @@ DEPENDS = " \
    gexiv2 \
    gnome-online-accounts \
    gsettings-desktop-schemas \
+    itstool-native \
    libdazzle \
-    tracker \
+    tinysparql \
    libhandy \
    libportal \
 "
-RDEPENDS:${PN} = "tracker-miners"
+RDEPENDS:${PN} = "localsearch"
 inherit gnomebase gettext gnome-help features_check
diff --git a/meta-gnome/recipes-gnome/gnome-session/gnome-session_46.0.bb b/meta-gnome/recipes-gnome/gnome-session/gnome-session_47.0.1.bb
index 94e639456f..3bb1cb1651 100644
--- a/meta-gnome/recipes-gnome/gnome-session/gnome-session_46.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-session/gnome-session_47.0.1.bb
@@ -19,7 +19,8 @@ inherit gnomebase gettext gsettings upstream-version-is-even features_check
 REQUIRED_DISTRO_FEATURES = "polkit systemd pam gobject-introspection-data"
-SRC_URI[archive.sha256sum] = "c6e1624af6090bc4e1a191fe2268abfa7a8de07831ca7a57f217e679bf7b9a54"
+SRC_URI = "https://download.gnome.org/sources/gnome-session/${@oe.utils.trim_version('${PV}', 1)}/gnome-session-${PV}.tar.xz"
+SRC_URI[sha256sum] = "56ae9c68e49995793eb2096bcdc4533b111669e1e54c8b6e0b1d952f6a5e8a70"
 PACKAGECONFIG ??= ""
diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_46.0.bb b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_48.0.bb
index d409e77eae..9a2948d432 100644
--- a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_46.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_48.0.bb
@@ -24,7 +24,7 @@ DEPENDS = " \
 REQUIRED_DISTRO_FEATURES = "x11 polkit pulseaudio systemd gobject-introspection-data"
 GIR_MESON_OPTION = ""
-SRC_URI[archive.sha256sum] = "0b9a0f64fa18a8e7e09b4c95a3f754fa033c2cdbd2dc35701f0618572c1cb3d7"
+SRC_URI[archive.sha256sum] = "f3da20ab4a2ba56fd3e97b991f2bc267973d5619bd58bfa516410aa036305e45"
 PACKAGECONFIG ??= " \
    cups nm \
diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_46.2.bb b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_48.0.bb
index 5c2ae05936..f2f3e8654d 100644
--- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_46.2.bb
+++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_48.0.bb
@@ -6,7 +6,7 @@ inherit gnomebase gettext gsettings features_check
 REQUIRED_DISTRO_FEATURES = "x11 polkit systemd pam gobject-introspection-data"
-SRC_URI[archive.sha256sum] = "d442e9d26925125ff215a5c134290495655380741daafbb37a3a99d6f0c7d86f"
+SRC_URI[archive.sha256sum] = "f301b5e7354d5adc01c8bb21793810074e1ea408de45300f767d104454db3e33"
 EXTRA_OEMESON += " \
    -Dextension_set=all \
diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch
deleted file mode 100644
index 8ef0da16fe..0000000000
--- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From e9835f650d70bf22ad0e5d8c2179aa01b2d18955 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Thu, 28 Oct 2021 18:57:24 +0200
-Subject: [PATCH] Introduce options 'gjs_path' to optionally set path to gjs
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-Upstream-Status: Pending
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
- js/dbusServices/meson.build                  | 2 +-
- meson.build                                  | 6 +++++-
- meson_options.txt                            | 6 ++++++
- subprojects/extensions-app/js/meson.build    | 2 +-
- subprojects/extensions-app/meson.build       | 7 ++++++-
- subprojects/extensions-app/meson_options.txt | 6 ++++++
- 6 files changed, 25 insertions(+), 4 deletions(-)
-diff --git a/js/dbusServices/meson.build b/js/dbusServices/meson.build
-index 48b7f89..700b590 100644
--- a/js/dbusServices/meson.build
-+++ b/js/dbusServices/meson.build
-@@ -22,7 +22,7 @@ foreach service, dir : dbus_services
- 
-   serviceconf = configuration_data()
-   serviceconf.set('service', service)
-  serviceconf.set('gjs', gjs.full_path())
-+  serviceconf.set('gjs', gjs)
-   serviceconf.set('pkgdatadir', pkgdatadir)
- 
-   configure_file(
-diff --git a/meson.build b/meson.build
-index a6d83b1..2c612a8 100644
--- a/meson.build
-+++ b/meson.build
-@@ -134,7 +134,11 @@ endif
- 
- mutter_typelibdir = mutter_dep.get_variable('typelibdir')
- python = find_program('python3')
-gjs = find_program('gjs')
-+if get_option('gjs_path') == ''
-+  gjs = find_program('gjs')
-+else
-+  gjs = get_option('gjs_path')
-+endif
- 
- cc = meson.get_compiler('c')
- 
-diff --git a/meson_options.txt b/meson_options.txt
-index 6e83d92..1bf0ecb 100644
--- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -45,3 +45,9 @@ option('systemd',
-   value: true,
-   description: 'Enable systemd integration'
- )
-+
-+option('gjs_path',
-+  type: 'string',
-+  value: '',
-+  description: 'Instead of searching gjs executable, configure path'
-+)
-diff --git a/subprojects/extensions-app/js/meson.build b/subprojects/extensions-app/js/meson.build
-index c9a67f8..91ae887 100644
--- a/subprojects/extensions-app/js/meson.build
-+++ b/subprojects/extensions-app/js/meson.build
-@@ -9,7 +9,7 @@ endif
- launcherconf.set('prefix', prefix)
- launcherconf.set('libdir', libdir)
- launcherconf.set('pkgdatadir', pkgdatadir)
-launcherconf.set('gjs', gjs.full_path())
-+launcherconf.set('gjs', gjs)
- 
- configure_file(
-   input: prgname + '.in',
-diff --git a/subprojects/extensions-app/meson.build b/subprojects/extensions-app/meson.build
-index 45f391b..d581408 100644
--- a/subprojects/extensions-app/meson.build
-+++ b/subprojects/extensions-app/meson.build
-@@ -47,7 +47,12 @@ metainfodir = join_paths(datadir, 'metainfo')
- schemadir = join_paths(datadir, 'glib-2.0', 'schemas')
- servicedir = join_paths(datadir, 'dbus-1', 'services')
- 
-gjs = find_program('gjs')
-+if get_option('gjs_path') == ''
-+  gjs = find_program('gjs')
-+else
-+  gjs = get_option('gjs_path')
-+endif
-+
- appstream_util = find_program('appstream-util', required: false)
- appstreamcli = find_program('appstreamcli', required: false)
- desktop_file_validate = find_program('desktop-file-validate', required: false)
-diff --git a/subprojects/extensions-app/meson_options.txt b/subprojects/extensions-app/meson_options.txt
-index ca2eb41..2787785 100644
--- a/subprojects/extensions-app/meson_options.txt
-+++ b/subprojects/extensions-app/meson_options.txt
-@@ -10,3 +10,9 @@ option('profile',
-   ],
-   value: 'default'
- )
-+
-+option('gjs_path',
-+  type: 'string',
-+  value: '',
-+  description: 'Instead of searching gjs executable, configure path'
-+)
diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_46.2.bb b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_48.0.bb
index 0a52de7a3b..1a0f89b6fc 100644
--- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_46.2.bb
+++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_48.0.bb
@@ -13,6 +13,7 @@ DEPENDS = " \
    gjs \
    gnome-autoar \
    gnome-desktop \
+    gnome-control-center \
    polkit \
    pipewire \
    libsoup-3.0 \
@@ -32,21 +33,26 @@ GIR_MESON_OPTION = ""
 # gobject-introspection is mandatory and cannot be configured
 REQUIRED_DISTRO_FEATURES += "gobject-introspection-data"
-SRC_URI[archive.sha256sum] = "6b587101c04bfb364ab09cd38b5d93ebeeb4254754c807cf712fbc8ee3fde238"
+SRC_URI[archive.sha256sum] = "36aac2edcdc7588aaadb658cd4687df262b37ba0b667102dcbefbff0c2232bc3"
-SRC_URI += "file://0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch"
 PACKAGECONFIG ??= "bluetooth nm ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
 PACKAGECONFIG[bluetooth] = ",,gnome-bluetooth"
 PACKAGECONFIG[nm] = "-Dnetworkmanager=true, -Dnetworkmanager=false,networkmanager libsecret,networkmanager"
 PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=false, systemd"
-EXTRA_OEMESON = " \
+EXTRA_OEMESON += " \
-    -Dgjs_path=${bindir}/gjs \
-    -Dextensions-app:gjs_path=${bindir}/gjs \
    -Dtests=false \
    -Dman=false \
+    --cross-file=${WORKDIR}/meson-${PN}.cross \
 "
+do_write_config:append() {
+    cat >${WORKDIR}/meson-${PN}.cross <<EOF
+[binaries]
+gjs = '${bindir}/gjs'
+EOF
+}
 do_install:append() {
    # fix shebangs
    for tool in `find ${D}${bindir} -name '*-tool'`; do
@@ -61,6 +67,7 @@ FILES:${PN} += " \
    ${datadir}/dbus-1 \
    ${datadir}/gnome-control-center \
    ${datadir}/xdg-desktop-portal \
+    ${datadir}/desktop-directories \
    ${systemd_user_unitdir} \
 "
diff --git a/meta-gnome/recipes-gnome/gnome-software/gnome-software_46.2.bb b/meta-gnome/recipes-gnome/gnome-software/gnome-software_48.2.bb
index 244941786b..00efac5b4f 100644
--- a/meta-gnome/recipes-gnome/gnome-software/gnome-software_46.2.bb
+++ b/meta-gnome/recipes-gnome/gnome-software/gnome-software_48.2.bb
@@ -26,9 +26,9 @@ DEPENDS += " \
 RDEPENDS:${PN} = "iso-codes"
-EXTRA_OEMESON += "-Dtests=false -Dsoup2=false"
+EXTRA_OEMESON += "-Dtests=false"
-SRC_URI[archive.sha256sum] = "e700cba287764f5e2255514e312e160550fdbf7a5d3fe16358bb6f7b6732b974"
+SRC_URI[archive.sha256sum] = "abfd30643a86c65f4886b6765eb3bb6215c9ea09817d6bd165c50056890822c9"
 PACKAGECONFIG ?= "flatpak"
 PACKAGECONFIG[flatpak] = "-Dflatpak=true,-Dflatpak=false,flatpak ostree"
diff --git a/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_46.0.bb b/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_48.1.bb
index eaeaa2cb0f..db07eaa27a 100644
--- a/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_46.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_48.1.bb
@@ -3,6 +3,7 @@ LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 DEPENDS = " \
+    catch2 \
    gnome-common-native \
    libxml2-native \
    glib-2.0-native \
@@ -22,10 +23,7 @@ inherit gnomebase gsettings gnome-help itstool gtk-icon-cache features_check get
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
 REQUIRED_DISTRO_FEATURES = "polkit"
-def gnome_verdir(v):
+SRC_URI[archive.sha256sum] = "133c3a6e286366e659fd2d80582409a7bd5edae456e63c4f69ccf66ed6fc6638"
-    return oe.utils.trim_version(v, 1)
-SRC_URI[archive.sha256sum] = "5376248158c686c308255472e8c2a9e4c17255642c149fc7198c6d034e547599"
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
 PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=false, systemd"
diff --git a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal/0001-meson-add-option-to-set-dbus_interfacedir.patch b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal/0001-meson-add-option-to-set-dbus_interfacedir.patch
deleted file mode 100644
index 9f8475bdd2..0000000000
--- a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal/0001-meson-add-option-to-set-dbus_interfacedir.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 61668e1eb86a316d4ad9a6b9cacf8c8cc74a0c33 Mon Sep 17 00:00:00 2001
-From: Markus Volk <f_l_k@t-online.de>
-Date: Sun, 7 Jan 2024 10:40:31 +0100
-Subject: [PATCH] meson: add an option to set dbus_interface_dir
-Add an option that allows to set the dbus_interface_dir path manually.
-This will help to cross-compile gnome-terminal on host systems that
-don't have gnome-shell installed.
-Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gnome-terminal/-/issues/8046]
-Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
- meson_options.txt | 7 +++++++
- src/meson.build   | 7 ++++++-
- 2 files changed, 13 insertions(+), 1 deletion(-)
-diff --git a/meson_options.txt b/meson_options.txt
-index b555ab66..8fece058 100644
--- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -13,6 +13,13 @@
- # You should have received a copy of the GNU General Public License
- # along with this programme.  If not, see <https://www.gnu.org/licenses/>.
- 
-+option(
-+  'dbus_interface_dir',
-+  type: 'string',
-+  value: '',
-+  description: 'directory for D-Bus session interface files [$datadir/dbus-1/interfaces]',
-+)
-+
- option(
-   'dbg',
-   type: 'boolean',
-diff --git a/src/meson.build b/src/meson.build
-index 27ecd893..420ad45c 100644
--- a/src/meson.build
-+++ b/src/meson.build
-@@ -185,6 +185,11 @@ server_sources = app_sources + client_util_sources + debug_sources + dbus_source
- 
- if get_option('search_provider')
- 
-+  dbus_interface_dir = get_option('dbus_interface_dir')
-+  if dbus_interface_dir == ''
-+    dbus_interface_dir = gt_prefix / gt_dbusinterfacedir
-+  endif
-+
-   server_sources += files(
-     'terminal-search-provider.cc',
-     'terminal-search-provider.hh',
-@@ -192,7 +197,7 @@ if get_option('search_provider')
- 
-   server_sources += gnome.gdbus_codegen(
-     'terminal-search-provider-gdbus-generated',
-    gt_prefix / gt_dbusinterfacedir / 'org.gnome.ShellSearchProvider2.xml',
-+    dbus_interface_dir / 'org.gnome.ShellSearchProvider2.xml',
-     autocleanup: 'none',
-     install_header: false,
-     interface_prefix: 'org.gnome.Shell',
-- 
-2.43.0
diff --git a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.50.1.bb b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.54.0.bb
index 3bbfe9ece0..332c2c5423 100644
--- a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.50.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.54.0.bb
@@ -22,14 +22,12 @@ DEPENDS = " \
 SRC_URI = " \
        git://gitlab.gnome.org/GNOME/gnome-terminal.git;protocol=https;nobranch=1 \
        file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch \
-        file://0001-meson-add-option-to-set-dbus_interfacedir.patch \
 "
-SRCREV = "5ac3b8e4bd6fa02651b3c23cedb0a7e1cd769655"
+SRCREV = "965cb9307713c618253918633416fcad86bcc5d2"
-S = "${WORKDIR}/git"
 PACKAGECONFIG ?= ""
 PACKAGECONFIG[nautilus] = "-Dnautilus_extension=true,-Dnautilus_extension=false,nautilus,nautilus"
-PACKAGECONFIG[search_provider] = "-Dsearch_provider=true -Ddbus_interface_dir=${STAGING_DATADIR}/dbus-1/interfaces,-Dsearch_provider=false,gnome-shell"
+PACKAGECONFIG[search_provider] = "-Dsearch_provider=true,-Dsearch_provider=false,gnome-shell"
 PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
diff --git a/meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_46.3.bb b/meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_48.1.bb
index 1e3268238b..317d082940 100644
--- a/meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_46.3.bb
+++ b/meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_48.1.bb
@@ -9,7 +9,7 @@ DEPENDS = " \
    gtk4 \
    gtksourceview5 \
    editorconfig-core-c \
-    enchant2 \
+    libspelling \
 "
 GTKIC_VERSION = "4"
@@ -18,7 +18,7 @@ inherit gnomebase gtk-icon-cache itstool gnome-help mime-xdg features_check
 REQUIRED_DISTRO_FEATURES = "opengl"
-SRC_URI[archive.sha256sum] = "005b48104a909be66ae07448d2bc5706c7d113781057a24ff6da55bdf324c73d"
+SRC_URI[archive.sha256sum] = "52089ba978a665841803b1b69e0e7be75b09a7d54e01e8d0bb29926e0f342437"
 FILES:${PN} += " \
    ${datadir}/metainfo \
diff --git a/meta-gnome/recipes-gnome/gnome-user-share/gnome-user-share/0001-build-Define-list-of-libc-feature-test-macros.patch b/meta-gnome/recipes-gnome/gnome-user-share/gnome-user-share/0001-build-Define-list-of-libc-feature-test-macros.patch
new file mode 100644
index 0000000000..fbbda824e3
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-user-share/gnome-user-share/0001-build-Define-list-of-libc-feature-test-macros.patch
@@ -0,0 +1,41 @@
+From 5f2e3fb82055ee1346eaa20fcca640fc802ae1c5 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 24 Sep 2024 03:19:24 +0000
+Subject: [PATCH] build: Define list of libc feature test macros
+_POSIX_C_SOURCE is needed since it uses kill() API
+and as per [1] it need it, without this the build fails
+particularly on musl systems with clang compiler
+./git/src/http.c:394:3: error: call to undeclared function 'kill'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
+[1] https://man7.org/linux/man-pages/man2/kill.2.html
+Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gnome-user-share/-/merge_requests/27]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ meson.build | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+diff --git a/meson.build b/meson.build
+index ea2892e..72f3851 100644
+--- a/meson.build
+++ b/meson.build
+@@ -39,6 +39,17 @@ config_h.set_quoted('GNOMELOCALEDIR', user_share_prefix / user_share_localedir)
+ 
+ config_h.set_quoted('HTTPD_CONFIG_TEMPLATE', user_share_prefix / user_share_pkgdatadir / 'dav_user_%s.conf')
+ 
+#
+# OS/Compiler feature detection
+#
+feature_defines = [
+  ['_XOPEN_SOURCE', '700'], # POSIX.1–2001 (IEEE Std 1003.1-2001)
+]
+
+foreach f: feature_defines
+  config_h.set(f[0], f[1])
+endforeach
+
+ # compiler flags
+ common_flags = []
+ if get_option('buildtype').contains('debug')
diff --git a/meta-gnome/recipes-gnome/gnome-user-share/gnome-user-share_43.0.bb b/meta-gnome/recipes-gnome/gnome-user-share/gnome-user-share_47.0.bb
index 6fc78dd296..3b087c148d 100644
--- a/meta-gnome/recipes-gnome/gnome-user-share/gnome-user-share_43.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-user-share/gnome-user-share_47.0.bb
@@ -1,5 +1,5 @@
 SUMMARY = "This is gnome-user-share 43.0, a system for easy sharing of user files."
-LICENSE="GPL-2.0-only"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
@@ -14,8 +14,8 @@ inherit gnomebase gsettings features_check
 REQUIRED_DISTRO_FEATURES = "systemd"
 SRC_URI = "git://gitlab.gnome.org/GNOME/gnome-user-share.git;protocol=https;branch=master"
-SRCREV = "a0e790aa9494db9d1b1f48b4fc0d2f78e112044d"
+SRC_URI += "file://0001-build-Define-list-of-libc-feature-test-macros.patch"
-S = "${WORKDIR}/git"
+SRCREV = "77ecbaddab0ed2121859926acbfccc9cecdee0db"
 PACKAGECONFIG ??= "modules"
 PACKAGECONFIG[httpd] = "-Dhttpd=${sbindir}/httpd,,,apache2 mod-dnssd"
diff --git a/meta-gnome/recipes-gnome/grilo/grilo-plugins_0.3.16.bb b/meta-gnome/recipes-gnome/grilo/grilo-plugins_0.3.16.bb
index 40603993f3..a1d2262cae 100644
--- a/meta-gnome/recipes-gnome/grilo/grilo-plugins_0.3.16.bb
+++ b/meta-gnome/recipes-gnome/grilo/grilo-plugins_0.3.16.bb
@@ -7,17 +7,19 @@ DEPENDS = " \
    gperf-native \
    itstool-native \
    grilo \
-    lua \
    liboauth \
 "
 inherit gnomebase gnome-help vala
 SRC_URI += "file://0001-Avoid-running-trackertestutils.patch"
 SRC_URI[archive.sha256sum] = "fe6f4dbe586c6b8ba2406394e202f22d009d642a96eb3a54f32f6a21d084cdcb"
-PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'gobject-introspection-data', 'tracker', '', d)}"
+# gnome-online-accounts requires opengl by default, so lua-factory PACKAGECONFIG relies on opengl by default.
-PACKAGECONFIG[tracker] = "-Denable-tracker3=yes,-Denable-tracker3=no,tracker"
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'gobject-introspection-data', 'tracker', '', d)} \
+                   ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'lua-factory', '', d)} \
+                   "
+PACKAGECONFIG[tracker] = "-Denable-tracker3=yes,-Denable-tracker3=no,tinysparql,localsearch"
+PACKAGECONFIG[lua-factory] = "-Denable-lua-factory=yes,-Denable-lua-factory=no,lua libarchive json-glib gnome-online-accounts"
 FILES:${PN} += "${libdir}/grilo-0.3"
diff --git a/meta-gnome/recipes-gnome/grilo/grilo_0.3.16.bb b/meta-gnome/recipes-gnome/grilo/grilo_0.3.16.bb
index 14e1ca9fe1..7862748184 100644
--- a/meta-gnome/recipes-gnome/grilo/grilo_0.3.16.bb
+++ b/meta-gnome/recipes-gnome/grilo/grilo_0.3.16.bb
@@ -1,4 +1,4 @@
-SUMMARY = "Grilo is a framework forsearching media content from various sources"
+SUMMARY = "Grilo is a framework for searching media content from various sources"
 LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
@@ -7,7 +7,6 @@ DEPENDS = " \
    glib-2.0 \
 "
 inherit gnomebase gobject-introspection gtk-doc gettext vala
 SRC_URI[archive.sha256sum] = "884580e8c5ece280df23aa63ff5234b7d48988a404df7d6bfccd1e77b473bd96"
@@ -15,8 +14,6 @@ SRC_URI[archive.sha256sum] = "884580e8c5ece280df23aa63ff5234b7d48988a404df7d6bfc
 GIR_MESON_OPTION = "enable-introspection"
 GTKDOC_MESON_OPTION = "enable-gtk-doc"
-# Note: removing 'net' from PACKAGECONFIG causes
-# | bindings/vala/meson.build:15:0: ERROR: Unknown variable "grlnet_gir".
 PACKAGECONFIG ??= "net"
 PACKAGECONFIG[net] = "-Denable-grl-net=true, -Denable-grl-net=false, libsoup-3.0"
@@ -26,5 +23,16 @@ PACKAGECONFIG[test-ui] = "-Denable-test-ui=true, -Denable-test-ui=false, gtk+3 l
 EXTRA_OEMESON = "-Denable-grl-pls=false"
 do_compile:append() {
-        sed -i -e 's,${B}/../,,' ${B}/src/grl-type-builtins.h
+    # grl-type-builtins.* are generated by glib-mkenums which leave full paths
+    # in comment and #include directives. Rewrite those before *-src packaging.
+    # Path can be relative to B or WORKDIR in devtool modify
+    for base in ${B} ${WORKDIR} ; do 
+        relpath="$(realpath --relative-to="$base" "${S}")"
+        sed -i -e "s,$base/$relpath/src/,," \
+            ${B}/src/grl-type-builtins.h \
+            ${B}/src/grl-type-builtins.c
+    done
 }
+FILES:${PN} += "${libdir}/girepository-1.0"
diff --git a/meta-gnome/recipes-gnome/gthumb/gthumb_3.12.4.bb b/meta-gnome/recipes-gnome/gthumb/gthumb_3.12.4.bb
deleted file mode 100644
index 79db8b7d75..0000000000
--- a/meta-gnome/recipes-gnome/gthumb/gthumb_3.12.4.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-SUMMARY = "Image viewer and browser"
-LICENSE="GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
-REQUIRED_DISTRO_FEATURES = "polkit gobject-introspection-data"
-DEPENDS = " \
-    glib-2.0-native \
-    bison-native \
-    yelp-tools-native \
-    gtk+3 \
-    gsettings-desktop-schemas \
-    zlib \
-    jpeg \
-    exiv2 \
-    colord \
-    lcms \
-    libraw \
-    librsvg \
-    libsoup \
-    json-glib \
-    libsecret \
-"
-inherit features_check gnomebase gnome-help gsettings itstool mime-xdg
-SRC_URI[archive.sha256sum] = "add693ac0aeb9a30d829ba03a06208289d3f6868dc3b02573549e88190c794e8"
-FILES:${PN} += "${datadir}/metainfo"
diff --git a/meta-gnome/recipes-gnome/gthumb/gthumb_3.12.7.bb b/meta-gnome/recipes-gnome/gthumb/gthumb_3.12.7.bb
new file mode 100644
index 0000000000..8e82b86285
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gthumb/gthumb_3.12.7.bb
@@ -0,0 +1,33 @@
+SUMMARY = "Image viewer and browser"
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
+DEPENDS = " \
+    glib-2.0 \
+    glib-2.0-native \
+    bison-native \
+    gtk+3 \
+    gsettings-desktop-schemas \
+    zlib \
+    jpeg \
+    json-glib \
+"
+PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'colord', '', d)} exiv2 gstreamer lcms libjxl libraw librsvg libwebp"
+PACKAGECONFIG[gstreamer] = "-Dgstreamer=true,-Dgstreamer=false,gstreamer1.0 gstreamer1.0-plugins-base"
+PACKAGECONFIG[libwebp] = "-Dlibwebp=true,-Dlibwebp=false,libwebp"
+PACKAGECONFIG[libjxl] = "-Dlibjxl=true,-Dlibjxl=false,libjxl"
+PACKAGECONFIG[lcms] = "-Dlcms2=true,-Dlcms2=false,lcms"
+PACKAGECONFIG[colord] = "-Dcolord=true,-Dcolord=false,colord"
+PACKAGECONFIG[exiv2] = "-Dexiv2=true,-Dexiv2=false,exiv2"
+PACKAGECONFIG[librsvg] = "-Dlibrsvg=true,-Dlibrsvg=false,librsvg"
+PACKAGECONFIG[libraw] = "-Dlibraw=true,-Dlibraw=false,libraw"
+# webservices would require libsecret and webkitgtk3 built with deprecated libsoup2
+EXTRA_OEMESON += "-Dwebservices=false -Dlibsecret=false"
+inherit gnomebase gnome-help gsettings itstool mime-xdg
+SRC_URI[archive.sha256sum] = "ee12d24cf231010241f758d6c95b9d53a7381278fa76b6a518b3d09b371efaec"
+FILES:${PN} += "${datadir}/metainfo"
diff --git a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light_1.0.bb b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light_1.0.bb
index 9d46b43c42..cefb975890 100644
--- a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light_1.0.bb
+++ b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light_1.0.bb
@@ -6,8 +6,7 @@ inherit allarch
 SRC_URI = "file://classic-light.xml"
-S = "${WORKDIR}/sources"
+S = "${UNPACKDIR}"
-UNPACKDIR = "${S}"
 do_install() {
    install -d ${D}${datadir}/gtksourceview-3.0/styles
diff --git a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.11.bb b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.11.bb
index 0ab9b14692..baf4c33d38 100644
--- a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.11.bb
+++ b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.11.bb
@@ -8,7 +8,7 @@ DEPENDS = "gtk+3 libxml2 glib-2.0-native"
 PNAME = "gtksourceview"
-S = "${WORKDIR}/${PNAME}-${PV}"
+S = "${UNPACKDIR}/${PNAME}-${PV}"
 GNOMEBASEBUILDCLASS = "autotools"
 inherit gnomebase lib_package gettext features_check gtk-doc gobject-introspection upstream-version-is-even
@@ -18,8 +18,7 @@ REQUIRED_DISTRO_FEATURES = "x11"
 EXTRA_OECONF += "--disable-glade-catalog --disable-gtk-doc --disable-Werror"
 CFLAGS += "-Wno-error=incompatible-pointer-types"
-SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtksourceview/3.24/${PNAME}-${PV}.tar.xz"
+SRC_URI = "${GNOME_MIRROR}/gtksourceview/3.24/${PNAME}-${PV}.tar.xz"
-SRC_URI[md5sum] = "b748da426a7d64e1304f0c532b0f2a67"
 SRC_URI[sha256sum] = "691b074a37b2a307f7f48edc5b8c7afa7301709be56378ccf9cc9735909077fd"
 FILES:${PN} += " ${datadir}/gtksourceview-3.0"
diff --git a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.8.4.bb b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.8.4.bb
index 38ca4a39e6..b9ff4ef459 100644
--- a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.8.4.bb
+++ b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.8.4.bb
@@ -8,13 +8,13 @@ DEPENDS = "gtk+3 libxml2 glib-2.0-native"
 PNAME = "gtksourceview"
-S = "${WORKDIR}/${PNAME}-${PV}"
+S = "${UNPACKDIR}/${PNAME}-${PV}"
 inherit gnomebase lib_package gettext features_check gtk-doc gobject-introspection vala
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
-SRC_URI = "https://download.gnome.org/sources/gtksourceview/4.8/${PNAME}-${PV}.tar.xz \
+SRC_URI = "${GNOME_MIRROR}/gtksourceview/4.8/${PNAME}-${PV}.tar.xz \
           file://0001-remove-pointless-check.patch"
 SRC_URI[sha256sum] = "7ec9d18fb283d1f84a3a3eff3b7a72b09a10c9c006597b3fbabbb5958420a87d"
diff --git a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.12.0.bb b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.16.0.bb
index f3267acbeb..7076214a4d 100644
--- a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.12.0.bb
+++ b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.16.0.bb
@@ -16,15 +16,15 @@ DEPENDS = " \
 PNAME = "gtksourceview"
-S = "${WORKDIR}/${PNAME}-${PV}"
+S = "${UNPACKDIR}/${PNAME}-${PV}"
 inherit gnomebase lib_package gettext features_check gi-docgen gtk-icon-cache gobject-introspection vala
 REQUIRED_DISTRO_FEATURES = "opengl"
-SRC_URI = "https://download.gnome.org/sources/gtksourceview/5.12/${PNAME}-${PV}.tar.xz"
+SRC_URI = "${GNOME_MIRROR}/gtksourceview/5.16/${PNAME}-${PV}.tar.xz"
-SRC_URI[sha256sum] = "daf32ff5d3150d6385917d3503a85b9e047ba158b2b03079314c9c00813fa01f"
+SRC_URI[sha256sum] = "ab35d420102f3e8b055dd3b8642d3a48209f888189e6254d0ffb4b6a7e8c3566"
 GIR_MESON_ENABLE_FLAG = 'enabled'
 GIR_MESON_DISABLE_FLAG = 'disabled'
diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs_1.54.0.bb b/meta-gnome/recipes-gnome/gvfs/gvfs_1.57.2.bb
index 01cdb4eef5..72afefb275 100644
--- a/meta-gnome/recipes-gnome/gvfs/gvfs_1.54.0.bb
+++ b/meta-gnome/recipes-gnome/gvfs/gvfs_1.57.2.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "gvfs is a userspace virtual filesystem"
 LICENSE = "LGPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=05df38dd77c35ec8431f212410a3329e"
-inherit gnomebase gsettings bash-completion gettext upstream-version-is-even features_check useradd
+inherit gnomebase gsettings bash-completion gettext upstream-version-is-even features_check
 DEPENDS += "\
    dbus \
@@ -18,8 +18,7 @@ DEPENDS += "\
 RDEPENDS:${PN} += "gsettings-desktop-schemas"
 SRC_URI = "https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive"
+SRC_URI[archive.sha256sum] = "f16bef8eca1fd6c117e85db011d21e915669790d55867349c5f1b291299e9585"
-SRC_URI[archive.sha256sum] = "f53d81df86c2e86cdd25182c2d8a669a22371e83623ded1b9d5416dcfc6de366"
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
@@ -77,16 +76,7 @@ PACKAGECONFIG[fuse] = "-Dfuse=true, -Dfuse=false, fuse3"
 # libcdio-paranoia recipe doesn't exist yet
 PACKAGECONFIG[cdda] = "-Dcdda=true, -Dcdda=false, libcdio-paranoia"
-USERADD_PACKAGES = "${PN}"
-USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd"
 do_install:append() {
-    if ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'true', 'false', d)}; then
-        # Fix up permissions on polkit rules.d to work with rpm4 constraints
-        chmod 700 ${D}${datadir}/polkit-1/rules.d
-        chown polkitd:root ${D}${datadir}/polkit-1/rules.d
-    fi
    # After rebuilds (not from scracth) it can happen that the executables in
    # libexec ar missing executable permission flag. Not sure but it came up
    # during transition to meson. Looked into build files and logs but could
diff --git a/meta-gnome/recipes-gnome/libchamplain/libchamplain_0.12.21.bb b/meta-gnome/recipes-gnome/libchamplain/libchamplain_0.12.21.bb
index a89ab8cc74..b7c587d25f 100644
--- a/meta-gnome/recipes-gnome/libchamplain/libchamplain_0.12.21.bb
+++ b/meta-gnome/recipes-gnome/libchamplain/libchamplain_0.12.21.bb
@@ -10,5 +10,4 @@ REQUIRED_DISTRO_FEATURES = "opengl"
 SRCREV = "941560af497148588783db991e8135f52a82574d"
 SRC_URI = "git://github.com/gnome/libchamplain.git;branch=master;protocol=https"
-S = "${WORKDIR}/git"
diff --git a/meta-gnome/recipes-gnome/libdex/libdex_0.10.0.bb b/meta-gnome/recipes-gnome/libdex/libdex_0.10.0.bb
new file mode 100644
index 0000000000..17471a3b5c
--- /dev/null
+++ b/meta-gnome/recipes-gnome/libdex/libdex_0.10.0.bb
@@ -0,0 +1,19 @@
+LICENSE = "LGPL-2.1-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
+GNOMEBASEBUILDCLASS = "meson"
+inherit features_check gnomebase upstream-version-is-even gobject-introspection
+DEPENDS += " \
+    glib-2.0 \
+"
+DEPENDS:append:libc-musl = " libucontext"
+LDFLAGS:append:libc-musl = " -lucontext"
+SRC_URI[archive.sha256sum] = "98a69626aa7646ad455bea7a7f92d2a1ffa47e4559a154a1bfe98c16fa711ee1"
+PACKAGECONFIG ?= ""
+EXTRA_OEMESON += "-Dintrospection=enabled -Dvapi=false"
+REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
diff --git a/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.52.bb b/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.53.bb
index 7e1842b1ac..b0df3a64b6 100644
--- a/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.52.bb
+++ b/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.53.bb
@@ -4,13 +4,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=61464cfe342798eeced82efe9ae55f63"
 SECTION = "libs"
-DEPENDS= "libxml2 bzip2 glib-2.0 zlib"
+DEPENDS = "libxml2 bzip2 glib-2.0 zlib"
 GNOMEBASEBUILDCLASS = "autotools"
 inherit gnomebase gobject-introspection gettext gtk-doc
-SRC_URI[archive.sha256sum] = "9181c914b9fac0e05d6bcaa34c7b552fe5fc0961d3c9f8c01ccc381fb084bcf0"
+SRC_URI[archive.sha256sum] = "0eb59a86e0c50f97ac9cfe4d8cc1969f623f2ae8c5296f2414571ff0a9e8bcba"
-SRC_URI += "file://0001-configure.ac-drop-a-copy-paste-of-introspection.m4-m.patch"
+SRC_URI += " file://0001-configure.ac-drop-a-copy-paste-of-introspection.m4-m.patch"
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[gdk-pixbuf] = "--with-gdk-pixbuf,--without-gdk-pixbuf,gdk-pixbuf"
diff --git a/meta-gnome/recipes-gnome/libgweather/libgweather4_4.4.2.bb b/meta-gnome/recipes-gnome/libgweather/libgweather4_4.4.4.bb
index e0c8724a31..3d8a5ed33a 100644
--- a/meta-gnome/recipes-gnome/libgweather/libgweather4_4.4.2.bb
+++ b/meta-gnome/recipes-gnome/libgweather/libgweather4_4.4.4.bb
@@ -4,18 +4,20 @@ LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 GNOMEBN = "libgweather"
-S = "${WORKDIR}/${GNOMEBN}-${PV}"
+S = "${UNPACKDIR}/${GNOMEBN}-${PV}"
 inherit gnomebase gsettings gobject-introspection gettext gi-docgen vala features_check
 REQUIRED_DISTRO_FEATURES = "opengl"
 SRC_URI += "file://0001-Allow-building-gir-in-cross-environments.patch"
-SRC_URI[archive.sha256sum] = "a6e427b4770ada48945f3aa906af710fc833cff0d42df91f1828302740d794ec"
+SRC_URI[archive.sha256sum] = "7017677753cdf7d1fdc355e4bfcdb1eba8369793a8df24d241427a939cbf4283"
 GTKDOC_MESON_OPTION = "gtk_doc"
 VALA_MESON_OPTION = "enable_vala"
+export GI_TYPELIB_PATH = "${STAGING_LIBDIR}/girepository-1.0/"
 DEPENDS = " \
    geocode-glib \
    gtk4 \
@@ -28,7 +30,3 @@ FILES:${PN} += " \
    ${datadir}/libgweather-4 \
    ${libdir}/libgweather-4 \
 "
-do_configure:prepend() {
-    cp -f ${STAGING_LIBDIR}/girepository-1.0/GLib*typelib ${STAGING_LIBDIR_NATIVE}/girepository-1.0/
-}
diff --git a/meta-gnome/recipes-gnome/libpanel/libpanel_1.10.0.bb b/meta-gnome/recipes-gnome/libpanel/libpanel_1.10.0.bb
new file mode 100644
index 0000000000..da47288cf8
--- /dev/null
+++ b/meta-gnome/recipes-gnome/libpanel/libpanel_1.10.0.bb
@@ -0,0 +1,22 @@
+# your responsibility to verify that the values are complete and correct.
+LICENSE = "LGPL-2.1-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=3000208d539ec061b899bce1d9ce9404"
+GNOMEBASEBUILDCLASS = "meson"
+inherit gnomebase upstream-version-is-even gobject-introspection gtk-icon-cache
+DEPENDS += " \
+    glib-2.0 \
+    gtk4 \
+    libadwaita \
+"
+SRC_URI[archive.sha256sum] = "578ce512278ff2bb5eeebb55099392c52537a5abd9bd0629567f102532b38b25"
+PACKAGECONFIG ?= ""
+#EXTRA_OEMESON += "-Ddocs=disabled"
+#GTKDOC_MESON_DISABLE_FLAG = "disabled"
+EXTRA_OEMESON += "-Ddocs=disabled  -Dintrospection=enabled -Dvapi=false"
+REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
diff --git a/meta-gnome/recipes-gnome/libpeas/libpeas-1/0001-Remove-builddir-and-srcdir-paths-from-test-binaries.patch b/meta-gnome/recipes-gnome/libpeas/libpeas-1/0001-Remove-builddir-and-srcdir-paths-from-test-binaries.patch
new file mode 100644
index 0000000000..6bb48777ec
--- /dev/null
+++ b/meta-gnome/recipes-gnome/libpeas/libpeas-1/0001-Remove-builddir-and-srcdir-paths-from-test-binaries.patch
@@ -0,0 +1,82 @@
+From d798af685e9e1166400acbdab082c17b02dad85b Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 18 May 2023 23:28:10 -0700
+Subject: [PATCH] Remove builddir and srcdir paths from test binaries
+Encoding buildtime paths is not needed since if these tests are to be
+run they will be run on target where builddir structure most certainly
+wont be available.
+Fixes
+WARNING: libpeas-1.36.0-r0 do_package_qa: QA Issue: File /usr/bin/peas-demo in package libpeas-demo contains reference to TMPDIR [buildpaths]
+Upstream-Status: Inappropriate [Cross-compile specific]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ peas-demo/meson.build                 | 2 +-
+ tests/libpeas-gtk/testing/meson.build | 4 ++--
+ tests/libpeas/testing/meson.build     | 4 ++--
+ tests/testing-util/meson.build        | 4 ++--
+ 4 files changed, 7 insertions(+), 7 deletions(-)
+diff --git a/peas-demo/meson.build b/peas-demo/meson.build
+index a3ec53b..855ebf2 100644
+--- a/peas-demo/meson.build
+++ b/peas-demo/meson.build
+@@ -9,7 +9,7 @@ peas_demo_c = [
+ 
+ peas_demo_c_args = [
+   '-DHAVE_CONFIG_H',
+-  '-DPEAS_BUILDDIR="@0@"'.format(builddir),
+  '-DPEAS_BUILDDIR="/usr/src/debug/libpeas"',
+   '-DPEAS_PREFIX="@0@"'.format(prefix),
+   '-DPEAS_LIBDIR="@0@"'.format(libdir),
+ ]
+diff --git a/tests/libpeas-gtk/testing/meson.build b/tests/libpeas-gtk/testing/meson.build
+index 646f42d..fd9a692 100644
+--- a/tests/libpeas-gtk/testing/meson.build
+++ b/tests/libpeas-gtk/testing/meson.build
+@@ -19,8 +19,8 @@ libpeas_gtk_testing_deps = [
+ 
+ libpeas_gtk_testing_c_args = [
+   '-DHAVE_CONFIG_H',
+-  '-DBUILDDIR="@0@"'.format(builddir),
+-  '-DSRCDIR="@0@"'.format(srcdir),
+  '-DBUILDDIR="/usr/src/debug/libpeas"',
+  '-DSRCDIR="/usr/src/debug/libpeas"',
+ ]
+ 
+ libpeas_gtk_testing_lib = library(
+diff --git a/tests/libpeas/testing/meson.build b/tests/libpeas/testing/meson.build
+index 74ba7b1..084daa9 100644
+--- a/tests/libpeas/testing/meson.build
+++ b/tests/libpeas/testing/meson.build
+@@ -21,8 +21,8 @@ libpeas_testing_deps = [
+ 
+ libpeas_testing_c_args = [
+   '-DHAVE_CONFIG_H',
+-  '-DBUILDDIR="@0@"'.format(builddir),
+-  '-DSRCDIR="@0@"'.format(srcdir),
+  '-DBUILDDIR="/usr/src/debug/libpeas"',
+  '-DSRCDIR="/usr/src/debug/libpeas"',
+ ]
+ 
+ libpeas_testing_lib = library(
+diff --git a/tests/testing-util/meson.build b/tests/testing-util/meson.build
+index 1c40740..83ad059 100644
+--- a/tests/testing-util/meson.build
+++ b/tests/testing-util/meson.build
+@@ -17,8 +17,8 @@ libtesting_util_deps = [
+ 
+ libtesting_util_c_args = [
+   '-DHAVE_CONFIG_H',
+-  '-DBUILDDIR="@0@"'.format(builddir),
+-  '-DSRCDIR="@0@"'.format(srcdir),
+  '-DBUILDDIR="/usr/src/debug/libpeas"',
+  '-DSRCDIR="/usr/src/debug/libpeas"',
+   '-UG_DISABLE_ASSERT',
+   '-UG_DISABLE_CAST_CHECKS',
+ ]
+-- 
+2.40.1
diff --git a/meta-gnome/recipes-gnome/libpeas/libpeas-1_1.36.0.bb b/meta-gnome/recipes-gnome/libpeas/libpeas-1_1.36.0.bb
new file mode 100644
index 0000000000..c0b785fee7
--- /dev/null
+++ b/meta-gnome/recipes-gnome/libpeas/libpeas-1_1.36.0.bb
@@ -0,0 +1,30 @@
+SUMMARY = "libpeas is a gobject-based plugins engine"
+HOMEPAGE = "https://wiki.gnome.org/Projects/Libpeas"
+LICENSE = "LGPL-2.1-or-later"
+LIC_FILES_CHKSUM = "file://COPYING;md5=4b54a1fd55a448865a0b32d41598759d"
+DEPENDS = "gtk+3"
+GTKDOC_MESON_OPTION = "gtk_doc"
+inherit gnomebase gobject-introspection gi-docgen gtk-icon-cache features_check
+ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
+# FIXME: When upgrading to libpeas 2, g-i is no longer needed.
+REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
+SRC_URI = "https://download.gnome.org/sources/libpeas/1.36/libpeas-${PV}.tar.xz;name=archive"
+SRC_URI += "file://0001-Remove-builddir-and-srcdir-paths-from-test-binaries.patch"
+SRC_URI[archive.sha256sum] = "297cb9c2cccd8e8617623d1a3e8415b4530b8e5a893e3527bbfd1edd13237b4c"
+S = "${UNPACKDIR}/libpeas-${PV}"
+PACKAGECONFIG[python3] = "-Dpython3=true,-Dpython3=false,python3-pygobject"
+PACKAGES =+ "${PN}-demo ${PN}-python3"
+FILES:${PN}-demo = " \
+    ${bindir}/peas-demo \
+    ${libdir}/peas-demo \
+"
+RDEPENDS:${PN}-python3 = "python3-pygobject"
+FILES:${PN}-python3 = "${libdir}/libpeas-1.0/loaders/libpython3loader.so"
diff --git a/meta-gnome/recipes-gnome/libpeas/libpeas/disable-lgi-check.patch b/meta-gnome/recipes-gnome/libpeas/libpeas/disable-lgi-check.patch
new file mode 100644
index 0000000000..9ed7adb8ce
--- /dev/null
+++ b/meta-gnome/recipes-gnome/libpeas/libpeas/disable-lgi-check.patch
@@ -0,0 +1,37 @@
+From c9bb8f5c730745b48eb86404d0297ebc15bf9fa7 Mon Sep 17 00:00:00 2001
+From: Markus Volk <f_l_k@t-online.de>
+Date: Mon, 16 Dec 2024 12:22:49 +0100
+Subject: [PATCH] meson
+Upstream-Status: Inappropriate [oe-specific]
+Signed-off-by: Markus Volk <f_l_k@t-online.de>
+---
+ meson.build | 11 +++++----------
+ 1 file changed, 3 insertions(+), 8 deletions(-)
+diff --git a/meson.build b/meson.build
+index a8100af..0fb15d2 100644
+--- a/meson.build
+++ b/meson.build
+@@ -209,14 +209,9 @@ if lua_found
+     else
+         lua_prg = lua51_prg
+     endif
+-    lua_lgi_check = run_command(lua_prg, ['-e', 'print(require("lgi")._VERSION)'])
+-    if lua_lgi_check.returncode() == 0
+-        lua_lgi_ver = lua_lgi_check.stdout().strip()
+-        if lua_lgi_ver.version_compare(lua_lgi_req)
+-            lua51_lgi_dep = declare_dependency(version: lua_lgi_ver)
+-            lua_lgi_found = true
+-        endif
+-    endif
+    lua_lgi_ver = '0.9.0'
+    lua_lgi_found = true
+    lua51_lgi_dep = declare_dependency(version: lua_lgi_ver)
+     message('lua-lgi version: ' + lua_lgi_ver)
+ endif
+ 
+-- 
+2.47.0
diff --git a/meta-gnome/recipes-gnome/libpeas/libpeas_2.0.7.bb b/meta-gnome/recipes-gnome/libpeas/libpeas_2.0.7.bb
new file mode 100644
index 0000000000..76ed820e66
--- /dev/null
+++ b/meta-gnome/recipes-gnome/libpeas/libpeas_2.0.7.bb
@@ -0,0 +1,25 @@
+SUMMARY = "libpeas is a gobject-based plugins engine"
+HOMEPAGE = "https://wiki.gnome.org/Projects/Libpeas"
+LICENSE = "LGPL-2.1-or-later"
+LIC_FILES_CHKSUM = "file://COPYING;md5=4b54a1fd55a448865a0b32d41598759d"
+DEPENDS = "glib-2.0"
+inherit gnomebase gobject-introspection vala gi-docgen
+SRC_URI += "file://disable-lgi-check.patch"
+SRC_URI[archive.sha256sum] = "1e9a9d69761d2109eff5b7c11d8c96b4867ccfaca2b921eded49401192769ec9"
+PACKAGECONFIG ?= "python3 gjs lua51 ${@bb.utils.contains('DISTRO_FEATURES', 'gobject-introspection', 'vala', '', d)}"
+PACKAGECONFIG:remove:riscv32 = "lua51"
+PACKAGECONFIG:remove:riscv64 = "lua51"
+PACKAGECONFIG:remove:powerpc64 = "lua51"
+PACKAGECONFIG:remove:powerpc64le = "lua51"
+PACKAGECONFIG[python3] = "-Dpython3=true,-Dpython3=false,python3-pygobject,python3-pygobject"
+PACKAGECONFIG[gjs] = "-Dgjs=true,-Dgjs=false,gjs mozjs-128"
+PACKAGECONFIG[lua51] = "-Dlua51=true,-Dlua51=false,luajit luajit-native,lua-lgi"
+PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false"
+FILES:${PN} += "${libdir}/libpeas-2"
diff --git a/meta-gnome/recipes-gnome/libspelling/libspelling_0.4.8.bb b/meta-gnome/recipes-gnome/libspelling/libspelling_0.4.8.bb
new file mode 100644
index 0000000000..9c59e211f8
--- /dev/null
+++ b/meta-gnome/recipes-gnome/libspelling/libspelling_0.4.8.bb
@@ -0,0 +1,19 @@
+SUMMARY = "A spellcheck library for GTK 4"
+HOMEPAGE = "https://gitlab.gnome.org/GNOME/libspelling"
+LICENSE = "LGPL-2.1-or-later"
+LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
+DEPENDS = "enchant2 gtk4 gtksourceview5 icu"
+inherit gnomebase pkgconfig gettext gi-docgen vala gobject-introspection features_check
+# reason: gtk4 requires opengl distro feature
+REQUIRED_DISTRO_FEATURES = "opengl"
+GIR_MESON_OPTION = ''
+GIDOCGEN_MESON_OPTION = 'docs'
+PACKAGECONFIG ?= ""
+PACKAGECONFIG[sysprof] = "-Dsysprof=true,-Dsysprof=false,sysprof"
+SRC_URI[archive.sha256sum] = "277646285818da7b295ef007b2c5ebd815d0930b3ad097505b3ced96965af517"
diff --git a/meta-gnome/recipes-gnome/libtimezonemap/files/0001-configure.ac-correct-the-version.patch b/meta-gnome/recipes-gnome/libtimezonemap/files/0001-configure.ac-correct-the-version.patch
new file mode 100644
index 0000000000..0538bc3e5c
--- /dev/null
+++ b/meta-gnome/recipes-gnome/libtimezonemap/files/0001-configure.ac-correct-the-version.patch
@@ -0,0 +1,29 @@
+From 915bc44d9f243075d084238c72089a346036388c Mon Sep 17 00:00:00 2001
+From: Changqing Li <changqing.li@windriver.com>
+Date: Thu, 29 May 2025 10:08:21 +0800
+Subject: [PATCH] configure.ac: correct the version
+The source is here:
+https://salsa.debian.org/cinnamon-team/libtimezonemap
+Upstream-Status: Pending [ register account rejected ]
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/configure.ac b/configure.ac
+index 3f74dae..24eb0e5 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -1,5 +1,5 @@
+ AC_INIT([libtimezonemap],
+-        [0.4.4],
+        [0.4.6],
+         [http://bugs.launchpad.net/libtimezonemap],
+         [libtimezonemap],
+         [http://launchpad.net/libtimezonemap])
+-- 
+2.34.1
diff --git a/meta-gnome/recipes-gnome/libtimezonemap/libtimezonemap_0.4.6.bb b/meta-gnome/recipes-gnome/libtimezonemap/libtimezonemap_0.4.6.bb
index bafe7af040..3f37890e8d 100644
--- a/meta-gnome/recipes-gnome/libtimezonemap/libtimezonemap_0.4.6.bb
+++ b/meta-gnome/recipes-gnome/libtimezonemap/libtimezonemap_0.4.6.bb
@@ -4,7 +4,8 @@ SECTION = "devel/lib"
 LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-SRC_URI = "${DEBIAN_MIRROR}/main/libt/${BPN}/${BPN}_${PV}.orig.tar.gz;downloadfilename=${BP}.tar.gz"
+SRC_URI = "${DEBIAN_MIRROR}/main/libt/${BPN}/${BPN}_${PV}.orig.tar.gz;downloadfilename=${BP}.tar.gz \
+           file://0001-configure.ac-correct-the-version.patch"
 SRC_URI[sha256sum] = "0d634cc2476d8f57d1ee1864bd4f442180ae4bf040a9ae4bf73b66bbd85d7195"
 DEPENDS = "gtk+3 gdk-pixbuf libsoup-2.4 json-glib gnome-common-native"
diff --git a/meta-gnome/recipes-gnome/libwnck/files/0001-Fix-build-issue-caused-by-OE-core-changes-to-startup.patch b/meta-gnome/recipes-gnome/libwnck/files/0001-Fix-build-issue-caused-by-OE-core-changes-to-startup.patch
new file mode 100644
index 0000000000..91e23c785b
--- /dev/null
+++ b/meta-gnome/recipes-gnome/libwnck/files/0001-Fix-build-issue-caused-by-OE-core-changes-to-startup.patch
@@ -0,0 +1,43 @@
+From 1df0f4ae8fd54bc1ae940dfafa701c84d068674d Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Sun, 25 May 2025 12:24:16 +0000
+Subject: [PATCH] Fix build issue caused by OE-core changes to
+ startup-notification:
+../libwnck-43.2/libwnck/tasklist.c: In function 'sequence_timeout_callback':
+../libwnck-43.2/libwnck/tasklist.c:5034:49: error: passing argument 2 of 'sn_startup_sequence_get_last_active_time' from incompatible pointer type [-Wincompatible-pointer-types]
+ 5034 |                                                 &tv_sec, &tv_usec);
+      |                                                 ^~~~~~~
+      |                                                 |
+      |                                                 long int *
+In file included from /build/angstrom/build/tmp/work/armv7at2hf-neon-angstrom-linux-gnueabi/libwnck3/43.2/recipe-sysroot/usr/include/startup-notification-1.0/libsn/sn.h:32,
+                 from ../libwnck-43.2/libwnck/tasklist.c:40:
+/build/angstrom/build/tmp/work/armv7at2hf-neon-angstrom-linux-gnueabi/libwnck3/43.2/recipe-sysroot/usr/include/startup-notification-1.0/libsn/sn-monitor.h:84:79: note: expected 'time_t *' {aka 'long long int *'} but argument is of type 'long int *'
+   84 |                                                            time_t            *tv_sec,
+      |                                                            ~~~~~~~~~~~~~~~~~~~^~~~~~
+It is caused by a patch of startup-notification in oe-core which is backported from upstream mailllist and changes the signature of function sn_startup_sequence_get_last_active_time().
+Upstream-Status: Inappropriate [oe-specific]
+Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
+---
+ libwnck/tasklist.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/libwnck/tasklist.c b/libwnck/tasklist.c
+index 7418f89..460e11d 100644
+--- a/libwnck/tasklist.c
+++ b/libwnck/tasklist.c
+@@ -5031,7 +5031,7 @@ sequence_timeout_callback (void *user_data)
+       WnckTask *task = WNCK_TASK (tmp->data);
+ 
+       sn_startup_sequence_get_last_active_time (task->startup_sequence,
+-                                                &tv_sec, &tv_usec);
+                                                (time_t *) &tv_sec, &tv_usec);
+ 
+       elapsed = (now - (tv_sec * G_USEC_PER_SEC + tv_usec)) / 1000.0;
+ 
+-- 
+2.33.0
diff --git a/meta-gnome/recipes-gnome/libwnck/files/ef0e40d59c32d7ebeb94d242436e3144cefc174a.patch b/meta-gnome/recipes-gnome/libwnck/files/ef0e40d59c32d7ebeb94d242436e3144cefc174a.patch
new file mode 100644
index 0000000000..2d526e7aba
--- /dev/null
+++ b/meta-gnome/recipes-gnome/libwnck/files/ef0e40d59c32d7ebeb94d242436e3144cefc174a.patch
@@ -0,0 +1,40 @@
+From ef0e40d59c32d7ebeb94d242436e3144cefc174a Mon Sep 17 00:00:00 2001
+From: correctmost <136447-correctmost@users.noreply.gitlab.gnome.org>
+Date: Thu, 20 Mar 2025 03:03:44 -0400
+Subject: [PATCH] build: fix -Wheader-guard warnings reported by clang
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libwnck/-/commit/ef0e40d59c32d7ebeb94d242436e3144cefc174a]
+---
+ libwnck/pager-accessible-factory.h     | 2 +-
+ libwnck/workspace-accessible-factory.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+diff --git a/libwnck/pager-accessible-factory.h b/libwnck/pager-accessible-factory.h
+index 8e2fe30c..25220fc2 100644
+--- a/libwnck/pager-accessible-factory.h
+++ b/libwnck/pager-accessible-factory.h
+@@ -17,7 +17,7 @@
+  */
+ 
+ #ifndef __WNCK_PAGER_ACCESSIBLE_FACTORY_H__
+-#define __WBCK_PAGER_ACCESSIBLE_FACTORY_H__
+#define __WNCK_PAGER_ACCESSIBLE_FACTORY_H__
+ 
+ #include <atk/atk.h>
+ 
+diff --git a/libwnck/workspace-accessible-factory.h b/libwnck/workspace-accessible-factory.h
+index d2d4a84a..335b465b 100644
+--- a/libwnck/workspace-accessible-factory.h
+++ b/libwnck/workspace-accessible-factory.h
+@@ -17,7 +17,7 @@
+  */
+ 
+ #ifndef __WNCK_WORKSPACE_ACCESSIBLE_FACTORY_H__
+-#define __WBCK_WORKSPACE_ACCESSIBLE_FACTORY_H__
+#define __WNCK_WORKSPACE_ACCESSIBLE_FACTORY_H__
+ 
+ #include <atk/atk.h>
+ 
+-- 
+GitLab
diff --git a/meta-gnome/recipes-gnome/libwnck/libwnck3_43.0.bb b/meta-gnome/recipes-gnome/libwnck/libwnck3_43.2.bb
index c7f7989115..4342325f11 100644
--- a/meta-gnome/recipes-gnome/libwnck/libwnck3_43.0.bb
+++ b/meta-gnome/recipes-gnome/libwnck/libwnck3_43.2.bb
@@ -19,7 +19,9 @@ inherit gnomebase gobject-introspection gtk-doc gettext features_check
 def gnome_verdir(v):
    return oe.utils.trim_version(v, 1)
-SRC_URI[archive.sha256sum] = "905bcdb85847d6b8f8861e56b30cd6dc61eae67ecef4cd994a9f925a26a2c1fe"
+SRC_URI += "file://ef0e40d59c32d7ebeb94d242436e3144cefc174a.patch;patch=1 \
+            file://0001-Fix-build-issue-caused-by-OE-core-changes-to-startup.patch;patch=1"
+SRC_URI[archive.sha256sum] = "55a7444ec1fbb95c086d40967388f231b5c0bbc8cffaa086bf9290ae449e51d5"
 # gtk+3 and libepoxy need to be built with x11 PACKAGECONFIG.
 # cairo would at least needed to be built with xlib.
diff --git a/meta-gnome/recipes-gnome/msgraph/msgraph_0.2.2.bb b/meta-gnome/recipes-gnome/msgraph/msgraph_0.3.3.bb
index a4b4349500..fe4faff356 100644
--- a/meta-gnome/recipes-gnome/msgraph/msgraph_0.2.2.bb
+++ b/meta-gnome/recipes-gnome/msgraph/msgraph_0.3.3.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3000208d539ec061b899bce1d9ce9404"
 inherit gnomebase gobject-introspection gi-docgen features_check
 REQUIRED_DISTRO_FEATURES = "opengl"
-SRC_URI[archive.sha256sum] = "12cc954f750bb137ace8500fe9355d26e6e00ef6ccaab2950e9d360e92758335"
+SRC_URI[archive.sha256sum] = "37d7e12f2a990490aea21184f0b27e0b915ebb4e5096f4d6632c62051c054012"
 GTKDOC_MESON_OPTION = "gtk_doc"
diff --git a/meta-gnome/recipes-gnome/mutter/files/0001-Dont-use-system-sysprof-dbus-folder.patch b/meta-gnome/recipes-gnome/mutter/files/0001-Dont-use-system-sysprof-dbus-folder.patch
new file mode 100644
index 0000000000..2f09c32997
--- /dev/null
+++ b/meta-gnome/recipes-gnome/mutter/files/0001-Dont-use-system-sysprof-dbus-folder.patch
@@ -0,0 +1,35 @@
+From 790177e2a89aa0710b570d595223bdb511241c56 Mon Sep 17 00:00:00 2001
+From: Gyorgy Sarvari <skandigraun@gmail.com>
+Date: Tue, 11 Feb 2025 13:39:54 +0100
+Subject: [PATCH] Don't use system sysprof dbus folder
+In case Mutter is built with profiler support, it requires
+org.gnome.Sysprof3.Profiler.xml file to be available - however
+the meson build file is trying to access it on the build machine's
+system ($datadir/dbus-1/interfaces) instead of searching for it
+in the $RECIPE_SYSROOT.
+To ensure that it looks for this file in the correct folder, prefix
+the search path with the value of the sys_root property, which is set 
+in the meson.cross file (by meson.bbclass).
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+Upstream-Status: Inappropriate [oe-specific: only related to cross-compiling]
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/meson.build b/meson.build
+index 551cb23..5199be6 100644
+--- a/meson.build
+++ b/meson.build
+@@ -446,7 +446,7 @@ if have_profiler
+ 
+   if libsysprof_capture_dep.type_name() == 'pkgconfig'
+     sysprof_dep = dependency('sysprof-6', 'sysprof-4')
+-    sysprof_dbus_interfaces_dir = sysprof_dep.get_variable('datadir') / 'dbus-1' / 'interfaces'
+    sysprof_dbus_interfaces_dir = meson.get_external_property('sys_root') + sysprof_dep.get_variable('datadir') / 'dbus-1' / 'interfaces'
+   else
+     sysprof_dbus_interfaces_dir = mutter_srcdir / 'subprojects' / 'sysprof' / 'src'
+   endif
diff --git a/meta-gnome/recipes-gnome/mutter/mutter_46.2.bb b/meta-gnome/recipes-gnome/mutter/mutter_48.0.bb
index 6a121b09cf..6f799ad57a 100644
--- a/meta-gnome/recipes-gnome/mutter/mutter_46.2.bb
+++ b/meta-gnome/recipes-gnome/mutter/mutter_48.0.bb
@@ -3,7 +3,6 @@ LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 DEPENDS = " \
-    xserver-xorg-cvt-native \
    wayland-native \
    virtual/libx11 \
    colord \
@@ -14,9 +13,13 @@ DEPENDS = " \
    pango \
    gsettings-desktop-schemas \
    json-glib \
+    libdisplay-info \
    libei \
+    libxcvt-native \
    libxtst \
    libxkbfile \
+    python3-argcomplete-native \
+    python3-docutils-native \
    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xinerama', '', d)} \
    xwayland \
 "
@@ -24,7 +27,9 @@ DEPENDS = " \
 inherit gnomebase gsettings gobject-introspection gettext features_check
-SRC_URI[archive.sha256sum] = "009baa77f8362612caa2e18c338a1b3c8aad3b5fe2964c2fef7824d321228983"
+SRC_URI[archive.sha256sum] = "9ca177fd5851a4077f17f6a888c45447b7d1163c9879580597a1fd837f47e57d"
+SRC_URI += "file://0001-Dont-use-system-sysprof-dbus-folder.patch"
 # x11 is still manadatory - see meson.build
 REQUIRED_DISTRO_FEATURES = "wayland x11 polkit"
@@ -44,16 +49,14 @@ PACKAGECONFIG ??= " \
 "
 EXTRA_OEMESON += " \
-    -Dtests=false \
+    -Dtests=disabled \
-    -Dnative_tests=false \
    -Dxwayland_path=${bindir}/Xwayland \
 "
 # combi-config - see meson_options.txt for more details
 PACKAGECONFIG[native-backend] = "-Dnative_backend=true -Dudev=true, -Dnative_backend=false -Dudev=false, libdrm virtual/libgbm libinput ${LOGIND} virtual/egl virtual/libgles2 udev"
-PACKAGECONFIG[opengl] = "-Dopengl=true, -Dopengl=true, virtual/libgl"
+PACKAGECONFIG[opengl] = "-Dopengl=true, -Dopengl=false, virtual/libgl"
 PACKAGECONFIG[glx] = "-Dglx=true, -Dglx=false"
-PACKAGECONFIG[libdisplay-info] = "-Dlibdisplay_info=true, -Dlibdisplay_info=false, libdisplay-info"
 PACKAGECONFIG[libwacom] = "-Dlibwacom=true, -Dlibwacom=false, libwacom"
 # Remove depending on pipewire-0.2 when mutter is upgraded to 3.36+
 PACKAGECONFIG[remote-desktop] = "-Dremote_desktop=true, -Dremote_desktop=false, pipewire"
@@ -63,7 +66,7 @@ PACKAGECONFIG[sound-player] = "-Dsound_player=true, -Dsound_player=false, libcan
 PACKAGECONFIG[profiler] = "-Dprofiler=true,-Dprofiler=false,sysprof"
 PACKAGECONFIG[startup-notification] = "-Dstartup_notification=true, -Dstartup_notification=false, startup-notification, startup-notification"
-MUTTER_API_NAME = "mutter-14"
+MUTTER_API_NAME = "mutter-16"
 do_install:prepend() {
    sed -i -e 's|${B}/||g' ${B}/cogl/cogl/cogl-enum-types.c
@@ -87,6 +90,7 @@ GSETTINGS_PACKAGE = "${PN}-gsettings"
 PACKAGES =+ "${PN}-tests ${PN}-gsettings"
 FILES:${PN} += " \
+    ${datadir}/bash-completion \
    ${datadir}/gnome-control-center \
    ${datadir}/gir-1.0 \
    ${libdir}/${MUTTER_API_NAME}/lib*${SOLIBS} \
diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus_46.2.bb b/meta-gnome/recipes-gnome/nautilus/nautilus_48.2.bb
index 30e0681ae4..f867cd14d1 100644
--- a/meta-gnome/recipes-gnome/nautilus/nautilus_46.2.bb
+++ b/meta-gnome/recipes-gnome/nautilus/nautilus_48.2.bb
@@ -1,7 +1,7 @@
 SUMMARY = "File manager for GNOME"
 SECTION = "x11/gnome"
-LICENSE="GPL-3.0-only"
+LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504"
@@ -17,12 +17,14 @@ DEPENDS = " \
    libhandy \
    libportal \
    libxml2 \
-    tracker \
+    tinysparql \
+    wayland \
+    wayland-native \
 "
 inherit gnomebase gsettings gobject-introspection gi-docgen gettext features_check mime-xdg gtk-icon-cache
-SRC_URI[archive.sha256sum] = "6ee8c99019b9e3447f6918d68232a20deca89e5525c05805432b7d8840ca71fa"
+SRC_URI[archive.sha256sum] = "a030f6163f8a68064fae5a9e89e37f19cbb293de2e12a19dd5e210956d0df4b5"
 REQUIRED_DISTRO_FEATURES = "x11 opengl gobject-introspection-data"
@@ -46,9 +48,9 @@ FILES:${PN} += " \
    ${datadir}/dbus-1 \
    ${datadir}/metainfo \
    ${datadir}/gnome-shell \
-    ${datadir}/tracker3 \
+    ${datadir}/localsearch3 \
 "
 # mandatory - not checked during configuration:
 # | (org.gnome.Nautilus:863): GLib-GIO-ERROR **: 21:03:52.326: Settings schema 'org.freedesktop.Tracker.Miner.Files' is not installed
-RDEPENDS:${PN} += "tracker-miners bubblewrap"
+RDEPENDS:${PN} += "localsearch bubblewrap"
diff --git a/meta-gnome/recipes-gnome/rest/librest_0.8.1.bb b/meta-gnome/recipes-gnome/rest/librest_0.8.1.bb
deleted file mode 100644
index 63372afa5d..0000000000
--- a/meta-gnome/recipes-gnome/rest/librest_0.8.1.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-SUMMARY = "library to access web services that claim to be "RESTful""
-HOMEPAGE = "https://wiki.gnome.org/Projects/Librest"
-LICENSE = "LGPL-2.1-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
-DEPENDS = " \
-    glib-2.0 \
-    glib-2.0-native \
-    libsoup-2.4 \
-    libxml2 \
-"
-GNOMEBASEBUILDCLASS = "autotools"
-inherit gnomebase gobject-introspection vala pkgconfig gtk-doc
-GNOMEBN = "rest"
-SRC_URI[archive.sha256sum] = "0513aad38e5d3cedd4ae3c551634e3be1b9baaa79775e53b2dba9456f15b01c9"
-S = "${WORKDIR}/${GNOMEBN}-${PV}"
-# * gnome environment requires libsoup build with in gnome PACKAGECONFIG
-# * libsoup-gnome support was removed upstream three years ago [1]
-# [1] https://gitlab.gnome.org/GNOME/librest/commit/8f904a8e2bb38a7bf72245cdf2f1ecad17e9a720
-EXTRA_OECONF = "--without-gnome"
-do_configure:prepend() {
-    # rest expects introspection.m4 at custom location (see aclocal.m4).
-    cp -f ${STAGING_DIR_TARGET}/${datadir}/aclocal/introspection.m4 ${S}/build
-}
-do_compile:prepend() {
-    export GIR_EXTRA_LIBS_PATH="${B}/rest/.libs"
-}
diff --git a/meta-gnome/recipes-gnome/rest/rest_0.9.1.bb b/meta-gnome/recipes-gnome/rest/rest_0.9.1.bb
index 3b22fdfea2..0483d3070d 100644
--- a/meta-gnome/recipes-gnome/rest/rest_0.9.1.bb
+++ b/meta-gnome/recipes-gnome/rest/rest_0.9.1.bb
@@ -22,3 +22,5 @@ PACKAGECONFIG[examples] = "-Dexamples=true,-Dexamples=false"
 PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false"
 SRC_URI[archive.sha256sum] = "9266a5c10ece383e193dfb7ffb07b509cc1f51521ab8dad76af96ed14212c2e3"
+PROVIDES = "librest"
diff --git a/meta-gnome/recipes-gnome/sysprof/sysprof/0001-meson-Check-for-libunwind-instead-of-libunwind-gener.patch b/meta-gnome/recipes-gnome/sysprof/sysprof/0001-meson-Check-for-libunwind-instead-of-libunwind-gener.patch
index dc702a0e37..0dc7cb35a6 100644
--- a/meta-gnome/recipes-gnome/sysprof/sysprof/0001-meson-Check-for-libunwind-instead-of-libunwind-gener.patch
+++ b/meta-gnome/recipes-gnome/sysprof/sysprof/0001-meson-Check-for-libunwind-instead-of-libunwind-gener.patch
@@ -1,30 +1,32 @@
-From 19188367bee87b0084ab34869455155da5cb1731 Mon Sep 17 00:00:00 2001
+From 779bbfebcd414a2cb4ab73ff1c4eb987cfdab456 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
+From: Pablo Saavedra <psaavedra@igalia.com>
-Date: Wed, 13 Apr 2022 08:47:39 -0700
+Date: Mon, 11 Nov 2024 13:05:15 +0100
 Subject: [PATCH] meson: Check for libunwind instead of libunwind-generic
 This helps it to use llvm unwinder since libunwind-generic is specific
 to nongnu libunwind.
-Upstream-Status: Pending
+Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/sysprof/-/merge_requests/95]
+Original-by: Khem Raj <raj.khem@gmail.com>
+Modified-by: Pablo Saavedra <psaavedra@igalia.com>
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Signed-off-by: Pablo Saavedra <psaavedra@igalia.com>
 ---
 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/meson.build b/meson.build
-index 2835782..0fdb39a 100644
+index 96c1d09..86b9df4 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -81,7 +81,7 @@ config_h.set10('HAVE_POLKIT_AGENT', polkit_agent_dep.found())
+@@ -107,7 +107,7 @@ polkit_dep = dependency('polkit-gobject-1', version: polkit_req_version, require
 config_h.set10('HAVE_POLKIT', polkit_dep.found())
 
- if get_option('libunwind')
+ if need_libsysprof
-  libunwind_dep = dependency('libunwind-generic')
+-  libunwind_dep = dependency('libunwind-generic', required: true)
-+  libunwind_dep = dependency('libunwind')
+  libunwind_dep = dependency('libunwind', required: true)
   config_h.set('ENABLE_LIBUNWIND', libunwind_dep.found())
-   config_h.set('HAVE_UNW_SET_CACHE_SIZE', libunwind_dep.found() and cc.has_header_symbol('libunwind.h', 'unw_set_cache_size', dependencies: [libunwind_dep]))
+   config_h.set('HAVE_UNW_SET_CACHE_SIZE',
- endif
+                cc.has_header_symbol('libunwind.h',
-- 
-2.35.2
diff --git a/meta-gnome/recipes-gnome/sysprof/sysprof/0002-meson-Do-not-invoke-the-commands-to-update-the-icon-.patch b/meta-gnome/recipes-gnome/sysprof/sysprof/0002-meson-Do-not-invoke-the-commands-to-update-the-icon-.patch
new file mode 100644
index 0000000000..77374ffc56
--- /dev/null
+++ b/meta-gnome/recipes-gnome/sysprof/sysprof/0002-meson-Do-not-invoke-the-commands-to-update-the-icon-.patch
@@ -0,0 +1,29 @@
+From cc0c0b518d46bf82ad34eeea8d40496c9ad971dd Mon Sep 17 00:00:00 2001
+From: Carlos Alberto Lopez Perez <clopez@igalia.com>
+Date: Wed, 24 Jul 2024 15:51:05 +0100
+Subject: [PATCH] meson: Do not invoke the commands to update the icon caches
+ when cross-building
+This does not have any useful efect when cross-building and it requires
+the cross-builder environment to have gtk4-native built in order to invoke
+gtk-update-icon-cache program.
+Upstream-Status: Pending
+Signed-off-by: Carlos Alberto Lopez Perez <clopez@igalia.com>
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/meson.build b/meson.build
+index 86b9df4..fe75ef9 100644
+--- a/meson.build
+++ b/meson.build
+@@ -269,7 +269,7 @@ configure_file(
+   configuration: config_h
+ )
+ 
+-if get_option('gtk') and gnome.found()
+if get_option('gtk') and gnome.found() and not meson.is_cross_build()
+   gnome.post_install(
+       gtk_update_icon_cache: true,
+     update_desktop_database: true
diff --git a/meta-gnome/recipes-gnome/sysprof/sysprof/0003-libsysprof-Check-for-unw_set_caching_policy-before-u.patch b/meta-gnome/recipes-gnome/sysprof/sysprof/0003-libsysprof-Check-for-unw_set_caching_policy-before-u.patch
new file mode 100644
index 0000000000..303e78a866
--- /dev/null
+++ b/meta-gnome/recipes-gnome/sysprof/sysprof/0003-libsysprof-Check-for-unw_set_caching_policy-before-u.patch
@@ -0,0 +1,32 @@
+From 68425b541e88f9f03a418cfda052b46b2a185e4e Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 25 Jul 2024 20:18:17 -0700
+Subject: [PATCH] libsysprof: Check for unw_set_caching_policy before using
+llvm libunwind does not implement unw_cache_* functions yet
+Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/sysprof/-/merge_requests/95]
+Original-by: Khem Raj <raj.khem@gmail.com>
+Modified-by: Pablo Saavedra <psaavedra@igalia.com>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Signed-off-by: Pablo Saavedra <psaavedra@igalia.com>
+---
+ src/preload/backtrace-helper.h | 2 ++
+ 1 file changed, 2 insertions(+)
+diff --git a/src/preload/backtrace-helper.h b/src/preload/backtrace-helper.h
+index ac4f8e9..e60032d 100644
+--- a/src/preload/backtrace-helper.h
+++ b/src/preload/backtrace-helper.h
+@@ -26,7 +26,9 @@
+ static void
+ backtrace_init (void)
+ {
+# ifdef UNW_CACHE_PER_THREAD
+   unw_set_caching_policy (unw_local_addr_space, UNW_CACHE_PER_THREAD);
+#endif
+ #ifdef HAVE_UNW_SET_CACHE_SIZE
+   unw_set_cache_size (unw_local_addr_space, 1024, 0);
+ #endif
diff --git a/meta-gnome/recipes-gnome/sysprof/sysprof_3.44.0.bb b/meta-gnome/recipes-gnome/sysprof/sysprof_47.2.bb
index 3523bad3e2..b6f140404c 100644
--- a/meta-gnome/recipes-gnome/sysprof/sysprof_3.44.0.bb
+++ b/meta-gnome/recipes-gnome/sysprof/sysprof_47.2.bb
@@ -4,40 +4,47 @@ LICENSE = "GPL-3.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
                    file://src/sysprof/sysprof-application.c;endline=17;md5=a3de8df3b0f8876dd01e1388d2d4b607"
-inherit gnomebase gnome-help gettext systemd upstream-version-is-even gsettings mime mime-xdg
+inherit gnomebase gnome-help gettext systemd gsettings gtk-icon-cache mime mime-xdg features_check
 DEPENDS += " \
-    glib-2.0-native \
+    desktop-file-utils-native \
-    yelp-tools-native \
-    libxml2-native \
    glib-2.0 \
+    glib-2.0-native \
    json-glib \
+    libdex \
+    libunwind \
+    libxml2-native \
+    yelp-tools-native \
 "
-SRC_URI += "file://0001-meson-Check-for-libunwind-instead-of-libunwind-gener.patch"
+SRC_URI += "file://0001-meson-Check-for-libunwind-instead-of-libunwind-gener.patch \
-SRC_URI[archive.sha256sum] = "ab5d9f5b71973b3088d58a1bfdf1dc23c39a02f5fce4e5e9c73e034b178b005b"
+            file://0002-meson-Do-not-invoke-the-commands-to-update-the-icon-.patch \
+            file://0003-libsysprof-Check-for-unw_set_caching_policy-before-u.patch \
+           "
+SRC_URI[archive.sha256sum] = "e4b5ede9fd978ec3f0d5a0d44d0429a6d201c362bf6cb4527319031ae462c54f"
+# reason: gtk4 requires opengl distro feature
+REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'gtk', 'opengl', '', d)}"
 PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'sysprofd libsysprof', '', d)} \
                  ${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)} \
-                  libunwind"
+                 "
-# nongnu libunwind needs porting to RV32
-PACKAGECONFIG:remove:riscv32 = "libunwind"
-PACKAGECONFIG[gtk] = "-Denable_gtk=true,-Denable_gtk=false,gtk+3 libdazzle"
+PACKAGECONFIG[gtk] = "-Dgtk=true,-Dgtk=false,gtk4 libpanel"
-PACKAGECONFIG[sysprofd] = "-Dwith_sysprofd=bundled,-Dwith_sysprofd=none,polkit"
+PACKAGECONFIG[sysprofd] = "-Dsysprofd=bundled,-Dsysprofd=none,polkit"
 PACKAGECONFIG[libsysprof] = "-Dlibsysprof=true,-Dlibsysprof=false,polkit"
-PACKAGECONFIG[libunwind] = "-Dlibunwind=true,-Dlibunwind=false,libunwind"
 EXTRA_OEMESON += "-Dsystemdunitdir=${systemd_unitdir}/system"
 SOLIBS = ".so"
-FILES_SOLIBSDEV = ""
+FILES_SOLIBSDEV = "${libdir}/libsysprof-6.so"
-SYSTEMD_SERVICE:${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'sysprofd', 'sysprof2.service sysprof3.service', '', d)}"
+SYSTEMD_SERVICE:${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'sysprofd', 'sysprof3.service', '', d)}"
 FILES:${PN} += " \
    ${datadir}/dbus-1/system-services \
    ${datadir}/dbus-1/system.d \
    ${datadir}/dbus-1/interfaces \
    ${datadir}/metainfo \
+    ${libdir}/libsysprof-6*.so.* \
 "
diff --git a/meta-gnome/recipes-gnome/tecla/tecla_46.0.bb b/meta-gnome/recipes-gnome/tecla/tecla_48.0.2.bb
index 62b3aa3e3e..427fe00fac 100644
--- a/meta-gnome/recipes-gnome/tecla/tecla_46.0.bb
+++ b/meta-gnome/recipes-gnome/tecla/tecla_48.0.2.bb
@@ -13,4 +13,6 @@ REQUIRED_DISTRO_FEATURES = "wayland"
 inherit gnomebase pkgconfig  features_check
-SRC_URI[archive.sha256sum] = "4a081eab867a5a8b09758991cad7645920f323aabca954408290fb6f44591b0f"
+SRC_URI = "https://download.gnome.org/sources/tecla/${@oe.utils.trim_version('${PV}', 1)}/tecla-${PV}.tar.xz"
+SRC_URI[sha256sum] = "783d3464d2a2cf7eb1507649dbd9ff09ce24852c2a6c9a0d365db84063d3d401"
diff --git a/meta-gnome/recipes-gnome/tepl/tepl_6.8.0.bb b/meta-gnome/recipes-gnome/tepl/tepl_6.8.0.bb
index 6c9c36f3ed..f4d027ebf7 100644
--- a/meta-gnome/recipes-gnome/tepl/tepl_6.8.0.bb
+++ b/meta-gnome/recipes-gnome/tepl/tepl_6.8.0.bb
@@ -22,7 +22,6 @@ inherit meson gobject-introspection gettext features_check pkgconfig
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
 SRC_URI = "git://gitlab.gnome.org/swilmet/tepl;protocol=https;branch=main"
 SRCREV = "16ab2567257a053bd957699f89080fafd0999035"
-S = "${WORKDIR}/git"
 # gobject-introspection is mandatory and cannot be configured
 REQUIRED_DISTRO_FEATURES += "gobject-introspection-data"
diff --git a/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch b/meta-gnome/recipes-gnome/tracker/localsearch/0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch
index 36dd4a5881..87589a0e64 100644
--- a/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch
+++ b/meta-gnome/recipes-gnome/tracker/localsearch/0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch
@@ -1,4 +1,4 @@
-From 6f6d7e3995c370b8121206a7f9cc0d234553bbfe Mon Sep 17 00:00:00 2001
+From bad93f7aec96b1819f4027dbc06b337d2e2227f2 Mon Sep 17 00:00:00 2001
 From: Lei Maohui <leimaohui@fujitsu.com>
 Date: Thu, 15 Sep 2022 16:35:39 +0900
 Subject: [PATCH] Set header file to a fixed path instead of a host path.
@@ -10,10 +10,10 @@ Signed-off-by: Lei Maohui <leimaohui@fujitsu.com>
 .../tracker-miners-enum-types.c.template                        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/src/libtracker-miners-common/tracker-miners-enum-types.c.template b/src/libtracker-miners-common/tracker-miners-enum-types.c.template
+diff --git a/src/common/tracker-miners-enum-types.c.template b/src/common/tracker-miners-enum-types.c.template
 index 4db7ef1..7c44c13 100644
--- a/src/libtracker-miners-common/tracker-miners-enum-types.c.template
+--- a/src/common/tracker-miners-enum-types.c.template
-+++ b/src/libtracker-miners-common/tracker-miners-enum-types.c.template
+++ b/src/common/tracker-miners-enum-types.c.template
 @@ -7,7 +7,7 @@
 
 /*** BEGIN file-production ***/
@@ -23,6 +23,3 @@ index 4db7ef1..7c44c13 100644
 /*** END file-production ***/
 
 
-- 
-2.34.1
diff --git a/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-fix-reproducibility.patch b/meta-gnome/recipes-gnome/tracker/localsearch/0001-fix-reproducibility.patch
index 0812e88a9e..1bab34e126 100644
--- a/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-fix-reproducibility.patch
+++ b/meta-gnome/recipes-gnome/tracker/localsearch/0001-fix-reproducibility.patch
@@ -1,4 +1,4 @@
-From 1b7a34b7de9eb2ae776f7cf4dc6221f49b2395ee Mon Sep 17 00:00:00 2001
+From 57f4279008394831826ea2ff449b06b29c08ce68 Mon Sep 17 00:00:00 2001
 From: Markus Volk <f_l_k@t-online.de>
 Date: Tue, 12 Sep 2023 17:00:41 +0200
 Subject: [PATCH] meson: fix reproducibility
@@ -13,17 +13,17 @@ Upstream-Status: Inappropriate [oe-specific]
 Signed-off-by: Markus Volk <f_l_k@t-online.de>
 ---
 meson.build                                     | 8 ++++----
- src/libtracker-miners-common/tracker-landlock.c | 4 ++--
+ src/common/tracker-landlock.c | 4 ++--
 src/miners/fs/meson.build                       | 4 ++--
 src/tracker-extract/meson.build                 | 2 +-
 tests/tracker-miner-fs/meson.build              | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)
 diff --git a/meson.build b/meson.build
-index 37f5148..18f4bfa 100644
+index 7ae103c..cc61e84 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -393,7 +393,7 @@ conf.set('PACKAGE_VERSION', '"@0@"'.format(meson.project_version()))
+@@ -371,7 +371,7 @@ conf.set('PACKAGE_VERSION', '"@0@"'.format(meson.project_version()))
 conf.set('TRACKER_VERSION', '"@0@"'.format(meson.project_version()))
 
 # Config that goes in some other generated files (.desktop, .pc, etc)
@@ -32,7 +32,7 @@ index 37f5148..18f4bfa 100644
 conf.set('exec_prefix', get_option('prefix'))
 conf.set('bindir', join_paths(get_option('prefix'), get_option('bindir')))
 conf.set('datadir', datadir)
-@@ -422,7 +422,7 @@ tracker_c_args = [
+@@ -400,7 +400,7 @@ tracker_c_args = [
 configinc = include_directories('./')
 srcinc = include_directories('src/')
 
@@ -41,7 +41,7 @@ index 37f5148..18f4bfa 100644
 
 # We use tracker-miners-3.0 rather than tracker3-miners inside the lib64
 # directory, following the existing convention in that directory.
-@@ -451,8 +451,8 @@ subdir('data')
+@@ -430,8 +430,8 @@ subdir('data')
 subdir('docs')
 
 test_c_args = tracker_c_args + [
@@ -52,11 +52,11 @@ index 37f5148..18f4bfa 100644
 ]
 
 if get_option('tests_tap_protocol')
-diff --git a/src/libtracker-miners-common/tracker-landlock.c b/src/libtracker-miners-common/tracker-landlock.c
+diff --git a/src/common/tracker-landlock.c b/src/common/tracker-landlock.c
-index 6d4510b..189d2fb 100644
+index 0ad90d0..354f5d1 100644
--- a/src/libtracker-miners-common/tracker-landlock.c
+--- a/src/common/tracker-landlock.c
-+++ b/src/libtracker-miners-common/tracker-landlock.c
+++ b/src/common/tracker-landlock.c
-@@ -282,7 +282,7 @@ tracker_landlock_init (const gchar * const *indexed_folders)
+@@ -283,7 +283,7 @@ tracker_landlock_init (const gchar * const *indexed_folders)
                                  LANDLOCK_ACCESS_FS_READ_DIR);
                }
        }
@@ -65,7 +65,7 @@ index 6d4510b..189d2fb 100644
        current_dir = g_get_current_dir ();
 
        /* Detect running in-tree */
-@@ -302,7 +302,7 @@ tracker_landlock_init (const gchar * const *indexed_folders)
+@@ -303,7 +303,7 @@ tracker_landlock_init (const gchar * const *indexed_folders)
                                  in_tree_rules[i].flags);
                }
        }
@@ -75,26 +75,26 @@ index 6d4510b..189d2fb 100644
 #ifdef MINER_FS_CACHE_LOCATION
        add_rule (landlock_fd, MINER_FS_CACHE_LOCATION,
 diff --git a/src/miners/fs/meson.build b/src/miners/fs/meson.build
-index 6e58832..04750f8 100644
+index 1e16618..286580a 100644
--- a/src/miners/fs/meson.build
+--- a/src/indexer/meson.build
-+++ b/src/miners/fs/meson.build
+++ b/src/indexer/meson.build
-@@ -67,8 +67,8 @@ executable('tracker-miner-fs-@0@'.format(tracker_api_major),
+@@ -68,8 +68,8 @@ executable('localsearch-@0@'.format(tracker_api_major),
     dependencies: tracker_miner_fs_deps,
     c_args: [
         tracker_c_args,
 -        '-DBUILDROOT="@0@"'.format(meson.global_build_root()),
-        '-DBUILD_EXTRACTDIR="@0@"'.format(meson.build_root() / 'src' / 'tracker-extract'),
+-        '-DBUILD_EXTRACTDIR="@0@"'.format(meson.build_root() / 'src' / 'extractor'),
 +        '-DBUILDROOT="@0@"'.format(get_option('prefix') / 'src'),
-+        '-DBUILD_EXTRACTDIR="@0@"'.format(get_option('prefix') / 'src' / 'tracker-extract'),
+        '-DBUILD_EXTRACTDIR="@0@"'.format(get_option('prefix') / 'src' / 'extractor'),
         '-DLIBEXECDIR="@0@"'.format(get_option('prefix') / get_option('libexecdir')),
     ],
     install: true,
 diff --git a/src/tracker-extract/meson.build b/src/tracker-extract/meson.build
-index 2e4f61d..b47581c 100644
+index 2584881..31411f2 100644
--- a/src/tracker-extract/meson.build
+--- a/src/extractor/meson.build
-+++ b/src/tracker-extract/meson.build
+++ b/src/extractor/meson.build
 @@ -158,7 +158,7 @@ endif
- executable('tracker-extract-@0@'.format(tracker_api_major),
+ executable('localsearch-extractor-@0@'.format(tracker_api_major),
   tracker_extract_sources,
   # Manually add the root dir to work around https://github.com/mesonbuild/meson/issues/1387
 -  c_args: tracker_c_args + ['-I' + meson.build_root()],
@@ -104,8 +104,8 @@ index 2e4f61d..b47581c 100644
   install: true,
 diff --git a/tests/tracker-miner-fs/meson.build b/tests/tracker-miner-fs/meson.build
 index 8c081fd..9792082 100644
--- a/tests/tracker-miner-fs/meson.build
+--- a/tests/indexer/meson.build
-+++ b/tests/tracker-miner-fs/meson.build
+++ b/tests/indexer/meson.build
 @@ -18,7 +18,7 @@ libtracker_miner_test_c_args = [
 ]
 
diff --git a/meta-gnome/recipes-gnome/tracker/tracker-miners_3.7.3.bb b/meta-gnome/recipes-gnome/tracker/localsearch_3.9.0.bb
index 2b2dc7c4b6..ffea1f76b3 100644
--- a/meta-gnome/recipes-gnome/tracker/tracker-miners_3.7.3.bb
+++ b/meta-gnome/recipes-gnome/tracker/localsearch_3.9.0.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \
 DEPENDS = " \
    intltool-native \
-    tracker \
+    tinysparql \
    zlib \
 "
@@ -18,7 +18,7 @@ SRC_URI:append = " \
        file://0001-fix-reproducibility.patch \
        file://0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch \
 "
-SRC_URI[archive.sha256sum] = "e74388154b5c197b4b7ee42f0dce8c5fbbddd4d361093ef88d4fb303e33da5fe"
+SRC_URI[archive.sha256sum] = "d42f408dc3fb28fe54f5a9abbf5f1decf5818db9c2e9ec51c09464bdfd0c14b9"
 # gobject-introspection is mandatory and cannot be configured
 REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
@@ -40,7 +40,6 @@ PACKAGECONFIG ??= " \
    xml \
    ${@bb.utils.filter('DISTRO_FEATURES', 'seccomp', d)} \
    battery \
-    networkmanager \
 "
 # Needs tgkill API which musl does not support
 # see https://www.openwall.com/lists/musl/2019/08/02/1
@@ -48,9 +47,9 @@ PACKAGECONFIG:remove:libc-musl = "seccomp"
 PACKAGECONFIG[battery]     = "-Dbattery_detection=upower,-Dbattery_detection=none,upower"
 PACKAGECONFIG[cue]     = "-Dcue=enabled,-Dcue=disabled,libcue"
-PACKAGECONFIG[ffmpeg]     = "-Dgeneric_media_extractor=libav,,ffmpeg"
+PACKAGECONFIG[ffmpeg]     = "-Dlibav=enabled,-Dlibav=disabled,ffmpeg"
 PACKAGECONFIG[gexiv2]     = ",,gexiv2"
-PACKAGECONFIG[gstreamer]  = "-Dgeneric_media_extractor=gstreamer,,gstreamer1.0 gstreamer1.0-plugins-base"
+PACKAGECONFIG[gstreamer]  = ",,gstreamer1.0 gstreamer1.0-plugins-base"
 PACKAGECONFIG[gupnp]      = "-Dgstreamer_backend=gupnp,,gupnp-dlna"
 PACKAGECONFIG[gif]        = "-Dgif=enabled,-Dgif=disabled,giflib"
 PACKAGECONFIG[icu]        = "-Dcharset_detection=icu,,icu"
@@ -63,14 +62,11 @@ PACKAGECONFIG[png]        = "-Dpng=enabled,-Dpng=disabled,libpng"
 PACKAGECONFIG[tiff]       = "-Dtiff=enabled,-Dtiff=disabled,tiff"
 PACKAGECONFIG[raw]       = "-Draw=enabled,-Draw=disabled,libraw"
 PACKAGECONFIG[xml]        = "-Dxml=enabled,-Dxml=disabled,libxml2"
-PACKAGECONFIG[networkmanager] = "-Dnetwork_manager=enabled,-Dnetwork_manager=disabled,networkmanager"
 PACKAGECONFIG[landlock]        = "-Dlandlock=enabled,-Dlandlock=disabled"
 # For security reasons it is strongly recommended to set add meta-security in
-# your layers and 'libseccomp' to PACKAGECONFIG".
+# your layers and 'libseccomp + landlock' to PACKAGECONFIG".
 PACKAGECONFIG[seccomp] = "-Dseccomp=true,-Dseccomp=false,libseccomp"
-# not yet in meta-gnome
-PACKAGECONFIG[rss]        = "-Dminer_rss=true,-Dminer_rss=false,libgrss"
 EXTRA_OEMESON += " \
    -Dman=false \
@@ -81,6 +77,6 @@ EXTRA_OEMESON += " \
 FILES:${PN} += " \
    ${datadir} \
-    ${libdir}/tracker-miners-3.0 \
+    ${libdir}/localsearch-3.0 \
    ${systemd_user_unitdir} \
 "
diff --git a/meta-gnome/recipes-gnome/tracker/tracker/0001-fix-reproducibility.patch b/meta-gnome/recipes-gnome/tracker/tinysparql/0001-fix-reproducibility.patch
index 4527f9efa3..20211cecf4 100644
--- a/meta-gnome/recipes-gnome/tracker/tracker/0001-fix-reproducibility.patch
+++ b/meta-gnome/recipes-gnome/tracker/tinysparql/0001-fix-reproducibility.patch
@@ -1,4 +1,4 @@
-From ae34fb111e1f2498f37b21c0c32ace6c9928ad66 Mon Sep 17 00:00:00 2001
+From 186d91759dd0e0815f5a9d3a709e2ececa24ff3d Mon Sep 17 00:00:00 2001
 From: Markus Volk <f_l_k@t-online.de>
 Date: Mon, 18 Sep 2023 02:47:55 +0200
 Subject: [PATCH] tracker: fix reproducibility issue
@@ -12,16 +12,17 @@ Upstream-Status: Inappropriate [oe-specific]
 Signed-off-by: Markus Volk <f_l_k@t-online.de>
 ---
- meson.build                       | 6 +++---
+ meson.build                   | 6 +++---
- src/libtracker-common/meson.build | 4 ++--
+ src/common/meson.build        | 4 ++--
- src/libtracker-sparql/meson.build | 4 ++--
+ src/http/tracker-http.c       | 2 +-
- 3 files changed, 7 insertions(+), 7 deletions(-)
+ src/libtinysparql/meson.build | 4 ++--
+ 4 files changed, 8 insertions(+), 8 deletions(-)
 diff --git a/meson.build b/meson.build
-index bc9f93a..6c86e5a 100644
+index 308ada3..0120be7 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -357,7 +357,7 @@ have_rtld_noload = cc.has_header_symbol('dlfcn.h', 'RTLD_NOLOAD')
+@@ -341,7 +341,7 @@ have_rtld_noload = cc.has_header_symbol('dlfcn.h', 'RTLD_NOLOAD')
 conf.set('HAVE_RTLD_NOLOAD', have_rtld_noload)
 
 # Config that goes in some other generated files (.desktop, .service, etc)
@@ -30,8 +31,8 @@ index bc9f93a..6c86e5a 100644
 conf.set('libexecdir', join_paths(get_option('prefix'), get_option('libexecdir')))
 
 configure_file(input: 'config.h.meson.in',
-@@ -396,8 +396,8 @@ subdir('docs')
+@@ -382,8 +382,8 @@ subdir('utils')
- subdir('utils')
+ subdir('fuzzing')
 
 test_c_args = tracker_c_args + [
 -    '-DTOP_BUILDDIR="@0@"'.format(build_root),
@@ -40,12 +41,12 @@ index bc9f93a..6c86e5a 100644
 +    '-DTOP_SRCDIR="@0@/"'.format('/usr/src/debug/tracker'),
 ]
 
- tracker_uninstalled_cli_dir = join_paths(meson.current_build_dir(), 'src', 'tracker')
+ tracker_uninstalled_testutils_dir = join_paths(meson.current_source_dir(), 'utils')
-diff --git a/src/libtracker-common/meson.build b/src/libtracker-common/meson.build
+diff --git a/src/common/meson.build b/src/common/meson.build
-index 9355d1c..cdbc05f 100644
+index b961ec3..edd76ce 100644
--- a/src/libtracker-common/meson.build
+--- a/src/common/meson.build
-+++ b/src/libtracker-common/meson.build
+++ b/src/common/meson.build
-@@ -51,10 +51,10 @@ libtracker_common = static_library('tracker-common',
+@@ -70,10 +70,10 @@ libtracker_common = static_library('tracker-common',
   dependencies: [tracker_common_dependencies, gmodule],
   c_args: [
     '-DPRIVATE_LIBDIR="@0@"'.format(tracker_internal_libs_dir),
@@ -58,13 +59,26 @@ index 9355d1c..cdbc05f 100644
   ] + tracker_c_args,
   include_directories: [configinc, srcinc],
   gnu_symbol_visibility: 'hidden',
-diff --git a/src/libtracker-sparql/meson.build b/src/libtracker-sparql/meson.build
+diff --git a/src/http/tracker-http.c b/src/http/tracker-http.c
-index 4143eac..b73f1c9 100644
+index dd82e99..cb3f1f7 100644
--- a/src/libtracker-sparql/meson.build
+--- a/src/http/tracker-http.c
-+++ b/src/libtracker-sparql/meson.build
+++ b/src/http/tracker-http.c
-@@ -98,10 +98,10 @@ libtracker_sparql_private = static_library('tracker-sparql-private',
+@@ -53,7 +53,7 @@ ensure_types (void)
+ 
+                current_dir = g_get_current_dir ();
+ 
+-               if (g_strcmp0 (current_dir, BUILDROOT) == 0) {
+               if (0) {
+                        /* Detect in-build runtime of this code, this may happen
+                         * building introspection information or running tests.
+                         * We want the in-tree modules to be loaded then.
+diff --git a/src/libtinysparql/meson.build b/src/libtinysparql/meson.build
+index e229b51..031f7e1 100644
+--- a/src/libtinysparql/meson.build
+++ b/src/libtinysparql/meson.build
+@@ -103,10 +103,10 @@ libtracker_sparql_private = static_library('tracker-sparql-private',
     c_args: [
-        '-include', 'libtracker-sparql/tracker-private.h',
+        '-include', 'tracker-private.h',
         '-DPRIVATE_LIBDIR="@0@"'.format(tracker_internal_libs_dir),
 -        '-DBUILD_LIBDIR="@0@"'.format(meson.current_build_dir()),
 +        '-DBUILD_LIBDIR="@0@"'.format('/usr/src/debug/tracker'),
@@ -74,4 +88,4 @@ index 4143eac..b73f1c9 100644
 +        '-DBUILDROOT="@0@"'.format('/usr/src/debug/tracker'),
     ] + tracker_c_args,
 
-     dependencies: [libtracker_sparql_dependencies, gvdb_dep],
+     dependencies: [libtracker_sparql_dependencies],
diff --git a/meta-gnome/recipes-gnome/tracker/tinysparql/0001-src-libtracker-sparql-meson.build-dont-create-compat.patch b/meta-gnome/recipes-gnome/tracker/tinysparql/0001-src-libtracker-sparql-meson.build-dont-create-compat.patch
new file mode 100644
index 0000000000..a9ed1caa52
--- /dev/null
+++ b/meta-gnome/recipes-gnome/tracker/tinysparql/0001-src-libtracker-sparql-meson.build-dont-create-compat.patch
@@ -0,0 +1,29 @@
+From 64d537a8e5e8dd2f651d8fe214b73bbc96cc5655 Mon Sep 17 00:00:00 2001
+From: Markus Volk <f_l_k@t-online.de>
+Date: Fri, 20 Sep 2024 16:43:44 +0200
+Subject: [PATCH] src/libtracker-sparql/meson.build: dont create compatibility
+ symlinks
+Using the sh script will cause package_qa error:
+Exception: Exception: KeyError: 'getpwuid(): uid not found: 1000'
+Path /home/flk/poky/build-hypr/tmp/work/corei7-64-poky-linux/tinysparql/3.8.0/sstate-build-package/package/usr/lib/libtracker-sparql-3.0.so is owned by uid 1000, gid 100, which doesn't match any user/group on target. This may be due to host contamination.
+Upstream-Status: Inappropriate [oe-specific]
+Signed-off-by: Markus Volk <f_l_k@t-online.de>
+---
+ src/libtinysparql/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/src/libtinysparql/meson.build b/src/libtinysparql/meson.build
+index 031f7e1..11f8a96 100644
+--- a/src/libtinysparql/meson.build
+++ b/src/libtinysparql/meson.build
+@@ -246,6 +246,6 @@ endif
+ 
+ tracker_sparql_uninstalled_dir = meson.current_build_dir()
+ 
+-meson.add_install_script('symlink-libtracker-sparql.sh', get_option('libdir'), meson.current_build_dir())
+#meson.add_install_script('symlink-libtracker-sparql.sh', get_option('libdir'), meson.current_build_dir())
+ 
+ meson.override_dependency('tinysparql-3.0', tracker_sparql_dep)
diff --git a/meta-gnome/recipes-gnome/tracker/tracker_3.7.3.bb b/meta-gnome/recipes-gnome/tracker/tinysparql_3.9.2.bb
index 885f3515da..1194b1f71b 100644
--- a/meta-gnome/recipes-gnome/tracker/tracker_3.7.3.bb
+++ b/meta-gnome/recipes-gnome/tracker/tinysparql_3.9.2.bb
@@ -7,22 +7,20 @@ LIC_FILES_CHKSUM = " \
 DEPENDS = " \
    dbus-native \
-    python3-pygobject-native \
    glib-2.0 \
    sqlite3 \
-    libarchive \
    dbus \
    icu \
    json-glib \
-    libsoup-3.0 \
+    libsoup \
    libstemmer \
 "
+inherit gettext gnomebase gobject-introspection vala gi-docgen bash-completion
-inherit gettext gnomebase gobject-introspection vala gtk-doc bash-completion python3native
 SRC_URI += "file://0001-fix-reproducibility.patch"
-SRC_URI[archive.sha256sum] = "ab3d4a50937e04c5ed7846f6dbb999e2909819402f389ca592ee6b77dd28d1f9"
+SRC_URI += "file://0001-src-libtracker-sparql-meson.build-dont-create-compat.patch"
+SRC_URI[archive.sha256sum] = "14ce039024135e181022bcce4b1aad2e00377dd9c7d812b98391ccfc756dad8e"
 # text search is not an option anymore and requires sqlite3 build with
 # PACKAGECONFIG[fts5] set (default)
@@ -39,21 +37,28 @@ EXTRA_OEMESON = " \
    -Dman=false \
    -Dsystemd_user_services=${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)} \
    -Dsystemd_user_services_dir=${systemd_user_unitdir} \
-    -Dsoup=soup3 \
+    -Dtests=false \
    ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-Dvapi=enabled', '-Dvapi=disabled', d)} \
 "
-do_install:prepend() {
-    sed -i -e 's|${B}/../${PN}-${PV}|${TARGET_DBGSRC_DIR}|g' ${B}/src/libtracker-sparql/tracker-sparql-enum-types.c
-    sed -i -e 's|${B}/../${PN}-${PV}|${TARGET_DBGSRC_DIR}|g' ${B}/src/libtracker-sparql/core/tracker-data-enum-types.c
-}
 GIR_MESON_ENABLE_FLAG = 'enabled'
 GIR_MESON_DISABLE_FLAG = 'disabled'
+GIDOCGEN_MESON_OPTION = "docs"
+PACKAGECONFIG ??= " \
+        ${@bb.utils.contains("DISTRO_FEATURES", "zeroconf", "avahi", "", d)} \
+        ${@bb.utils.contains("DISTRO_FEATURES", "api-documentation", "docs", "", d)} \
+"
+PACKAGECONFIG[avahi] = "-Davahi=enabled,-Davahi=disabled,avahi,"
+PACKAGECONFIG[docs] = ",,graphviz-native"
+do_install:prepend() {
+    sed -i -e 's|${B}|${TARGET_DBGSRC_DIR}|g' ${B}/src/libtinysparql/tracker-sparql-enum-types.c
+    sed -i -e 's|${B}|${TARGET_DBGSRC_DIR}|g' ${B}/src/libtinysparql/core/tracker-data-enum-types.c
+}
 FILES:${PN} += " \
    ${datadir}/dbus-1 \
-    ${datadir}/tracker3 \
+    ${libdir}/tinysparql-3.0 \
-    ${libdir}/tracker-3.0 \
    ${systemd_user_unitdir} \
 "
diff --git a/meta-gnome/recipes-gnome/yelp/yelp_42.2.bb b/meta-gnome/recipes-gnome/yelp/yelp_42.2.bb
index 1b3ded0211..14986f2650 100644
--- a/meta-gnome/recipes-gnome/yelp/yelp_42.2.bb
+++ b/meta-gnome/recipes-gnome/yelp/yelp_42.2.bb
@@ -39,3 +39,5 @@ FILES:${PN} += " \
 "
 RDEPENDS:${PN} += "yelp-xsl"
+CVE_STATUS[CVE-2008-3533] = "cpe-incorrect: The current version (42.2) is not affected. Fixed in 2.24."
diff --git a/meta-gnome/recipes-gnome/zenity/zenity_4.0.1.bb b/meta-gnome/recipes-gnome/zenity/zenity_4.0.3.bb
index 88b4b5c86c..058ae7bb6c 100644
--- a/meta-gnome/recipes-gnome/zenity/zenity_4.0.1.bb
+++ b/meta-gnome/recipes-gnome/zenity/zenity_4.0.3.bb
@@ -18,7 +18,7 @@ ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
 REQUIRED_DISTRO_FEATURES = "opengl"
 GTKIC_VERSION = "4"
-SRC_URI[archive.sha256sum] = "0c2f537813b10f728470d9d05d6c95713db2512f9c95096e1e85b1a6739605e6"
+SRC_URI[archive.sha256sum] = "b429d97b87bd9ce7fb72ac0b78df534725d8ad39817ddca6a4ca2ee5381b08de"
 PACKAGECONFIG ?= "webkitgtk"
 PACKAGECONFIG[webkitgtk] = "-Dwebkitgtk=true,-Dwebkitgtk=false,webkitgtk"
diff --git a/meta-gnome/recipes-graphics/clutter/clutter-1.0.inc b/meta-gnome/recipes-graphics/clutter/clutter-1.0.inc
index ce6b8a0f49..48e9d134ae 100644
--- a/meta-gnome/recipes-graphics/clutter/clutter-1.0.inc
+++ b/meta-gnome/recipes-graphics/clutter/clutter-1.0.inc
@@ -21,6 +21,9 @@ EDEPENDS_WAYLAND = "wayland libxkbcommon gdk-pixbuf"
 EDEPENDS_EVDEV = "libxkbcommon"
 ERDEPENDS_EVDEV = "xkeyboard-config"
+# Needed for finding introspection.m4
+EXTRA_AUTORECONF += "-I m4"
 # Disable pretty much everything, override in platform specific set up
 EXTRA_OECONF += "--disable-quartz-backend       \
                 --disable-win32-backend        \
diff --git a/meta-gnome/recipes-graphics/clutter/clutter-gst-3.0.inc b/meta-gnome/recipes-graphics/clutter/clutter-gst-3.0.inc
index 7880021755..ce6f3c521f 100644
--- a/meta-gnome/recipes-graphics/clutter/clutter-gst-3.0.inc
+++ b/meta-gnome/recipes-graphics/clutter/clutter-gst-3.0.inc
@@ -10,7 +10,10 @@ inherit clutter features_check upstream-version-is-even gobject-introspection
 # depends on clutter-1.0 which depends on cogl-1.0
 REQUIRED_DISTRO_FEATURES ?= "opengl"
-export GST_PLUGIN_SCANNER_1_0="${S}/gst-plugin-scanner-dummy"
+# Needed for introspection.m4
+EXTRA_AUTORECONF += "-I m4"
+export GST_PLUGIN_SCANNER_1_0 = "${S}/gst-plugin-scanner-dummy"
 SRC_URI += "file://0001-Install-example-binary-needed-for-core-image-clutter.patch"
diff --git a/meta-gnome/recipes-graphics/cogl/cogl-1.0.inc b/meta-gnome/recipes-graphics/cogl/cogl-1.0.inc
index 3da361b3ff..b1ef57ce57 100644
--- a/meta-gnome/recipes-graphics/cogl/cogl-1.0.inc
+++ b/meta-gnome/recipes-graphics/cogl/cogl-1.0.inc
@@ -29,6 +29,8 @@ EDEPENDS_WAYLAND = "virtual/egl virtual/libgles2 wayland"
 ERDEPENDS_GL    = "libgl"
 ERDEPENDS_GLES2 = "libgles2"
+# Needed for introspection.m4
+EXTRA_AUTORECONF += "-I m4"
 # GLESv1 is rarely tested, so disable it
 EXTRA_OECONF += "--enable-examples-install      \
                 --enable-debug                 \
diff --git a/meta-gnome/recipes-graphics/cogl/cogl-1.0/0001-cogl-path-add-explicit-cast-to-avoid-an-incompatible.patch b/meta-gnome/recipes-graphics/cogl/cogl-1.0/0001-cogl-path-add-explicit-cast-to-avoid-an-incompatible.patch
new file mode 100644
index 0000000000..a9f2d654d1
--- /dev/null
+++ b/meta-gnome/recipes-graphics/cogl/cogl-1.0/0001-cogl-path-add-explicit-cast-to-avoid-an-incompatible.patch
@@ -0,0 +1,94 @@
+From 69690b0fdff43cdf6ab1718cd86396de3b27081f Mon Sep 17 00:00:00 2001
+From: Yoann Congal <yoann.congal@smile.fr>
+Date: Tue, 6 May 2025 00:00:38 +0200
+Subject: [PATCH] cogl-path: add explicit cast to avoid an
+ incompatible-pointer-types error
+Callbacks declarations are not compatible with gluTessCallback(...,
+_GLUfuncptr CallBackFunc) under gcc15. Use an intermediary (void *) cast
+to workaround the incompatible-pointer-types error.
+This is safe to do because inside gluTessCallback(), function pointers
+are cast back to their proper prototypes.
+This corrects these 4 errors:
+|../../cogl-1.22.8/cogl-path/cogl-path.c: In function '_cogl_path_build_fill_attribute_buffer':
+|../../cogl-1.22.8/cogl-path/cogl-path.c:1361:20: error: passing argument 3 of 'gluTessCallback' from incompatible pointer type [-Wincompatible-pointer-types]
+| 1361 |                    _cogl_path_tesselator_begin);
+|      |                    ^~~~~~~~~~~~~~~~~~~~~~~~~~~
+|      |                    |
+|      |                    void (*)(GLenum,  CoglPathTesselator *) {aka void (*)(unsigned int,  struct _CoglPathTesselator *)}
+|In file included from ../../cogl-1.22.8/cogl-path/cogl-path.c:49:
+|../../cogl-1.22.8/cogl-path/tesselator/tesselator.h:57:70: note: expected 'void (*)(void)' but argument is of type 'void (*)(GLenum,  CoglPathTesselator *)' {aka 'void (*)(unsigned int,  struct _CoglPathTesselator *)'}
+|   57 | void gluTessCallback (GLUtesselator* tess, GLenum which, _GLUfuncptr CallBackFunc);
+|      |                                                          ~~~~~~~~~~~~^~~~~~~~~~~~
+|../../cogl-1.22.8/cogl-path/cogl-path.c:1094:1: note: '_cogl_path_tesselator_begin' declared here
+| 1094 | _cogl_path_tesselator_begin (GLenum type,
+|      | ^~~~~~~~~~~~~~~~~~~~~~~~~~~
+|../../cogl-1.22.8/cogl-path/cogl-path.c:1363:20: error: passing argument 3 of 'gluTessCallback' from incompatible pointer type [-Wincompatible-pointer-types]
+| 1363 |                    _cogl_path_tesselator_vertex);
+|      |                    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
+|      |                    |
+|      |                    void (*)(void *, CoglPathTesselator *) {aka void (*)(void *, struct _CoglPathTesselator *)}
+|../../cogl-1.22.8/cogl-path/tesselator/tesselator.h:57:70: note: expected 'void (*)(void)' but argument is of type 'void (*)(void *, CoglPathTesselator *)' {aka 'void (*)(void *, struct _CoglPathTesselator *)'}
+|   57 | void gluTessCallback (GLUtesselator* tess, GLenum which, _GLUfuncptr CallBackFunc);
+|      |                                                          ~~~~~~~~~~~~^~~~~~~~~~~~
+|../../cogl-1.22.8/cogl-path/cogl-path.c:1164:1: note: '_cogl_path_tesselator_vertex' declared here
+| 1164 | _cogl_path_tesselator_vertex (void *vertex_data,
+|      | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
+|../../cogl-1.22.8/cogl-path/cogl-path.c:1365:20: error: passing argument 3 of 'gluTessCallback' from incompatible pointer type [-Wincompatible-pointer-types]
+| 1365 |                    _cogl_path_tesselator_end);
+|      |                    ^~~~~~~~~~~~~~~~~~~~~~~~~
+|      |                    |
+|      |                    void (*)(CoglPathTesselator *) {aka void (*)(struct _CoglPathTesselator *)}
+|../../cogl-1.22.8/cogl-path/tesselator/tesselator.h:57:70: note: expected 'void (*)(void)' but argument is of type 'void (*)(CoglPathTesselator *)' {aka 'void (*)(struct _CoglPathTesselator *)'}
+|   57 | void gluTessCallback (GLUtesselator* tess, GLenum which, _GLUfuncptr CallBackFunc);
+|      |                                                          ~~~~~~~~~~~~^~~~~~~~~~~~
+|../../cogl-1.22.8/cogl-path/cogl-path.c:1223:1: note: '_cogl_path_tesselator_end' declared here
+| 1223 | _cogl_path_tesselator_end (CoglPathTesselator *tess)
+|      | ^~~~~~~~~~~~~~~~~~~~~~~~~
+|../../cogl-1.22.8/cogl-path/cogl-path.c:1367:20: error: passing argument 3 of 'gluTessCallback' from incompatible pointer type [-Wincompatible-pointer-types]
+| 1367 |                    _cogl_path_tesselator_combine);
+|      |                    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+|      |                    |
+|      |                    void (*)(double *, void **, float *, void **, CoglPathTesselator *) {aka void (*)(double *, void **, float *, void **, struct _CoglPathTesselator *)}
+|../../cogl-1.22.8/cogl-path/tesselator/tesselator.h:57:70: note: expected 'void (*)(void)' but argument is of type 'void (*)(double *, void **, float *, void **, CoglPathTesselator *)' {aka 'void (*)(double *, void **, float *, void **, struct _CoglPathTesselator *)'}
+|   57 | void gluTessCallback (GLUtesselator* tess, GLenum which, _GLUfuncptr CallBackFunc);
+|      |                                                          ~~~~~~~~~~~~^~~~~~~~~~~~
+|../../cogl-1.22.8/cogl-path/cogl-path.c:1229:1: note: '_cogl_path_tesselator_combine' declared here
+| 1229 | _cogl_path_tesselator_combine (double coords[3],
+|      | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+|make[3]: *** [Makefile:905: libcogl_path_la-cogl-path.lo] Error 1
+Upstream-Status: Inactive-Upstream [lastcommit: 2021-05-02]
+Gitlab instance is redirected to https://gitlab.gnome.org/Archive/cogl
+with a notice: "This is an archived project. Repository and other
+project resources are read-only."
+Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
+---
+ cogl-path/cogl-path.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+diff --git a/cogl-path/cogl-path.c b/cogl-path/cogl-path.c
+index 2b4b3c6..f87ea4a 100644
+--- a/cogl-path/cogl-path.c
+++ b/cogl-path/cogl-path.c
+@@ -1358,13 +1358,13 @@ _cogl_path_build_fill_attribute_buffer (CoglPath *path)
+   gluTessNormal (tess.glu_tess, 0.0, 0.0, 1.0);
+ 
+   gluTessCallback (tess.glu_tess, GLU_TESS_BEGIN_DATA,
+-                   _cogl_path_tesselator_begin);
+                   (void *) _cogl_path_tesselator_begin);
+   gluTessCallback (tess.glu_tess, GLU_TESS_VERTEX_DATA,
+-                   _cogl_path_tesselator_vertex);
+                   (void *) _cogl_path_tesselator_vertex);
+   gluTessCallback (tess.glu_tess, GLU_TESS_END_DATA,
+-                   _cogl_path_tesselator_end);
+                   (void *) _cogl_path_tesselator_end);
+   gluTessCallback (tess.glu_tess, GLU_TESS_COMBINE_DATA,
+-                   _cogl_path_tesselator_combine);
+                   (void *) _cogl_path_tesselator_combine);
+ 
+   gluTessBeginPolygon (tess.glu_tess, &tess);
+ 
diff --git a/meta-gnome/recipes-graphics/cogl/cogl-1.0_1.22.8.bb b/meta-gnome/recipes-graphics/cogl/cogl-1.0_1.22.8.bb
index b9446fab38..8e9a74d20d 100644
--- a/meta-gnome/recipes-graphics/cogl/cogl-1.0_1.22.8.bb
+++ b/meta-gnome/recipes-graphics/cogl/cogl-1.0_1.22.8.bb
@@ -1,6 +1,9 @@
 require cogl-1.0.inc
-SRC_URI += "file://0001-configure.ac-don-t-require-eglmesaext.h.patch"
+SRC_URI += " \
+        file://0001-configure.ac-don-t-require-eglmesaext.h.patch \
+        file://0001-cogl-path-add-explicit-cast-to-avoid-an-incompatible.patch \
+"
 SRC_URI[archive.sha256sum] = "a805b2b019184710ff53d0496f9f0ce6dcca420c141a0f4f6fcc02131581d759"
 LIC_FILES_CHKSUM = "file://COPYING;md5=1b1a508d91d25ca607c83f92f3e31c84"
diff --git a/meta-gnome/recipes-support/accountsservice/accountsservice/0001-musl-Hack-to-fix-build.patch b/meta-gnome/recipes-support/accountsservice/accountsservice/0001-musl-Hack-to-fix-build.patch
deleted file mode 100644
index 944d2f9165..0000000000
--- a/meta-gnome/recipes-support/accountsservice/accountsservice/0001-musl-Hack-to-fix-build.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From ff0718174faf1167fb4765ebe4bd280bbe8d2ac6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Sun, 8 Dec 2019 23:42:00 +0100
-Subject: [PATCH] musl: Hack to fix configure
-Upstream-Status: Inappropriate [Musl Specific]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- meson.build | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-diff --git a/meson.build b/meson.build
-index 075776f..dfd7421 100644
--- a/meson.build
-+++ b/meson.build
-@@ -101,9 +101,14 @@ elif cc.has_header_symbol('paths.h', '_PATH_WTMPX')
- 
-   config_h.set('PATH_WTMP', '_PATH_WTMPX')
- else
-  path_wtmp = '/var/log/utx.log'
-  assert(run_command('test', '-e', path_wtmp).returncode() == 0, 'Do not know which filename to watch for wtmp changes')
-  config_h.set_quoted('PATH_WTMP', path_wtmp)
-+  # musl: This is just a build fix hack.
-+  # As usual they know better, consider all other projects crap and offer zero
-+  # alternatives: So wtmp is a dead stub only [1] (= /dev/null/wtmp - taken
-+  # from musl sources).
-+  # Maybe a hero comes along and adds utmps [2] to make accountsservice useful for musl
-+  # [1] https://wiki.musl-libc.org/faq.html#Q:-Why-is-the-utmp/wtmp-functionality-only-implemented-as-stubs?
-+  # [2] https://github.com/skarnet/utmps
-+  config_h.set_quoted('PATH_WTMP', '/dev/null/wtmp')
- endif
- 
- # compiler flags
-- 
-2.34.1
diff --git a/meta-gnome/recipes-support/accountsservice/accountsservice/0002-musl-add-missing-fgetspent_r.patch b/meta-gnome/recipes-support/accountsservice/accountsservice/0002-musl-add-missing-fgetspent_r.patch
index 2b0924b2e4..dfc27b7302 100644
--- a/meta-gnome/recipes-support/accountsservice/accountsservice/0002-musl-add-missing-fgetspent_r.patch
+++ b/meta-gnome/recipes-support/accountsservice/accountsservice/0002-musl-add-missing-fgetspent_r.patch
@@ -1,27 +1,29 @@
-From 7401e682400df87f3258f795bb1d143f64a35a9f Mon Sep 17 00:00:00 2001
+From 87c5c711f6f828053abd754628a0067696cfd54d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Mon, 9 Dec 2019 00:12:08 +0100
+Date: Mon, 9 Dec 2019 09:36:12 +0100
 Subject: [PATCH] musl: add missing fgetspent_r
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
 Stolen from void-linux
 Upstream-Status: Inappropriate [musl-specific]
 ---
- src/daemon.c | 20 ++++++++++++++++++++
+ src/daemon.c | 22 ++++++++++++++++++++++
- 1 file changed, 20 insertions(+)
+ 1 file changed, 22 insertions(+)
 diff --git a/src/daemon.c b/src/daemon.c
-index c52bda3..a7676fe 100644
+index aa9d050..cc53eae 100644
 --- a/src/daemon.c
 +++ b/src/daemon.c
-@@ -164,6 +164,26 @@ remove_cache_files (const gchar *user_name)
+@@ -215,6 +215,28 @@ remove_cache_files (const gchar *user_name)
         g_remove (icon_filename);
 }
 
-+/* Musl libc does not support fgetspent_r(), write own
+#ifndef __GLIBC__
-+ * wrapper
+ /* Musl libc does not support fgetspent_r(), write own
-+ */
+  * wrapper
+  */
 +static int fgetspent_r(FILE *fp, struct spwd *spbuf, char *buf, size_t buflen, struct spwd **spbufp) {
 +       struct spwd *shadow_entry = fgetspent(fp);
 +       if(!shadow_entry)
@@ -38,6 +40,7 @@ index c52bda3..a7676fe 100644
 +
 +       return 0;
 +}
+#endif
 +
 static struct passwd *
 entry_generator_fgetpwent (Daemon       *daemon,
diff --git a/meta-gnome/recipes-support/accountsservice/accountsservice/00b6e12ad4044d33cc54c71c75773c5a653dad09.patch b/meta-gnome/recipes-support/accountsservice/accountsservice/00b6e12ad4044d33cc54c71c75773c5a653dad09.patch
new file mode 100644
index 0000000000..d7b6525934
--- /dev/null
+++ b/meta-gnome/recipes-support/accountsservice/accountsservice/00b6e12ad4044d33cc54c71c75773c5a653dad09.patch
@@ -0,0 +1,115 @@
+From 747d781c1ccf3b8112ec6a098f23f26ccadc5880 Mon Sep 17 00:00:00 2001
+From: oreo639 <oreo6391@gmail.com>
+Date: Sun, 9 Feb 2025 23:24:08 -0800
+Subject: [PATCH] build: Disable tests when cross compiling and allow
+ specifying path_wtmp
+ 
+Upstream-Status: Backport [https://gitlab.freedesktop.org/accountsservice/accountsservice/-/commit/00b6e12ad4044d33cc54c71c75773c5a653dad09]
+Signed-off-by: Markus Volk <f_l_k@t-online.de>
+---
+ meson.build       | 64 ++++++++++++++++++++++++++---------------------
+ meson_options.txt |  2 ++
+ 2 files changed, 38 insertions(+), 28 deletions(-)
+diff --git a/meson.build b/meson.build
+index 4a509e7..2a56627 100644
+--- a/meson.build
+++ b/meson.build
+@@ -77,34 +77,40 @@ foreach func: check_functions
+   config_h.set('HAVE_' + func.underscorify().to_upper(), cc.has_function(func))
+ endforeach
+ 
+-if cc.has_header_symbol('utmpx.h', 'WTMPX_FILENAME', prefix: '#define _GNU_SOURCE')
+-  code = '''#define _GNU_SOURCE
+-  #include <stdio.h>
+-  #include <utmpx.h>
+-  int main (int argc, char **argv) {
+-    printf ("%s\n", WTMPX_FILENAME);
+-    return 0;
+-  }
+-  '''
+-  result = cc.run(code, name : 'value of WTMPX_FILENAME')
+-  path_wtmp = result.stdout().strip()
+-
+-  config_h.set('PATH_WTMP', 'WTMPX_FILENAME')
+-elif cc.has_header_symbol('paths.h', '_PATH_WTMPX')
+-  code = '''#include <paths.h>
+-  #include <stdio.h>
+-  int main (int argc, char **argv) {
+-    printf ("%s\n", _PATH_WTMPX);
+-    return 0;
+-  }
+-  '''
+-  result = cc.run(code, name : 'value of _PATH_WTMPX')
+-  path_wtmp = result.stdout().strip()
+-
+-  config_h.set('PATH_WTMP', '_PATH_WTMPX')
+path_wtmp = get_option('wtmpfile')
+if path_wtmp == ''
+  if cc.has_header_symbol('utmpx.h', 'WTMPX_FILENAME', prefix: '#define _GNU_SOURCE') and meson.can_run_host_binaries()
+    code = '''#define _GNU_SOURCE
+    #include <stdio.h>
+    #include <utmpx.h>
+    int main (int argc, char **argv) {
+      printf ("%s\n", WTMPX_FILENAME);
+      return 0;
+    }
+    '''
+    result = cc.run(code, name : 'value of WTMPX_FILENAME')
+    path_wtmp = result.stdout().strip()
+
+    config_h.set('PATH_WTMP', 'WTMPX_FILENAME')
+  elif cc.has_header_symbol('paths.h', '_PATH_WTMPX') and meson.can_run_host_binaries()
+    code = '''#include <paths.h>
+    #include <stdio.h>
+    int main (int argc, char **argv) {
+      printf ("%s\n", _PATH_WTMPX);
+      return 0;
+    }
+    '''
+    result = cc.run(code, name : 'value of _PATH_WTMPX')
+    path_wtmp = result.stdout().strip()
+
+    config_h.set('PATH_WTMP', '_PATH_WTMPX')
+  else
+    assert(not meson.is_cross_build(), 'Cannot determine wtmp for this cross compile, please specify -Dwtmpfile=')
+    path_wtmp = '/var/log/utx.log'
+    assert(run_command('test', '-e', path_wtmp, check: false).returncode() == 0, 'Do not know which filename to watch for wtmp changes')
+    config_h.set_quoted('PATH_WTMP', path_wtmp)
+  endif
+ else
+-  path_wtmp = '/var/log/utx.log'
+-  assert(run_command('test', '-e', path_wtmp, check: false).returncode() == 0, 'Do not know which filename to watch for wtmp changes')
+   config_h.set_quoted('PATH_WTMP', path_wtmp)
+ endif
+ 
+@@ -232,7 +238,9 @@ if get_option('gtk_doc')
+   subdir('doc/libaccountsservice')
+ endif
+ 
+-subdir('tests')
+if get_option('tests') and meson.can_run_host_binaries()
+  subdir('tests')
+endif
+ 
+ configure_file(
+   output: 'config.h',
+diff --git a/meson_options.txt b/meson_options.txt
+index b34a0fa..e25c61e 100644
+--- a/meson_options.txt
+++ b/meson_options.txt
+@@ -1,6 +1,7 @@
+ option('systemdsystemunitdir', type: 'string', value: '', description: 'custom directory for systemd system units')
+ option('gdmconffile', type: 'string', value: '/etc/gdm/custom.conf', description: 'GDM configuration file')
+ option('lightdmconffile', type: 'string', value: '/etc/lightdm/lightdm.conf', description: 'LightDM configuration file')
+option('wtmpfile', type: 'string', value: '', description: 'override filepath of wtmp file')
+ 
+ option('admin_group', type: 'string', value: '', description: 'Set group for administrative accounts')
+ option('extra_admin_groups', type: 'array', value: [], description: 'Comma-separated list of extra groups that administrator users are part of')
+@@ -13,3 +14,4 @@ option('vapi', type: 'boolean', value: true, description : 'Enable Vala bindings
+ 
+ option('docbook', type: 'boolean', value: false, description: 'build documentation (requires xmlto)')
+ option('gtk_doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation')
+option('tests',   type: 'boolean', value: true, description: 'run accountservice tests if possible')
diff --git a/meta-gnome/recipes-support/accountsservice/accountsservice/accountsservice-23.13.9-c99-fixes.patch b/meta-gnome/recipes-support/accountsservice/accountsservice/accountsservice-23.13.9-c99-fixes.patch
new file mode 100644
index 0000000000..ffb6ffca18
--- /dev/null
+++ b/meta-gnome/recipes-support/accountsservice/accountsservice/accountsservice-23.13.9-c99-fixes.patch
@@ -0,0 +1,51 @@
+From 97ff4512ea17600d390d67b59e6d0058d1b0b7d5 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Tue, 11 Apr 2023 10:09:07 -0400
+Subject: [PATCH] mocklibc: Fix compiler warning
+https://bugs.gentoo.org/930715
+https://gitlab.freedesktop.org/accountsservice/accountsservice/-/commit/da65bee12d9118fe1a49c8718d428fe61d232339
+print_indent is defined in one file and used in another without a
+forward declaration. That leads to a compiler warning/error.
+This commit fixes that.
+Upstream-Status: Backport [https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-apps/accountsservice/files/accountsservice-23.13.9-c99-fixes.patch]
+Signed-off-by: Markus Volk <f_l_k@t-online.de>
+---
+ subprojects/mocklibc.wrap                           |  2 ++
+ subprojects/packagefiles/mocklibc-print-indent.diff | 13 +++++++++++++
+ 2 files changed, 15 insertions(+)
+ create mode 100644 subprojects/packagefiles/mocklibc-print-indent.diff
+diff --git a/subprojects/mocklibc.wrap b/subprojects/mocklibc.wrap
+index af82298..539ee83 100644
+--- a/subprojects/mocklibc.wrap
+++ b/subprojects/mocklibc.wrap
+@@ -8,3 +8,5 @@ source_hash = b2236a6af1028414783e9734a46ea051916ec226479d6a55a3bb823bff68f120
+ patch_url = https://wrapdb.mesonbuild.com/v1/projects/mocklibc/1.0/2/get_zip
+ patch_filename = mocklibc-1.0-2-wrap.zip
+ patch_hash = 0280f96a2eeb3c023e5acf4e00cef03d362868218d4a85347ea45137c0ef6c56
+
+diff_files = mocklibc-print-indent.diff
+diff --git a/subprojects/packagefiles/mocklibc-print-indent.diff b/subprojects/packagefiles/mocklibc-print-indent.diff
+new file mode 100644
+index 0000000..4aaed40
+--- /dev/null
+++ b/subprojects/packagefiles/mocklibc-print-indent.diff
+@@ -0,0 +1,13 @@
+diff -up mocklibc-1.0/src/netgroup-debug.c.print-indent mocklibc-1.0/src/netgroup-debug.c
+--- mocklibc-1.0/src/netgroup-debug.c.print-indent     2023-04-11 10:20:53.717381559 -0400
++++ mocklibc-1.0/src/netgroup-debug.c  2023-04-11 10:21:02.296270333 -0400
+@@ -21,6 +21,9 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
++void print_indent (FILE        *stream,
++                   unsigned int indent);
++
+ void netgroup_debug_print_entry(struct entry *entry, FILE *stream, unsigned int indent) {
+   print_indent(stream, indent);
+ 
diff --git a/meta-gnome/recipes-support/accountsservice/accountsservice_22.08.8.bb b/meta-gnome/recipes-support/accountsservice/accountsservice_23.13.9.bb
index 439958c7d2..e3dfcfffff 100644
--- a/meta-gnome/recipes-support/accountsservice/accountsservice_22.08.8.bb
+++ b/meta-gnome/recipes-support/accountsservice/accountsservice_23.13.9.bb
@@ -5,24 +5,35 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 DEPENDS = " \
    dbus \
+    glib-2.0 \
+    json-c \
    polkit \
+    virtual/crypt \
 "
-inherit meson gobject-introspection gtk-doc features_check systemd vala
+inherit meson gobject-introspection gtk-doc features_check systemd vala pkgconfig
 REQUIRED_DISTRO_FEATURES = "polkit"
-SRC_URI = "https://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz"
+SRC_URI = " \
+        https://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz \
+        file://accountsservice-23.13.9-c99-fixes.patch \
+        file://00b6e12ad4044d33cc54c71c75773c5a653dad09.patch \
+"
 SRC_URI:append:libc-musl = " \
-    file://0001-musl-Hack-to-fix-build.patch \
+        file://0002-musl-add-missing-fgetspent_r.patch \
-    file://0002-musl-add-missing-fgetspent_r.patch \
 "
-SRC_URI[sha256sum] = "909997a76919fe7dc138a9a01cea70bd622d5a932dbc9fb13010113023a7a391"
+EXTRA_OEMESON:libc-musl += "-Dwtmpfile=/var/log/wtmp -Dtests=false"
+SRC_URI[sha256sum] = "adda4cdeae24fa0992e7df3ffff9effa7090be3ac233a3edfdf69d5a9c9b924f"
 GTKDOC_MESON_OPTION = "gtk_doc"
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} admin_group"
-PACKAGECONFIG[systemd] = ", -Dsystemdsystemunitdir='no', systemd"
+PACKAGECONFIG[systemd] = ",,systemd"
+PACKAGECONFIG[elogind] = "-Delogind=true,-Delogind=false,elogind"
+PACKAGECONFIG[admin_group] = "-Dadmin_group=wheel"
 SYSTEMD_SERVICE:${PN} = "accounts-daemon.service"
diff --git a/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.3.0.bb b/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.3.1.bb
index 0e86d781ce..1c6d34e461 100644
--- a/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.3.0.bb
+++ b/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.3.1.bb
@@ -10,7 +10,7 @@ DEPENDS = " \
 "
 SRC_URI = "http://www.freedesktop.org/software/colord/releases/${BPN}-${PV}.tar.xz"
-SRC_URI[sha256sum] = "b9466656d66d9a6ffbc2dd04fa91c8f6af516bf9efaacb69744eec0f56f3c1d0"
+SRC_URI[sha256sum] = "c176b889b75630a17f4e3d7ef24c09a3e12368e633496087459c8b53ac3a122d"
 PACKAGECONFIG ??= "gtk3 gtk4"
 PACKAGECONFIG[gtk3] = "-Dgtk3=true, -Dgtk3=false, gtk+3"
diff --git a/meta-gnome/recipes-support/ibus/ibus.bb b/meta-gnome/recipes-support/ibus/ibus.bb
index 141341e341..479498d82f 100644
--- a/meta-gnome/recipes-support/ibus/ibus.bb
+++ b/meta-gnome/recipes-support/ibus/ibus.bb
@@ -30,6 +30,7 @@ FILES:${PN} += " \
    ${datadir}/dbus-1 \
    ${datadir}/GConf \
    ${datadir}/glib-2.0 \
+    ${libdir}/gtk-2.0 \
    ${libdir}/gtk-3.0 \
    ${libdir}/gtk-4.0 \
    ${systemd_user_unitdir} \
diff --git a/meta-gnome/recipes-support/ibus/ibus.inc b/meta-gnome/recipes-support/ibus/ibus.inc
index 9d0600c794..9ec1dfe578 100644
--- a/meta-gnome/recipes-support/ibus/ibus.inc
+++ b/meta-gnome/recipes-support/ibus/ibus.inc
@@ -13,9 +13,10 @@ SRC_URI = " \
    git://github.com/ibus/ibus.git;branch=main;protocol=https \
    file://0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch \
    file://0001-makefile-don-t-gzip-the-man-pages.patch \
+    file://0002-util-IMdkit-Fix-incompatible-pointer-types-in-Transp.patch \
+    file://0001-src-Fix-declaration-errors-with-GCC-15.patch \
 "
 SRCREV = "6a70ab0338206bd1c7d01a4e1874ea0ee5b3a9d3"
-S = "${WORKDIR}/git"
 PACKAGECONFIG[appindicator] = "--enable-appindicator,--disable-appindicator,qtbase"
 PACKAGECONFIG[dconf] = "--enable-dconf,--disable-dconf,dconf"
diff --git a/meta-gnome/recipes-support/ibus/ibus/0001-src-Fix-declaration-errors-with-GCC-15.patch b/meta-gnome/recipes-support/ibus/ibus/0001-src-Fix-declaration-errors-with-GCC-15.patch
new file mode 100644
index 0000000000..150ff631ba
--- /dev/null
+++ b/meta-gnome/recipes-support/ibus/ibus/0001-src-Fix-declaration-errors-with-GCC-15.patch
@@ -0,0 +1,36 @@
+From 0f5407f8a3846477fcaa73505437e805467901e1 Mon Sep 17 00:00:00 2001
+From: fujiwarat <takao.fujiwara1@gmail.com>
+Date: Fri, 24 Jan 2025 09:40:31 +0900
+Subject: [PATCH] src: Fix declaration errors with GCC 15
+BUG=rhbz#2340629
+Upstream-Status: Backport [https://github.com/ibus/ibus/commit/aac5446e8c98db934912b9b15a1ef92c3b7e4c8c]
+Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
+---
+ src/ibusenginesimple.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+diff --git a/src/ibusenginesimple.c b/src/ibusenginesimple.c
+index c57a3ea5..60e7fb34 100644
+--- a/src/ibusenginesimple.c
+++ b/src/ibusenginesimple.c
+@@ -477,7 +477,7 @@ check_hex (IBusEngineSimple *simple,
+ }
+ 
+ static IBusEngineDict *
+-load_emoji_dict ()
+load_emoji_dict (void)
+ {
+     IBusEngineDict *emoji_dict;
+     GList *keys;
+@@ -520,7 +520,7 @@ check_emoji_table (IBusEngineSimple       *simple,
+         g_object_ref_sink (priv->lookup_table);
+     }
+     if (emoji_dict == NULL)
+-        emoji_dict = priv->emoji_dict = load_emoji_dict (simple);
+        emoji_dict = priv->emoji_dict = load_emoji_dict ();
+ 
+     if (emoji_dict == NULL || emoji_dict->dict == NULL)
+         return FALSE;
diff --git a/meta-gnome/recipes-support/ibus/ibus/0002-util-IMdkit-Fix-incompatible-pointer-types-in-Transp.patch b/meta-gnome/recipes-support/ibus/ibus/0002-util-IMdkit-Fix-incompatible-pointer-types-in-Transp.patch
new file mode 100644
index 0000000000..229a9d34aa
--- /dev/null
+++ b/meta-gnome/recipes-support/ibus/ibus/0002-util-IMdkit-Fix-incompatible-pointer-types-in-Transp.patch
@@ -0,0 +1,109 @@
+From b0a554d7c9d4d52bd34a85fe66a85adf9542a2ec Mon Sep 17 00:00:00 2001
+From: fujiwarat <takao.fujiwara1@gmail.com>
+Date: Fri, 24 Jan 2025 10:01:11 +0900
+Subject: [PATCH] util/IMdkit: Fix incompatible-pointer-types in
+ TransportSW.checkAddr
+BUG=rhbz#2340629
+Upstream-Status: Backport [https://github.com/ibus/ibus/commit/d039b95b1af14fd34167a4ca038938cef2ea41ca]
+Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
+---
+ util/IMdkit/Xi18n.h           | 18 ++++++++++--------
+ util/IMdkit/i18nMethod.c      |  3 ++-
+ util/IMdkit/i18nOffsetCache.c | 10 ++++++----
+ 3 files changed, 18 insertions(+), 13 deletions(-)
+diff --git a/util/IMdkit/Xi18n.h b/util/IMdkit/Xi18n.h
+index 79dd9619..09097bb6 100644
+--- a/util/IMdkit/Xi18n.h
+++ b/util/IMdkit/Xi18n.h
+@@ -3,7 +3,7 @@
+          Copyright (C) 1994-1995 Sun Microsystems, Inc.
+          Copyright (C) 1993-1994 Hewlett-Packard Company
+          Copyright (C) 2014 Peng Huang <shawn.p.huang@gmail.com>
+-         Copyright (C) 2014 Red Hat, Inc.
+         Copyright (C) 2014-2025 Red Hat, Inc.
+  
+ Permission to use, copy, modify, distribute, and sell this software
+ and its documentation for any purpose is hereby granted without fee,
+@@ -71,13 +71,6 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ #define I18N_SET       1
+ #define I18N_GET       2
+ 
+-typedef struct
+-{
+-    char        *transportname;
+-    int         namelen;
+-    Bool        (*checkAddr) ();
+-} TransportSW;
+-
+ typedef struct _XIMPending
+ {
+     unsigned    char *p;
+@@ -172,6 +165,15 @@ typedef struct _Xi18nClient
+ 
+ typedef struct _Xi18nCore *Xi18n;
+ 
+typedef struct _TransportSW TransportSW;
+
+struct _TransportSW
+{
+    char        *transportname;
+    int         namelen;
+    Bool        (*checkAddr) (Xi18n, TransportSW *, char *);
+};
+
+ /*
+  * Callback Struct for XIM Protocol
+  */
+diff --git a/util/IMdkit/i18nMethod.c b/util/IMdkit/i18nMethod.c
+index 9c44e7fe..7f343d87 100644
+--- a/util/IMdkit/i18nMethod.c
+++ b/util/IMdkit/i18nMethod.c
+@@ -2,6 +2,7 @@
+  
+          Copyright 1994, 1995 by Sun Microsystems, Inc.
+          Copyright 1993, 1994 by Hewlett-Packard Company
+         Copyright (C) 2014-2025 Red Hat, Inc.
+  
+ Permission to use, copy, modify, distribute, and sell this software
+ and its documentation for any purpose is hereby granted without fee,
+@@ -89,7 +90,7 @@ TransportSW _TransR[] =
+ #ifdef DNETCONN
+     {"decnet",          6, _Xi18nCheckTransAddress},
+ #endif
+-    {(char *) NULL,     0, (Bool (*) ()) NULL}
+    {(char *) NULL,     0, (Bool (*) (Xi18n, TransportSW *, char *))NULL}
+ };
+ 
+ static Bool GetInputStyles (Xi18n i18n_core, XIMStyles **p_style)
+diff --git a/util/IMdkit/i18nOffsetCache.c b/util/IMdkit/i18nOffsetCache.c
+index e2fe8c6b..cab974c7 100644
+--- a/util/IMdkit/i18nOffsetCache.c
+++ b/util/IMdkit/i18nOffsetCache.c
+@@ -1,6 +1,6 @@
+ /*
+  * Copyright (C) 2014 Peng Huang <shawn.p.huang@gmail.com>
+- * Copyright (C) 2014 Red Hat, Inc.
+ * Copyright (C) 2014-2025 Red Hat, Inc.
+  *
+  * Permission to use, copy, modify, distribute, and sell this
+  * software and its documentation for any purpose is hereby granted
+@@ -83,10 +83,12 @@ void _Xi18nSetPropertyOffset (Xi18nOffsetCache *offset_cache, Atom key,
+     }
+ 
+     if (++offset_cache->size > offset_cache->capacity) {
+-        offset_cache->capacity *= OFFSET_CACHE_GROWTH_FACTOR;
+-        offset_cache->data = (Xi18nAtomOffsetPair *) realloc (data,
+        Xi18nAtomOffsetPair *pair = (Xi18nAtomOffsetPair *) realloc (data,
+                 offset_cache->capacity * sizeof (Xi18nAtomOffsetPair));
+-        if (offset_cache->data == NULL) {
+        offset_cache->capacity *= OFFSET_CACHE_GROWTH_FACTOR;
+        if (pair) {
+            offset_cache->data = pair;
+        } else {
+             offset_cache->data = data;
+             --offset_cache->size;
+         }
diff --git a/meta-gnome/recipes-support/keybinder/keybinder_3.0.bb b/meta-gnome/recipes-support/keybinder/keybinder_3.0.bb
index 7960009078..bbd7c866e1 100644
--- a/meta-gnome/recipes-support/keybinder/keybinder_3.0.bb
+++ b/meta-gnome/recipes-support/keybinder/keybinder_3.0.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "keybinder is a library for registering global key bindings, for gtk-based applications."
 HOMEPAGE = "https://github.com/engla/keybinder"
-LICENSE = "X11"
+LICENSE = "MIT"
 SECTION = "devel/lib"
 DEPENDS = "gtk+3 gobject-introspection-native \
           gtk+ \
@@ -8,7 +8,6 @@ DEPENDS = "gtk+3 gobject-introspection-native \
 LIC_FILES_CHKSUM = "file://COPYING;md5=1f18f9c6d8b4cfcc7d7804a243a4c0b4"
-S = "${WORKDIR}/git"
 SRCREV = "736ccef40d39603b8111c8a3a0bca0319bbafdc0"
 PV = "3.0+git"
diff --git a/meta-gnome/recipes-support/libcloudproviders/libcloudproviders_0.3.6.bb b/meta-gnome/recipes-support/libcloudproviders/libcloudproviders_0.3.6.bb
index f5660b5267..7ea7c50462 100644
--- a/meta-gnome/recipes-support/libcloudproviders/libcloudproviders_0.3.6.bb
+++ b/meta-gnome/recipes-support/libcloudproviders/libcloudproviders_0.3.6.bb
@@ -1,5 +1,5 @@
 SUMMARY = "libcloudproviders is a DBus API that allows cloud storage sync clients to expose their services."
-LICENSE="LGPL-3.0-or-later"
+LICENSE = "LGPL-3.0-or-later"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02"
 VALA_MESON_OPTION ?= 'vapigen'
diff --git a/meta-gnome/recipes-support/libuser/libuser/0001-configure.ac-update-version-to-0.64.patch b/meta-gnome/recipes-support/libuser/libuser/0001-configure.ac-update-version-to-0.64.patch
new file mode 100644
index 0000000000..950312f031
--- /dev/null
+++ b/meta-gnome/recipes-support/libuser/libuser/0001-configure.ac-update-version-to-0.64.patch
@@ -0,0 +1,25 @@
+From 206cfdff171e5ce0df02e635ba0d331a7dc5d992 Mon Sep 17 00:00:00 2001
+From: Changqing Li <changqing.li@windriver.com>
+Date: Mon, 14 Apr 2025 14:48:08 +0800
+Subject: [PATCH] configure.ac: update version to 0.64
+Upstream-Status: Submitted [http://pagure.io/libuser/issue/74]
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/configure.ac b/configure.ac
+index 51508b7..68c6e50 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -1,4 +1,4 @@
+-AC_INIT([libuser], [0.62], [https://pagure.io/libuser], ,
+AC_INIT([libuser], [0.64], [https://pagure.io/libuser], ,
+         [https://pagure.io/libuser])
+ AC_PREREQ([2.63b])
+ AC_CONFIG_HEADERS(config.h)
+-- 
+2.34.1
diff --git a/meta-gnome/recipes-support/libuser/libuser_0.64.bb b/meta-gnome/recipes-support/libuser/libuser_0.64.bb
index 6d3bce8a1c..27cbb43486 100644
--- a/meta-gnome/recipes-support/libuser/libuser_0.64.bb
+++ b/meta-gnome/recipes-support/libuser/libuser_0.64.bb
@@ -15,6 +15,7 @@ SRC_URI = "https://releases.pagure.org/libuser/libuser-${PV}.tar.gz \
           file://0001-docs-Disable-building.patch \
           file://0002-remove-unused-execinfo.h.patch \
           file://gtkdoc.patch \
+           file://0001-configure.ac-update-version-to-0.64.patch \
           "
 SRC_URI[sha256sum] = "ea6094c72cb9e60a42fb53509dc98d124a340f1c9222783b503208adc16a0a8f"
diff --git a/meta-gnome/recipes-support/libwacom/libwacom_2.8.0.bb b/meta-gnome/recipes-support/libwacom/libwacom_2.8.0.bb
index 8f45221ad3..f816cdf239 100644
--- a/meta-gnome/recipes-support/libwacom/libwacom_2.8.0.bb
+++ b/meta-gnome/recipes-support/libwacom/libwacom_2.8.0.bb
@@ -15,7 +15,6 @@ DEPENDS = " \
    libgudev \
 "
-S = "${WORKDIR}/git"
 inherit meson pkgconfig
diff --git a/meta-gnome/recipes-support/webp-pixbuf-loader/webp-pixbuf-loader_0.2.7.bb b/meta-gnome/recipes-support/webp-pixbuf-loader/webp-pixbuf-loader_0.2.7.bb
index 73f22a3d95..726139a6b3 100644
--- a/meta-gnome/recipes-support/webp-pixbuf-loader/webp-pixbuf-loader_0.2.7.bb
+++ b/meta-gnome/recipes-support/webp-pixbuf-loader/webp-pixbuf-loader_0.2.7.bb
@@ -14,7 +14,6 @@ EXTRA_OEMESON = "-Dupdate_cache=true"
 SRC_URI = "git://github.com/aruiz/webp-pixbuf-loader.git;protocol=https;branch=mainline"
-S = "${WORKDIR}/git"
 SRCREV = "52232e4ba282b2fed68e8fcb4b5d45ed0eaa4ed3"
 FILES:${PN} = " \
diff --git a/meta-gnome/recipes-support/xdg-desktop-portal/xdg-desktop-portal-gnome_46.2.bb b/meta-gnome/recipes-support/xdg-desktop-portal/xdg-desktop-portal-gnome_48.0.bb
index e1dd8afae9..019353bc88 100644
--- a/meta-gnome/recipes-support/xdg-desktop-portal/xdg-desktop-portal-gnome_46.2.bb
+++ b/meta-gnome/recipes-support/xdg-desktop-portal/xdg-desktop-portal-gnome_48.0.bb
@@ -21,7 +21,7 @@ inherit gnomebase pkgconfig gsettings features_check
 REQUIRED_DISTRO_FEATURES = "polkit"
-SRC_URI[archive.sha256sum] = "b5c65ea25e8483502d033a613be6dc6b71883ac07f1a3e474ad18049c47d16d6"
+SRC_URI[archive.sha256sum] = "cd15aca2e1364da308eb3796bb8ae4a577e60ca4fe12006b315232cfd19c8861"
 PACKAGECONFIG ?= "screenshot screencast ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}"
 PACKAGECONFIG[wayland] = ",,wayland-native"
diff --git a/meta-gnome/recipes-support/xdg-desktop-portal/xdg-desktop-portal-gtk_1.15.1.bb b/meta-gnome/recipes-support/xdg-desktop-portal/xdg-desktop-portal-gtk_1.15.3.bb
index 0d2b0012c5..5e83a07a4b 100644
--- a/meta-gnome/recipes-support/xdg-desktop-portal/xdg-desktop-portal-gtk_1.15.1.bb
+++ b/meta-gnome/recipes-support/xdg-desktop-portal/xdg-desktop-portal-gtk_1.15.3.bb
@@ -17,8 +17,7 @@ REQUIRED_DISTRO_FEATURES = "polkit"
 SRC_URI = "git://github.com/flatpak/xdg-desktop-portal-gtk.git;protocol=https;branch=main"
-S = "${WORKDIR}/git"
+SRCREV = "337202d4e7179857bc37b03c1a6d8c9d92e47c44"
-SRCREV = "54003825481c2b48fd0c42355b484469dea12020"
 PACKAGECONFIG ?= "wallpaper appchooser lockdown settings"