Revert update to 0.59.0.

This reverts commit b3cf0b6b77.
2019-10-22 00:34:29 -04:00 · 2019-10-22 00:34:29 -04:00 · bf3eba5d21
parent b3cf0b6b77
commit bf3eba5d21
6 changed files with 151 additions and 6 deletions
--- a/.gitignore
+++ b/.gitignore
@ -14,4 +14,3 @@
 /hugo-0.55.3.tar.gz
 /hugo-0.55.5.tar.gz
 /hugo-0.55.6.tar.gz
-/hugo-0.59.0.tar.gz
--- a/0001-Fix-tests-against-latest-emoji-package.patch
+++ b/0001-Fix-tests-against-latest-emoji-package.patch
@ -0,0 +1,54 @@
+From 08194c053448050910e3875065e7aa29c760e971 Mon Sep 17 00:00:00 2001
+From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
+Date: Fri, 1 Mar 2019 18:47:19 -0500
+Subject: [PATCH] Fix tests against latest emoji package.
+
+Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
+---
+ docs/data/docs.json             | 2 +-
+ tpl/transform/init.go           | 2 +-
+ tpl/transform/transform_test.go | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/docs/data/docs.json b/docs/data/docs.json
+index 03bb0357..1f21646f 100644
+--- a/docs/data/docs.json
+++ b/docs/data/docs.json
+@@ -4109,7 +4109,7 @@
+           "Examples": [
+             [
+               "{{ \"I :heart: Hugo\" | emojify }}",
+-              "I ❤️ Hugo"
+              "I ❤ Hugo"
+             ]
+           ]
+         },
+diff --git a/tpl/transform/init.go b/tpl/transform/init.go
+index 62cb0a9c..2783a513 100644
+--- a/tpl/transform/init.go
+++ b/tpl/transform/init.go
+@@ -32,7 +32,7 @@ func init() {
+ 		ns.AddMethodMapping(ctx.Emojify,
+ 			[]string{"emojify"},
+ 			[][2]string{
+-				{`{{ "I :heart: Hugo" | emojify }}`, `I ❤️ Hugo`},
+				{`{{ "I :heart: Hugo" | emojify }}`, `I ❤ Hugo`},
+ 			},
+ 		)
+ 
+diff --git a/tpl/transform/transform_test.go b/tpl/transform/transform_test.go
+index 13c4bbc2..10b020a0 100644
+--- a/tpl/transform/transform_test.go
+++ b/tpl/transform/transform_test.go
+@@ -40,7 +40,7 @@ func TestEmojify(t *testing.T) {
+ 		expect interface{}
+ 	}{
+ 		{":notamoji:", template.HTML(":notamoji:")},
+-		{"I :heart: Hugo", template.HTML("I ❤️ Hugo")},
+		{"I :heart: Hugo", template.HTML("I ❤ Hugo")},
+ 		// errors
+ 		{tstNoStringer{}, false},
+ 	} {
+-- 
+2.21.0
+
--- a/6385.patch
+++ b/6385.patch
@ -0,0 +1,42 @@
+From d64e9611109b2eb6de42a47d497cba313252a838 Mon Sep 17 00:00:00 2001
+From: Anthony Fok <foka@debian.org>
+Date: Wed, 2 Oct 2019 23:40:22 -0600
+Subject: [PATCH] resources: Ensure same dirinfos sort order in
+ TestImageOperationsGolden
+
+Fix filename mismatch errors on Debian auto-building machines
+possibly due to different directory order on ext4 vs tmpfs file systems.
+---
+ resources/image_test.go | 11 +++--------
+ 1 file changed, 3 insertions(+), 8 deletions(-)
+
+diff --git a/resources/image_test.go b/resources/image_test.go
+index 5fa5021c95..169f19522e 100644
+--- a/resources/image_test.go
+++ b/resources/image_test.go
+@@ -15,6 +15,7 @@ package resources
+ 
+ import (
+ 	"fmt"
+	"io/ioutil"
+ 	"math/big"
+ 	"math/rand"
+ 	"os"
+@@ -567,15 +568,9 @@ func TestImageOperationsGolden(t *testing.T) {
+ 	dir2 := filepath.FromSlash("testdata/golden")
+ 
+ 	// The two dirs above should now be the same.
+-	d1, err := os.Open(dir1)
+	dirinfos1, err := ioutil.ReadDir(dir1)
+ 	c.Assert(err, qt.IsNil)
+-	d2, err := os.Open(dir2)
+-	c.Assert(err, qt.IsNil)
+-
+-	dirinfos1, err := d1.Readdir(-1)
+-	c.Assert(err, qt.IsNil)
+-	dirinfos2, err := d2.Readdir(-1)
+-
+	dirinfos2, err := ioutil.ReadDir(dir2)
+ 	c.Assert(err, qt.IsNil)
+ 	c.Assert(len(dirinfos1), qt.Equals, len(dirinfos2))
+ 
--- a/6403.patch
+++ b/6403.patch
@ -0,0 +1,44 @@
+From e825481e553e5a2d60ccbd9930da9060d12cff3d Mon Sep 17 00:00:00 2001
+From: Anthony Fok <foka@debian.org>
+Date: Tue, 8 Oct 2019 23:46:04 -0600
+Subject: [PATCH] deps: Update minify to v2.5.2
+
+- v2.5.1 removes import comments, solving a build error with Go 1.13
+  in GOPATH mode (used Debian packaging for example)
+- v2.5.2 no longer converts polyline/rect/polygon/line to path
+  as it has been reported to break a SVG referenced by CSS,
+  see tdewolff/minify#260
+
+The test case for Min SVG in TestResourceChains is updated accordingly.
+
+Fixes pocc/tshark.dev#33
+---
+ go.mod                         |  2 +-
+ go.sum                         | 12 ++++++------
+ hugolib/resource_chain_test.go |  6 +++---
+ 3 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/hugolib/resource_chain_test.go b/hugolib/resource_chain_test.go
+index 138e7a4a28..10539d1bb2 100644
+--- a/hugolib/resource_chain_test.go
+++ b/hugolib/resource_chain_test.go
+@@ -342,8 +342,8 @@ Min HTML: {{ ( resources.Get "mydata/html1.html" | resources.Minify ).Content |
+ 			b.AssertFileContent("public/index.html", `Min JS: var x;x=5;document.getElementById(&#34;demo&#34;).innerHTML=x*10;`)
+ 			b.AssertFileContent("public/index.html", `Min JSON: {"employees":[{"firstName":"John","lastName":"Doe"},{"firstName":"Anna","lastName":"Smith"},{"firstName":"Peter","lastName":"Jones"}]}`)
+ 			b.AssertFileContent("public/index.html", `Min XML: <hello><world>Hugo Rocks!</<world></hello>`)
+-			b.AssertFileContent("public/index.html", `Min SVG: <svg height="100" width="100"><path d="M5 10 20 40z"/></svg>`)
+-			b.AssertFileContent("public/index.html", `Min SVG again: <svg height="100" width="100"><path d="M5 10 20 40z"/></svg>`)
+			b.AssertFileContent("public/index.html", `Min SVG: <svg height="100" width="100"><path d="M1e2 1e2H3e2 2e2z"/></svg>`)
+			b.AssertFileContent("public/index.html", `Min SVG again: <svg height="100" width="100"><path d="M1e2 1e2H3e2 2e2z"/></svg>`)
+ 			b.AssertFileContent("public/index.html", `Min HTML: <html><a href=#>Cool</a></html>`)
+ 		}},
+ 
+@@ -580,7 +580,7 @@ document.getElementById("demo").innerHTML = x * 10;
+ 
+ 			b.WithSourceFile(filepath.Join("assets", "mydata", "svg1.svg"), `
+ <svg height="100" width="100">
+-  <line x1="5" y1="10" x2="20" y2="40"/>
+  <path d="M 100 100 L 300 100 L 200 100 z"/>
+ </svg> 
+ `)
+ 
--- a/hugo.spec
+++ b/hugo.spec
@ -4,7 +4,7 @@

 # https://github.com/gohugoio/hugo
 %global goipath github.com/gohugoio/hugo
-Version:        0.59.0
+Version:        0.58.3

 %gometa

@ -26,6 +26,12 @@ URL:            %{gourl}
 Source0:        %{gosource}
 # Skip test that uses the network.
 Patch0001:      https://sources.debian.org/data/main/h/hugo/0.58.3-1/debian/patches/0005-skip-modules-TestClient.patch
+# Fix build against golang-github-kyokomi-emoji 2.1
+Patch0002:      0001-Fix-tests-against-latest-emoji-package.patch
+# Fix build against golang-github-tdewolff-minify 2.5.2
+Patch0003:      https://github.com/gohugoio/hugo/pull/6403.patch
+# Fix test susceptible to inconsistent directory order.
+Patch0004:      https://github.com/gohugoio/hugo/pull/6385.patch

 BuildRequires:  golang(github.com/alecthomas/chroma)
 BuildRequires:  golang(github.com/alecthomas/chroma/formatters)
@ -125,6 +131,9 @@ BuildRequires:  rubygem-asciidoctor
 %goprep

 %patch0001 -p1
+%patch0002 -p1
+%patch0003 -p1
+%patch0004 -p1

 # Replace blackfriday import path to avoid conflict with v2
 # Depend on unversioned tdewolff/minify until Go modules are supported in Fedora
@ -178,9 +187,6 @@ install -Dp man/* -t %{buildroot}%{_mandir}/man1


 %changelog
-* Mon Oct 21 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.59.0-1
- Update to latest version
-
 * Wed Oct 16 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 0.58.3-1
 - Update to latest version

--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (hugo-0.59.0.tar.gz) = e327af1193ced80d0ce955c29f3362011fdb4de2712694532fe9d4627452ba187159b994ae4fca41b130a43d8ca16cc02673fdfe1d8437066ff508f2429a6230
+SHA512 (hugo-0.55.6.tar.gz) = b45d50ae109d1f5bbc1d52f1c8d46a1638fd83bec8a2600c3cfd6d303fdcf58db1d9201844174558e8dea62132ff146fbff9995ae0350ff2f7e4106adf07b861