diff options
Diffstat (limited to 'www-apps/hugo/files')
3 files changed, 64 insertions, 38 deletions
diff --git a/www-apps/hugo/files/hugo-0.92.2-link-to-webp-and-sass.patch b/www-apps/hugo/files/hugo-0.92.2-link-to-webp-and-sass.patch deleted file mode 100644 index bda6f9bcc3f2..000000000000 --- a/www-apps/hugo/files/hugo-0.92.2-link-to-webp-and-sass.patch +++ /dev/null @@ -1,38 +0,0 @@ -From b1c99224dc0d318109832531c98ec24ef4c0020e Mon Sep 17 00:00:00 2001 -From: tastytea <tastytea@tastytea.de> -Date: Wed, 23 Feb 2022 14:00:36 +0100 -Subject: [PATCH] Link to webp and sass - -We need to add the flags because we unbundle media-libs/libwebp and -dev-libs/libsass. ---- - vendor/github.com/bep/golibsass/internal/libsass/a__cgo.go | 2 +- - vendor/github.com/bep/gowebp/internal/libwebp/a__cgo.go | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/vendor/github.com/bep/golibsass/internal/libsass/a__cgo.go b/vendor/github.com/bep/golibsass/internal/libsass/a__cgo.go -index af51b92..979d9e7 100644 ---- a/vendor/github.com/bep/golibsass/internal/libsass/a__cgo.go -+++ b/vendor/github.com/bep/golibsass/internal/libsass/a__cgo.go -@@ -8,6 +8,6 @@ package libsass - // #cgo CFLAGS: -O2 -fPIC - // #cgo CPPFLAGS: -I../../libsass_src/include - // #cgo CXXFLAGS: -g -std=c++0x -O2 -fPIC --// #cgo LDFLAGS: -lstdc++ -lm -+// #cgo LDFLAGS: -lstdc++ -lm -lsass - // #cgo darwin linux LDFLAGS: -ldl - import "C" -diff --git a/vendor/github.com/bep/gowebp/internal/libwebp/a__cgo.go b/vendor/github.com/bep/gowebp/internal/libwebp/a__cgo.go -index 4b105ab..cec2faa 100644 ---- a/vendor/github.com/bep/gowebp/internal/libwebp/a__cgo.go -+++ b/vendor/github.com/bep/gowebp/internal/libwebp/a__cgo.go -@@ -2,5 +2,5 @@ - - package libwebp - --// #cgo linux LDFLAGS: -lm -+// #cgo linux LDFLAGS: -lm -lwebp - import "C" --- -2.34.1 - diff --git a/www-apps/hugo/files/hugo-0.99.1-fix-testdecodeconfig-basic.patch b/www-apps/hugo/files/hugo-0.99.1-fix-testdecodeconfig-basic.patch new file mode 100644 index 000000000000..5221b86c04fa --- /dev/null +++ b/www-apps/hugo/files/hugo-0.99.1-fix-testdecodeconfig-basic.patch @@ -0,0 +1,39 @@ +# Upstream commit: https://github.com/gohugoio/hugo/commit/52edea0 +# Trimmed down to patch only the stuff we need. + +From 52edea0feccf98700300e98567c5a2ada7604c89 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= + <bjorn.erik.pedersen@gmail.com> +Date: Fri, 27 May 2022 10:06:45 +0200 +Subject: [PATCH] github: Set HUGO_BUILD_TAGS: extended when running tests + +Also fix TestDecodeConfig/Basic which started to fail in the extended build in 0.99.1. + +Closes #9935 +--- +diff --git a/modules/config_test.go b/modules/config_test.go +index 55d055dcc7d..371aab05617 100644 +--- a/modules/config_test.go ++++ b/modules/config_test.go +@@ -48,7 +48,7 @@ func TestDecodeConfig(t *testing.T) { + + [module.hugoVersion] + min = "0.54.2" +-max = "0.99.0" ++max = "0.199.0" + extended = true + + [[module.mounts]] +diff --git a/resources/resource_transformers/tocss/scss/integration_test.go b/resources/resource_transformers/tocss/scss/integration_test.go +index 72c0fd988e9..13b664cc723 100644 +--- a/resources/resource_transformers/tocss/scss/integration_test.go ++++ b/resources/resource_transformers/tocss/scss/integration_test.go +@@ -236,7 +236,7 @@ T1: {{ $r.Content }} + }).BuildE() + + b.Assert(err, qt.IsNotNil) +- b.Assert(err.Error(), qt.Contains, filepath.FromSlash(`assets/scss/components/_foo.scss:2:1": expected ':' after $foocolor in assignment statement`)) ++ b.Assert(err.Error(), qt.Contains, `assets/scss/components/_foo.scss:2:1": expected ':' after $foocolor in assignment statement`) + fe := b.AssertIsFileError(err) + b.Assert(fe.ErrorContext(), qt.IsNotNil) + b.Assert(fe.ErrorContext().Lines, qt.DeepEquals, []string{"/* comment line 1 */", "$foocolor #ccc;", "", "foo {"}) diff --git a/www-apps/hugo/files/hugo-0.99.1-test-timeout.patch b/www-apps/hugo/files/hugo-0.99.1-test-timeout.patch new file mode 100644 index 000000000000..dc0f4898fcf6 --- /dev/null +++ b/www-apps/hugo/files/hugo-0.99.1-test-timeout.patch @@ -0,0 +1,25 @@ +From 92ceabab139262750cc6b61ffc3a6341dedfbbd4 Mon Sep 17 00:00:00 2001 +From: tastytea <tastytea@tastytea.de> +Date: Wed, 8 Jun 2022 04:10:27 +0200 +Subject: [PATCH] Set default test timeout to 2 minutes + +Bug: https://bugs.gentoo.org/850313 +--- + config/configProvider.go | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/config/configProvider.go b/config/configProvider.go +index 01a2e8c5..c8f199eb 100644 +--- a/config/configProvider.go ++++ b/config/configProvider.go +@@ -57,6 +57,7 @@ func SetBaseTestDefaults(cfg Provider) Provider { + setIfNotSet(cfg, "publishDir", "public") + setIfNotSet(cfg, "workingDir", "") + setIfNotSet(cfg, "defaultContentLanguage", "en") ++ setIfNotSet(cfg, "timeout", "2m") + return cfg + } + +-- +2.35.1 + |