27 files changed, 9 insertions, 29 deletions

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/recipes-connectivity/geary/geary_46.0.bb b/meta-gnome/recipes-connectivity/geary/geary_46.0.bb
index 81aa923c03..2012534993 100644
--- a/meta-gnome/recipes-connectivity/geary/geary_46.0.bb
+++ b/meta-gnome/recipes-connectivity/geary/geary_46.0.bb
@@ -41,7 +41,6 @@ SRC_URI = " \
         file://0001-meson-Do-not-check-for-iso-xml-files-during-build.patch \
 "
 
-S = "${WORKDIR}/git"
 SRCREV = "46e93c0c0dafc381e8a308b1befb07e908121722"
 
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
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/gimp/gimp_3.0.4.bb b/meta-gnome/recipes-gimp/gimp/gimp_3.0.4.bb
index 32603af310..414f9c5203 100644
--- a/meta-gnome/recipes-gimp/gimp/gimp_3.0.4.bb
+++ b/meta-gnome/recipes-gimp/gimp/gimp_3.0.4.bb
@@ -63,7 +63,6 @@ SRC_URI += "file://0001-meson.build-dont-check-for-lgi.patch"
 SRC_URI += "file://0001-meson.build-require-iso-codes-native.patch"
 SRCREV = "c1901c5be644ab8dcaf779b1f383bf5370bc90c6"
 
-S = "${WORKDIR}/git"
 
 PACKAGECONFIG[aa] = "-Daa=enabled,-Daa=disabled,aalib"
 PACKAGECONFIG[alsa] = "-Dalsa=enabled,-Dalsa=disabled,alsa-lib"
diff --git a/meta-gnome/recipes-gimp/mypaint/libmypaint_git.bb b/meta-gnome/recipes-gimp/mypaint/libmypaint_git.bb
index b0f9b82e42..b64e91a765 100644
--- a/meta-gnome/recipes-gimp/mypaint/libmypaint_git.bb
+++ b/meta-gnome/recipes-gimp/mypaint/libmypaint_git.bb
@@ -19,7 +19,6 @@ SRCREV = "2768251dacce3939136c839aeca413f4aa4241d0"
 
 PV = "1.6.1"
 
-S = "${WORKDIR}/git"
 
 EXTRA_AUTORECONF += "-I m4"
 
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/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/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"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 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/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/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-chess/gnome-chess_48.0.bb b/meta-gnome/recipes-gnome/gnome-chess/gnome-chess_48.0.bb
index 0e41626e6d..3aa353748b 100644
--- a/meta-gnome/recipes-gnome/gnome-chess/gnome-chess_48.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-chess/gnome-chess_48.0.bb
@@ -28,7 +28,6 @@ inherit meson pkgconfig gobject-introspection gtk-icon-cache vala features_check
 
 GIR_MESON_OPTION = ""
 
-S = "${WORKDIR}/git"
 SRCREV = "b0bf5288438f74fcb455e1e49f855b4964a2c7cb"
 
 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-terminal/gnome-terminal_3.54.0.bb b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.54.0.bb
index cfbde967fd..332c2c5423 100644
--- a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.54.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.54.0.bb
@@ -24,7 +24,6 @@ SRC_URI = " \
         file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch \
 "
 SRCREV = "965cb9307713c618253918633416fcad86bcc5d2"
-S = "${WORKDIR}/git"
 
 PACKAGECONFIG ?= ""
 PACKAGECONFIG[nautilus] = "-Dnautilus_extension=true,-Dnautilus_extension=false,nautilus,nautilus"
diff --git a/meta-gnome/recipes-gnome/gnome-user-share/gnome-user-share_47.0.bb b/meta-gnome/recipes-gnome/gnome-user-share/gnome-user-share_47.0.bb
index 07d631bccb..3b087c148d 100644
--- a/meta-gnome/recipes-gnome/gnome-user-share/gnome-user-share_47.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-user-share/gnome-user-share_47.0.bb
@@ -16,7 +16,6 @@ REQUIRED_DISTRO_FEATURES = "systemd"
 SRC_URI = "git://gitlab.gnome.org/GNOME/gnome-user-share.git;protocol=https;branch=master"
 SRC_URI += "file://0001-build-Define-list-of-libc-feature-test-macros.patch"
 SRCREV = "77ecbaddab0ed2121859926acbfccc9cecdee0db"
-S = "${WORKDIR}/git"
 
 PACKAGECONFIG ??= "modules"
 PACKAGECONFIG[httpd] = "-Dhttpd=${sbindir}/httpd,,,apache2 mod-dnssd"
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"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 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 d3fa032fcd..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
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 109050397c..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,7 +8,7 @@ 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
 
diff --git a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.16.0.bb b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.16.0.bb
index 939d053a75..7076214a4d 100644
--- a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.16.0.bb
+++ b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.16.0.bb
@@ -16,7 +16,7 @@ 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
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/libgweather/libgweather4_4.4.4.bb b/meta-gnome/recipes-gnome/libgweather/libgweather4_4.4.4.bb
index 85bc21b5da..3d8a5ed33a 100644
--- a/meta-gnome/recipes-gnome/libgweather/libgweather4_4.4.4.bb
+++ b/meta-gnome/recipes-gnome/libgweather/libgweather4_4.4.4.bb
@@ -4,7 +4,7 @@ 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
 
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-support/ibus/ibus.inc b/meta-gnome/recipes-support/ibus/ibus.inc
index 9dce2ce4f3..9ec1dfe578 100644
--- a/meta-gnome/recipes-support/ibus/ibus.inc
+++ b/meta-gnome/recipes-support/ibus/ibus.inc
@@ -17,7 +17,6 @@ SRC_URI = " \
     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/keybinder/keybinder_3.0.bb b/meta-gnome/recipes-support/keybinder/keybinder_3.0.bb
index 5365db270e..bbd7c866e1 100644
--- a/meta-gnome/recipes-support/keybinder/keybinder_3.0.bb
+++ b/meta-gnome/recipes-support/keybinder/keybinder_3.0.bb
@@ -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/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-gtk_1.15.3.bb b/meta-gnome/recipes-support/xdg-desktop-portal/xdg-desktop-portal-gtk_1.15.3.bb
index 0f6a9291b8..5e83a07a4b 100644
--- a/meta-gnome/recipes-support/xdg-desktop-portal/xdg-desktop-portal-gtk_1.15.3.bb
+++ b/meta-gnome/recipes-support/xdg-desktop-portal/xdg-desktop-portal-gtk_1.15.3.bb
@@ -17,7 +17,6 @@ REQUIRED_DISTRO_FEATURES = "polkit"
 
 SRC_URI = "git://github.com/flatpak/xdg-desktop-portal-gtk.git;protocol=https;branch=main"
 
-S = "${WORKDIR}/git"
 SRCREV = "337202d4e7179857bc37b03c1a6d8c9d92e47c44"
 
 PACKAGECONFIG ?= "wallpaper appchooser lockdown settings"