From 21caa0fa425965dafc9032180f4abdc26cc17742 Mon Sep 17 00:00:00 2001
From: Markus Volk <f_l_k@t-online.de>
Date: Wed, 29 May 2024 08:38:03 +0200
Subject: [PATCH] add S = "${WORKDIR}/sources" for go recipes

---
 recipes-gtk/nwg-shell/ddcpopup_git.bb          | 5 +++--
 recipes-gtk/nwg-shell/gopsuinfo_git.bb         | 4 +++-
 recipes-gtk/nwg-shell/nwg-bar_git.bb           | 3 ++-
 recipes-gtk/nwg-shell/nwg-dock-hyprland_git.bb | 3 ++-
 recipes-gtk/nwg-shell/nwg-dock_git.bb          | 3 ++-
 recipes-gtk/nwg-shell/nwg-drawer_git.bb        | 3 ++-
 recipes-gtk/nwg-shell/nwg-look_git.bb          | 3 ++-
 recipes-gtk/nwg-shell/nwg-menu_git.bb          | 3 ++-
 recipes-gtk/nwg-shell/nwgocc_git.bb            | 3 ++-
 9 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/recipes-gtk/nwg-shell/ddcpopup_git.bb b/recipes-gtk/nwg-shell/ddcpopup_git.bb
index 3bd8b03..d349f0a 100644
--- a/recipes-gtk/nwg-shell/ddcpopup_git.bb
+++ b/recipes-gtk/nwg-shell/ddcpopup_git.bb
@@ -12,10 +12,11 @@ RDEPENDS:${PN} = "ddcutil"
 
 GO_IMPORT = "github.com/nwg-piotr/ddcpopup.git"
 
-SRC_URI = "git://${GO_IMPORT};nobranch=1;protocol=https"
-
+SRC_URI = "git://${GO_IMPORT};destsuffix=src/${GO_IMPORT};nobranch=1;protocol=https"
 PV = "0.1"
 SRCREV = "8fab5132e49e08a1eeaa7a0dd3350d06f4399200"
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
 
 inherit go go-mod pkgconfig
 
diff --git a/recipes-gtk/nwg-shell/gopsuinfo_git.bb b/recipes-gtk/nwg-shell/gopsuinfo_git.bb
index 94eb9a1..a1faf9b 100644
--- a/recipes-gtk/nwg-shell/gopsuinfo_git.bb
+++ b/recipes-gtk/nwg-shell/gopsuinfo_git.bb
@@ -4,9 +4,11 @@ LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=22ed6cb3c33862e689e075b4
 
 GO_IMPORT = "github.com/nwg-piotr/gopsuinfo.git"
 
-SRC_URI = "git://${GO_IMPORT};branch=main;protocol=https"
+SRC_URI = "git://${GO_IMPORT};destsuffix=src/${GO_IMPORT};branch=main;protocol=https"
 PV = "0.1.5"
 SRCREV = "60e4f83b6c4d84955e0a07f7bdc63d8089b4ba1e"
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
 
 inherit go go-mod
 
diff --git a/recipes-gtk/nwg-shell/nwg-bar_git.bb b/recipes-gtk/nwg-shell/nwg-bar_git.bb
index ef80f45..d12ee79 100644
--- a/recipes-gtk/nwg-shell/nwg-bar_git.bb
+++ b/recipes-gtk/nwg-shell/nwg-bar_git.bb
@@ -15,7 +15,8 @@ SRC_URI = "git://${GO_IMPORT};destsuffix=src/${GO_IMPORT};nobranch=1;protocol=ht
 
 PV = "0.1.5"
 SRCREV = "86f75d0856193c1ba1505f6afbc1b73d34c7093a"
-S = "${UNPACKDIR}"
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
 
 inherit go go-mod pkgconfig
 
diff --git a/recipes-gtk/nwg-shell/nwg-dock-hyprland_git.bb b/recipes-gtk/nwg-shell/nwg-dock-hyprland_git.bb
index 419d3e4..3211a20 100644
--- a/recipes-gtk/nwg-shell/nwg-dock-hyprland_git.bb
+++ b/recipes-gtk/nwg-shell/nwg-dock-hyprland_git.bb
@@ -14,7 +14,8 @@ SRC_URI = "git://${GO_IMPORT};destsuffix=src/${GO_IMPORT};nobranch=1;protocol=ht
 
 PV = "0.1.9"
 SRCREV = "d4cd7439ebfb29238674b94deb120695dd1425f1"
-S = "${UNPACKDIR}"
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
 
 inherit go go-mod pkgconfig
 
diff --git a/recipes-gtk/nwg-shell/nwg-dock_git.bb b/recipes-gtk/nwg-shell/nwg-dock_git.bb
index 6b914a6..690f18f 100644
--- a/recipes-gtk/nwg-shell/nwg-dock_git.bb
+++ b/recipes-gtk/nwg-shell/nwg-dock_git.bb
@@ -14,7 +14,8 @@ SRC_URI = "git://${GO_IMPORT};destsuffix=src/${GO_IMPORT};nobranch=1;protocol=ht
 
 PV = "0.3.9"
 SRCREV = "6fdd055eaff282298ea5496d203514b5f99314a0"
-S = "${UNPACKDIR}"
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
 
 inherit go go-mod pkgconfig
 
diff --git a/recipes-gtk/nwg-shell/nwg-drawer_git.bb b/recipes-gtk/nwg-shell/nwg-drawer_git.bb
index da3bfc3..3c44d8e 100644
--- a/recipes-gtk/nwg-shell/nwg-drawer_git.bb
+++ b/recipes-gtk/nwg-shell/nwg-drawer_git.bb
@@ -15,7 +15,8 @@ SRC_URI = "git://${GO_IMPORT};destsuffix=src/${GO_IMPORT};nobranch=1;protocol=ht
 
 PV = "0.4.7"
 SRCREV = "0cd48d1631eecb3043ee2c1fed9dfa25ca855375"
-S = "${UNPACKDIR}"
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
 
 inherit go go-mod pkgconfig
 
diff --git a/recipes-gtk/nwg-shell/nwg-look_git.bb b/recipes-gtk/nwg-shell/nwg-look_git.bb
index d8981fc..48b84c6 100644
--- a/recipes-gtk/nwg-shell/nwg-look_git.bb
+++ b/recipes-gtk/nwg-shell/nwg-look_git.bb
@@ -10,7 +10,8 @@ GO_IMPORT = "github.com/nwg-piotr/nwg-look"
 SRC_URI = "git://${GO_IMPORT};destsuffix=src/${GO_IMPORT};branch=main;protocol=https"
 SRCREV = "88f2639445084bf265ad71dba1c7af507c471762"
 PV = "0.2.7"
-S = "${UNPACKDIR}"
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
 
 inherit go go-mod pkgconfig gtk-icon-cache
 
diff --git a/recipes-gtk/nwg-shell/nwg-menu_git.bb b/recipes-gtk/nwg-shell/nwg-menu_git.bb
index 8b0b083..49c3ff9 100644
--- a/recipes-gtk/nwg-shell/nwg-menu_git.bb
+++ b/recipes-gtk/nwg-shell/nwg-menu_git.bb
@@ -19,7 +19,8 @@ SRC_URI = "git://${GO_IMPORT};destsuffix=src/${GO_IMPORT};nobranch=1;protocol=ht
 
 PV = "0.1.3"
 SRCREV = "fd8b92ad1ad0c0c7a23fc7a0be942ca0cbe7f7e0"
-S = "${UNPACKDIR}"
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
 
 inherit go go-mod pkgconfig
 
diff --git a/recipes-gtk/nwg-shell/nwgocc_git.bb b/recipes-gtk/nwg-shell/nwgocc_git.bb
index 0997eee..99983cc 100644
--- a/recipes-gtk/nwg-shell/nwgocc_git.bb
+++ b/recipes-gtk/nwg-shell/nwgocc_git.bb
@@ -17,7 +17,8 @@ SRC_URI = "git://${GO_IMPORT};destsuffix=src/${GO_IMPORT};nobranch=1;protocol=ht
 
 PV = "0.0.1"
 SRCREV = "782a37014de40f63115825c0b5bd343dee2ba668"
-S = "${UNPACKDIR}"
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
 
 inherit go go-mod pkgconfig gtk-icon-cache