From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 05 16:23:42 2021 Received: (at 49221) by debbugs.gnu.org; 5 Aug 2021 20:23:42 +0000 Received: from localhost ([127.0.0.1]:48526 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mBju2-0004Gr-6D for submit@debbugs.gnu.org; Thu, 05 Aug 2021 16:23:42 -0400 Received: from out2.migadu.com ([188.165.223.204]:30900) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mBjtz-0004Gh-WD for 49221@debbugs.gnu.org; Thu, 05 Aug 2021 16:23:41 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mgsn.dev; s=key1; t=1628195019; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=WdBBjkyDf8MVTgHDZAeUqn1Mg5jvT5v57/G+x01wXlg=; b=bVXSqVpoFXjmMKH4fiQCl28zt8fdiDBW1IaEoEpUpVYbZkqRQlheNlPdzkz+Zt9ZdEZU0V Aqb1UI5kYYb/8/F36b3/BN6EKH/OU00p7iOwPdKd0yX2ylVdMhi8ISvVJVSukH8jSOZdBU OgwueiUWvbaRgoQnxPBeRdF5TOV3dOQ= From: Sarah Morgensen To: Maxim Cournoyer Subject: Re: bug#49221: [PATCH 00/13] Add go-1.16 and build with gccgo References: <00966aa0d291e3eeed89103fc456981171b403cf.1624602942.git.iskarian@mgsn.dev> <87wnoz7qvs.fsf_-_@gmail.com> Date: Thu, 05 Aug 2021 13:23:37 -0700 In-Reply-To: <87wnoz7qvs.fsf_-_@gmail.com> (Maxim Cournoyer's message of "Thu, 05 Aug 2021 13:17:27 -0400") Message-ID: <868s1f3ak6.fsf_-_@mgsn.dev> MIME-Version: 1.0 Content-Type: text/plain X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 49221 Cc: 49221@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Maxim, Maxim Cournoyer writes: > Hello, > > Sarah Morgensen writes: > >> * gnu/packages/patches/go-github-com-bmatcuk-doublestar-1.3-remove-test.patch: >> New file. >> * gnu/local.mk (dist_patch_DATA): Register it. >> * gnu/packages/golang.scm (go-github-com-bmatcuk-doublestar): Use it. >> --- >> gnu/local.mk | 1 + >> gnu/packages/golang.scm | 5 ++++- >> ...b-com-bmatcuk-doublestar-1.3-remove-test.patch | 15 +++++++++++++++ >> 3 files changed, 20 insertions(+), 1 deletion(-) >> create mode 100644 gnu/packages/patches/go-github-com-bmatcuk-doublestar-1.3-remove-test.patch >> >> diff --git a/gnu/local.mk b/gnu/local.mk >> index 9caae52306..a176772ece 100644 >> --- a/gnu/local.mk >> +++ b/gnu/local.mk >> @@ -1172,6 +1172,7 @@ dist_patch_DATA = \ >> %D%/packages/patches/gobject-introspection-cc.patch \ >> %D%/packages/patches/gobject-introspection-girepository.patch \ >> %D%/packages/patches/go-skip-gc-test.patch \ >> + %D%/packages/patches/go-github-com-bmatcuk-doublestar-1.3-remove-test.patch \ >> %D%/packages/patches/gpm-glibc-2.26.patch \ >> %D%/packages/patches/gpodder-disable-updater.patch \ >> %D%/packages/patches/gpsbabel-fix-i686-test.patch \ >> diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm >> index 9d5fc36710..3170e11925 100644 >> --- a/gnu/packages/golang.scm >> +++ b/gnu/packages/golang.scm >> @@ -5314,7 +5314,10 @@ template functions.") >> (file-name (git-file-name name version)) >> (sha256 >> (base32 >> - "0bk5bixl6rqa8znxghyp6zndbccx9kdyrymjahgyp6qsrp7rk144")))) >> + "0bk5bixl6rqa8znxghyp6zndbccx9kdyrymjahgyp6qsrp7rk144")) >> + (patches >> + (search-patches >> + "go-github-com-bmatcuk-doublestar-1.3-remove-test.patch")))) >> (build-system go-build-system) >> (arguments >> `(#:import-path "github.com/bmatcuk/doublestar")) >> diff --git a/gnu/packages/patches/go-github-com-bmatcuk-doublestar-1.3-remove-test.patch b/gnu/packages/patches/go-github-com-bmatcuk-doublestar-1.3-remove-test.patch >> new file mode 100644 >> index 0000000000..2c64575914 >> --- /dev/null >> +++ b/gnu/packages/patches/go-github-com-bmatcuk-doublestar-1.3-remove-test.patch >> @@ -0,0 +1,15 @@ >> +Remove test which fails with Go >= 1.15 due to API changes. >> +This patch should no longer be necessary with doublestar v4+ >> + >> +diff --git a/doublestar_test.go b/doublestar_test.go >> +index b21d20ad4b..f510c3d06b 100644 >> +--- a/doublestar_test.go >> ++++ b/doublestar_test.go >> +@@ -80,7 +80,6 @@ var matchTests = []MatchTest{ >> + {"[", "a", false, ErrBadPattern, true}, >> + {"[^", "a", false, ErrBadPattern, true}, >> + {"[^bc", "a", false, ErrBadPattern, true}, >> +- {"a[", "a", false, nil, false}, >> + {"a[", "ab", false, ErrBadPattern, true}, >> + {"*x", "xxx", true, nil, true}, >> + {"[abc]", "b", true, nil, true}, > > This should be reported upstream, if the test is still not working with > the latest release (v4.0.2). It is fixed in v2 or v3, but those are backwards-incompatible upgrades, so I backported this patch. > > Thanks, > > Maxim -- Sarah