public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/hugo] f43: Remove obsolete patches
@ 2026-06-07 20:57 W. Michael Petullo
0 siblings, 0 replies; only message in thread
From: W. Michael Petullo @ 2026-06-07 20:57 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/hugo
Branch : f43
Commit : 26ad89df9799a2d74f2d3e0c359dfe9fdcba698d
Author : W. Michael Petullo <mike@flyn.org>
Date : 2026-06-07T15:37:58-05:00
Stats : +0/-149 in 3 file(s)
URL : https://src.fedoraproject.org/rpms/hugo/c/26ad89df9799a2d74f2d3e0c359dfe9fdcba698d?branch=f43
Log:
Remove obsolete patches
Signed-off-by: W. Michael Petullo <mike@flyn.org>
---
diff --git a/0010-skip-modules-TestClient.patch b/0010-skip-modules-TestClient.patch
deleted file mode 100644
index 22c5035..0000000
--- a/0010-skip-modules-TestClient.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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
diff --git a/0020-fix-errorf.patch b/0020-fix-errorf.patch
deleted file mode 100644
index 6b1189f..0000000
--- a/0020-fix-errorf.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-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 82540b3..01477f9 100644
--- a/hugo.spec
+++ b/hugo.spec
@@ -13,8 +13,6 @@
# 4. Place the following in the RPM SOURCES directory:
# 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?
@@ -39,11 +37,6 @@ Source1: %{archivename}-vendor.tar.bz2
Source2: go-vendor-tools.toml
# Needed for vendor/golibsass; go-vendor-tools does not grab C code from Go repositories:
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++
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-06-07 20:57 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-07 20:57 [rpms/hugo] f43: Remove obsolete patches W. Michael Petullo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox