public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: W. Michael Petullo <mike@flyn.org>
To: git-commits@fedoraproject.org
Subject: [rpms/hugo] f43: Update to 0.159.0 (rhbz#2434652)
Date: Sun, 07 Jun 2026 20:57:12 GMT [thread overview]
Message-ID: <178086583266.1.8253141636113820929.rpms-hugo-606d9c6d7825@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/hugo
Branch : f43
Commit : 606d9c6d7825d0dc7c86841870d9502982dd444d
Author : W. Michael Petullo <mike@flyn.org>
Date : 2026-06-07T15:37:24-05:00
Stats : +155/-28 in 5 file(s)
URL : https://src.fedoraproject.org/rpms/hugo/c/606d9c6d7825d0dc7c86841870d9502982dd444d?branch=f43
Log:
Update to 0.159.0 (rhbz#2434652)
Signed-off-by: W. Michael Petullo <mike@flyn.org>
---
diff --git a/.gitignore b/.gitignore
index 6d80197..1beab83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,7 +42,6 @@
/hugo-0.147.7.tar.gz
/hugo-0.147.7-vendor.tar.bz2
/libsass-3.6.6.tar.gz
-/libwebp-1.3.2.tar.gz
/hugo-0.147.8.tar.gz
/hugo-0.147.8-vendor.tar.bz2
/hugo-0.152.2-vendor.tar.bz2
@@ -51,7 +50,7 @@
/hugo-0.153.1-vendor.tar.bz2
/hugo-0.153.2.tar.gz
/hugo-0.153.2-vendor.tar.bz2
-/0010-skip-modules-TestClient.patch
-/go-vendor-tools.toml
/hugo-0.154.3.tar.gz
/hugo-0.154.3-vendor.tar.bz2
+/hugo-0.159.0.tar.gz
+/hugo-0.159.0-vendor.tar.bz2
diff --git a/0010-skip-modules-TestClient.patch b/0010-skip-modules-TestClient.patch
index f06ecba..22c5035 100644
--- a/0010-skip-modules-TestClient.patch
+++ b/0010-skip-modules-TestClient.patch
@@ -1,11 +1,11 @@
-diff -u --recursive hugo-0.93.3-vanilla/modules/client_test.go hugo-0.93.3/modules/client_test.go
---- hugo-0.93.3-vanilla/modules/client_test.go 2022-03-08 04:15:27.000000000 -0600
-+++ hugo-0.93.3/modules/client_test.go 2022-03-08 20:11:16.719396644 -0600
-@@ -33,6 +33,7 @@
+diff -u --recursive hugo-0.159.0-vanilla/modules/client_test.go hugo-0.159.0/modules/client_test.go
+--- hugo-0.159.0-vanilla/modules/client_test.go 2026-03-23 13:16:59.000000000 -0500
++++ hugo-0.159.0/modules/client_test.go 2026-03-23 21:53:48.417518709 -0500
+@@ -34,6 +34,7 @@
)
func TestClient(t *testing.T) {
+ t.Skip("skip test as network access is not allowed during package build")
+ htesting.SkipSlowTestUnlessCI(t)
modName := "hugo-modules-basic-test"
modPath := "github.com/gohugoio/tests/" + modName
- defaultImport := "modh2_2"
diff --git a/0020-fix-errorf.patch b/0020-fix-errorf.patch
new file mode 100644
index 0000000..6b1189f
--- /dev/null
+++ b/0020-fix-errorf.patch
@@ -0,0 +1,131 @@
+From 9cd5184481c4b2de13ba7c70d9a35eac0a994e55 Mon Sep 17 00:00:00 2001
+From: "W. Michael Petullo" <mike@flyn.org>
+Date: Tue, 24 Mar 2026 09:03:14 -0500
+Subject: [PATCH] Fix build with Go 1.26 on Fedora 44 Beta
+
+Fix a handfull of issues related to printf-style functions and format
+string verb mismatches.
+
+Signed-off-by: W. Michael Petullo <mike@flyn.org>
+---
+ commands/hugobuilder.go | 8 ++++----
+ common/hstore/scratch_test.go | 4 ++--
+ common/loggers/logger.go | 8 ++++----
+ transform/livereloadinject/livereloadinject.go | 2 +-
+ 4 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/commands/hugobuilder.go b/commands/hugobuilder.go
+index 4037f6611..c8aaab118 100644
+--- a/commands/hugobuilder.go
++++ b/commands/hugobuilder.go
+@@ -195,12 +195,12 @@ func (c *hugoBuilder) initMemProfile() {
+
+ f, err := os.Create(c.r.memprofile)
+ if err != nil {
+- c.r.logger.Errorf("could not create memory profile: ", err)
++ c.r.logger.Errorf("could not create memory profile: %s", err)
+ }
+ defer f.Close()
+ runtime.GC() // get up-to-date statistics
+ if err := pprof.WriteHeapProfile(f); err != nil {
+- c.r.logger.Errorf("could not write memory profile: ", err)
++ c.r.logger.Errorf("could not write memory profile: %s", err)
+ }
+ }
+
+@@ -367,7 +367,7 @@ func (c *hugoBuilder) newWatcher(pollIntervalStr string, dirList ...string) (*wa
+ case changes := <-c.r.changesFromBuild:
+ unlock, err := h.LockBuild()
+ if err != nil {
+- c.r.logger.Errorln("Failed to acquire a build lock: %s", err)
++ c.r.logger.Errorf("Failed to acquire a build lock: %s\n", err)
+ return
+ }
+ c.changeDetector.PrepareNew()
+@@ -387,7 +387,7 @@ func (c *hugoBuilder) newWatcher(pollIntervalStr string, dirList ...string) (*wa
+ case evs := <-watcher.Events:
+ unlock, err := h.LockBuild()
+ if err != nil {
+- c.r.logger.Errorln("Failed to acquire a build lock: %s", err)
++ c.r.logger.Errorf("Failed to acquire a build lock: %s\n", err)
+ return
+ }
+ c.handleEvents(watcher, staticSyncer, evs, configSet)
+diff --git a/common/hstore/scratch_test.go b/common/hstore/scratch_test.go
+index 1f08d46a9..741826caf 100644
+--- a/common/hstore/scratch_test.go
++++ b/common/hstore/scratch_test.go
+@@ -70,7 +70,7 @@ func TestScratchAddSlice(t *testing.T) {
+ expected := []int{1, 2, 3}
+
+ if !reflect.DeepEqual(expected, sl) {
+- t.Errorf("Slice difference, go %q expected %q", sl, expected)
++ t.Errorf("Slice difference, go %v expected %v", sl, expected)
+ }
+ _, err = scratch.Add("intSlice", []int{4, 5})
+
+@@ -80,7 +80,7 @@ func TestScratchAddSlice(t *testing.T) {
+ expected = []int{1, 2, 3, 4, 5}
+
+ if !reflect.DeepEqual(expected, sl) {
+- t.Errorf("Slice difference, go %q expected %q", sl, expected)
++ t.Errorf("Slice difference, go %v expected %v", sl, expected)
+ }
+ }
+
+diff --git a/common/loggers/logger.go b/common/loggers/logger.go
+index ba26137cd..dac9f1a6c 100644
+--- a/common/loggers/logger.go
++++ b/common/loggers/logger.go
+@@ -237,7 +237,7 @@ func (l *logAdapter) Debugf(format string, v ...any) {
+ }
+
+ func (l *logAdapter) Debugln(v ...any) {
+- l.debugl.Logf(l.sprint(v...))
++ l.debugl.Logf("%s", l.sprint(v...))
+ }
+
+ func (l *logAdapter) Info() logg.LevelLogger {
+@@ -253,7 +253,7 @@ func (l *logAdapter) Infof(format string, v ...any) {
+ }
+
+ func (l *logAdapter) Infoln(v ...any) {
+- l.infol.Logf(l.sprint(v...))
++ l.infol.Logf("%s", l.sprint(v...))
+ }
+
+ func (l *logAdapter) Level() logg.Level {
+@@ -318,7 +318,7 @@ func (l *logAdapter) WarnCommand(command string) logg.LevelLogger {
+ }
+
+ func (l *logAdapter) Warnln(v ...any) {
+- l.warnl.Logf(l.sprint(v...))
++ l.warnl.Logf("%s", l.sprint(v...))
+ }
+
+ func (l *logAdapter) Error() logg.LevelLogger {
+@@ -330,7 +330,7 @@ func (l *logAdapter) Errorf(format string, v ...any) {
+ }
+
+ func (l *logAdapter) Errorln(v ...any) {
+- l.errorl.Logf(l.sprint(v...))
++ l.errorl.Logf("%s", l.sprint(v...))
+ }
+
+ func (l *logAdapter) Errors() string {
+diff --git a/transform/livereloadinject/livereloadinject.go b/transform/livereloadinject/livereloadinject.go
+index 55e69f912..335233a7e 100644
+--- a/transform/livereloadinject/livereloadinject.go
++++ b/transform/livereloadinject/livereloadinject.go
+@@ -73,7 +73,7 @@ func New(baseURL *url.URL) transform.Transformer {
+ copy(c[idx+len(script):], b[idx:])
+
+ if _, err := ft.To().Write(c); err != nil {
+- loggers.Log().Warnf("Failed to inject LiveReload script:", err)
++ loggers.Log().Warnf("Failed to inject LiveReload script: %s", err)
+ }
+ return nil
+ }
+--
+2.53.0
+
diff --git a/hugo.spec b/hugo.spec
index dc862c6..935e30b 100644
--- a/hugo.spec
+++ b/hugo.spec
@@ -15,13 +15,14 @@
# hugo-VERSION.tar.gz
# hugo-VERSION-vendor.tar.bz2
# 0010-skip-modules-TestClient.patch
+# 0020-fix-errorf.patch
# go-vendor-tools.toml
# libsass-3.6.6.tar.gz
# 5. Review gocheck. Are more or fewer -d arguments needed?
# https://github.com/gohugoio/hugo
%global goipath github.com/gohugoio/hugo
-Version: 0.154.3
+Version: 0.159.0
%gometa -L -f
@@ -44,6 +45,8 @@ Source3: libsass-3.6.6.tar.gz
# Skip tests that uses the network.
# Based on https://sources.debian.org/data/main/h/hugo/0.58.3-1/debian/patches/0005-skip-modules-TestClient.patch
Patch0001: 0010-skip-modules-TestClient.patch
+# See https://github.com/gohugoio/hugo/pull/14665.
+Patch0002: 0020-fix-errorf.patch
BuildRequires: go-vendor-tools
BuildRequires: gcc-c++
@@ -66,8 +69,11 @@ tar xvf %SOURCE3 -C vendor/github.com/bep/golibsass/libsass_src --strip-componen
%go_vendor_license_buildrequires -c %{S:2}
%build
-# Allow github.com/tetratelabs/wazero to build:
-%global __golang_extldflags -Wl,-z,undefs
+# Allow github.com/tetratelabs/wazero to build.
+# For commentary on notext, see:
+# https://github.com/wazero/wazero/issues/2469
+# https://bugzilla.redhat.com/show_bug.cgi?id=2428281
+%global __golang_extldflags -Wl,-z,undefs -Wl,-z,notext
# Build extended version of Hugo.
BUILDTAGS="extended" LDFLAGS="${LDFLAGS} -X %{goipath}/common/hugo.buildDate=$(date --iso=seconds --date=@$SOURCE_DATE_EPOCH) -X %{goipath}/common/hugo.vendorInfo=Fedora:%{version}-%{release}" %gobuild -o %{gobuilddir}/bin/hugo %{goipath}
@@ -126,10 +132,13 @@ install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/
-d markup/tableofcontents \
-d minifiers \
-d modules \
+ -d modules/npm \
+ -d output \
-d parser/metadecoders \
-d related \
-d resources \
-d resources/images \
+ -d resources/images/meta \
-d resources/page \
-d resources/page/pagemeta \
-d resources/resource \
@@ -144,6 +153,7 @@ install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/
-d resources/resource_transformers/tocss/scss \
-d tpl/cast \
-d tpl/collections \
+ -d tpl/css \
-d tpl/data \
-d tpl/debug \
-d tpl/fmt \
@@ -191,7 +201,7 @@ install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/
%doc testscripts/commands/hugo__processingstats2.txt
%doc testscripts/commands/hugo__publishdir_in_config.txt
%doc testscripts/commands/hugo__static_composite.txt
-%doc testscripts/commands/hugo__watch.txt testscripts/commands/hugo_build.txt
+%doc testscripts/commands/hugo_build.txt
%doc testscripts/commands/hugo_configdev_env.txt
%doc testscripts/commands/hugo_configdev_environment.txt
%doc testscripts/commands/hugo_configprod.txt
@@ -206,18 +216,7 @@ install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/
%doc testscripts/commands/mod_tidy.txt testscripts/commands/mod_vendor.txt
%doc testscripts/commands/new.txt testscripts/commands/new_content.txt
%doc testscripts/commands/new_content_archetypedir.txt
-%doc testscripts/commands/noop.txt testscripts/commands/server.txt
-%doc testscripts/commands/server__edit_config.txt
-%doc testscripts/commands/server__edit_content.txt
-%doc testscripts/commands/server__error_recovery_edit_config.txt
-%doc testscripts/commands/server__error_recovery_edit_content.txt
-%doc testscripts/commands/server__multihost.txt
-%doc testscripts/commands/server__watch_hugo_stats.txt
-%doc testscripts/commands/server__watch_moduleconfig.txt
-%doc testscripts/commands/server_disablelivereload.txt
-%doc testscripts/commands/server_disablelivereload__config.txt
-%doc testscripts/commands/server_render_static_to_disk.txt
-%doc testscripts/commands/server_render_to_memory.txt
+%doc testscripts/commands/noop.txt
%doc testscripts/commands/version.txt testscripts/commands/warnf_stderr.txt
%doc testscripts/unfinished/noop.txt testscripts/withdeploy/deploy.txt
%doc testscripts/withdeploy-off/deploy_off.txt
diff --git a/sources b/sources
index 94a4e2b..b5a9bb1 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,3 @@
-SHA512 (0010-skip-modules-TestClient.patch) = 0d03db7212b45166cc3716dc2796edfe410fb521e1f987c69f414ff766a4059babeeda6c58dbdf1f76f99945cf51a4a08c34d32021abfe5ccdc04c2e92029ee9
-SHA512 (go-vendor-tools.toml) = ebda4e8874a3393dc0f37c702657c91fbabf993d8f795907791ff0148b9d79ab140b6b0f39a31e6837a2214e04aa07f2722cb1c937768417ca4ed74b348cd7f9
-SHA512 (hugo-0.154.3.tar.gz) = bbbb35569bd405ea97f1a5df0a3827c5dc4d8ca04722ae58da7deb8a337c38b88af91720519de47d85bddb94174ff2fe00eaa5c079c298ddc220b5c41c974cfa
-SHA512 (hugo-0.154.3-vendor.tar.bz2) = a204ecd7026577c040efe33f37c34f80e1443b89bf7228e88325cf33404fbfcf6daa5836edb7129611d035f48794e019cf179d945dcdfa6b64c0086b1f0a8e65
+SHA512 (hugo-0.159.0.tar.gz) = 30779035a249e58df79880ef0f42275e1b539514d99a66cdca51d40d6956ddece0182362c48c0a8a4fbc41c38e9acdca826504cf1da0385cebb116b6bb964472
+SHA512 (hugo-0.159.0-vendor.tar.bz2) = 9623c3a97dc6afb3f159bb1529dbd5a9fab091f691f2ca9ce5600b5d4473369f8ce4cb1935018a1853bc0e6b5ee3f8cae6d8551bcf913c83edfb207d80d9bb7e
SHA512 (libsass-3.6.6.tar.gz) = 659828c854af391c10a16954425fbeeb5fa036189dea45555cd8046338f7469eb7f8d84134030ce644921514b8f397ef6070b56dfb116ea7ce94328d64576518
reply other threads:[~2026-06-07 20:57 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178086583266.1.8253141636113820929.rpms-hugo-606d9c6d7825@fedoraproject.org \
--to=mike@flyn.org \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox