From 359f9e6301a3db556efb7b785acb81e5de7645a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= Date: Wed, 5 Jul 2023 20:05:41 +0200 Subject: [PATCH] Update to delve-1.21.0 --- .gitignore | 1 + 0001-Skip-TestCgoStacktrace2.patch | 24 ++++++++++++++++++++++++ delve.spec | 6 +++++- sources | 2 +- 4 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 0001-Skip-TestCgoStacktrace2.patch diff --git a/.gitignore b/.gitignore index c712e4d..01db2e0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /delve-1.20.1.tar.gz /delve-1.20.2.tar.gz +/delve-1.21.0.tar.gz diff --git a/0001-Skip-TestCgoStacktrace2.patch b/0001-Skip-TestCgoStacktrace2.patch new file mode 100644 index 0000000..4d2e0ac --- /dev/null +++ b/0001-Skip-TestCgoStacktrace2.patch @@ -0,0 +1,24 @@ +From dff6a7871debe62db762eea34a1356f11fda305c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=81lex=20S=C3=A1ez?= +Date: Mon, 31 Jul 2023 14:46:54 +0200 +Subject: [PATCH] Skip TestCgoStacktrace2 + +--- + pkg/proc/proc_test.go | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/pkg/proc/proc_test.go b/pkg/proc/proc_test.go +index 0cb84f6b..88db4c43 100644 +--- a/pkg/proc/proc_test.go ++++ b/pkg/proc/proc_test.go +@@ -4606,6 +4606,7 @@ func TestCgoStacktrace2(t *testing.T) { + skipOn(t, "upstream issue", "windows") + skipOn(t, "broken", "386") + skipOn(t, "broken", "arm64") ++ skipOn(t, "broken", "amd64") + protest.MustHaveCgo(t) + // If a panic happens during cgo execution the stacktrace should show the C + // function that caused the problem. +-- +2.41.0 + diff --git a/delve.spec b/delve.spec index 1163e19..b398e93 100644 --- a/delve.spec +++ b/delve.spec @@ -3,7 +3,7 @@ # https://github.com/go-delve/delve %global goipath github.com/go-delve/delve -Version: 1.20.2 +Version: 1.21.0 %global common_description %{expand: Delve is a debugger for the Go programming language. The goal of the project @@ -57,6 +57,8 @@ BuildRequires: golang(go.starlark.net/syntax) BuildRequires: lsof BuildRequires: git +Patch1: 0001-Skip-TestCgoStacktrace2.patch + %description %{common_description} @@ -66,8 +68,10 @@ echo "=== Start prep ===" %goprep -k # unpack vendored dependencies to GOPATH tar c -C vendor/ . | tar x -C %{gobuilddir}/src +%autopatch -v -p1 %else %goprep +%autopatch -v -p1 %generate_buildrequires %go_generate_buildrequires diff --git a/sources b/sources index fa13bed..df8bd86 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (delve-1.20.2.tar.gz) = c48027d200257d0a979fbf2ea3a65f6dc645d1c231264023b10c216de1e3d80db86ac775cdb02f4dcd261756c8e26bbdce598cce709eb2aa4c9853f2e0cf6cf8 +SHA512 (delve-1.21.0.tar.gz) = 2b2249b14d5565fbb59408251a1272db8e092ab7ac7cb65d33b810b89f1352d3b487a8d582dde8f1102d0362ee142e6106c98cd217c5031c9a09497d20a0cdde