diff --git a/0001-ci-fix-build-602.patch b/0001-ci-fix-build-602.patch new file mode 100644 index 0000000..0648ec4 --- /dev/null +++ b/0001-ci-fix-build-602.patch @@ -0,0 +1,91 @@ +From 37b9a48539cb642a720bbeae58949e8ffc886450 Mon Sep 17 00:00:00 2001 +From: Carlos Alexandro Becker +Date: Wed, 19 Mar 2025 09:55:52 -0300 +Subject: [PATCH] ci: fix build (#602) + +* ci: trying to fix latest go version + +Signed-off-by: Carlos Alexandro Becker + +* fix: trying this + +Signed-off-by: Carlos Alexandro Becker + +* fix: lint + +* fix: lint + +Signed-off-by: Carlos Alexandro Becker + +* fix: go.mod + +Signed-off-by: Carlos Alexandro Becker + +* fix: typo + +Signed-off-by: Carlos Alexandro Becker + +* fix: lint + +--------- + +Signed-off-by: Carlos Alexandro Becker +(cherry picked from commit b41d47fa1d2e5847aa3c5fd0e5e2b284fd83f08c) +--- + embed.go | 2 +- + main.go | 2 +- + parser/parser_test.go | 2 +- + serve_windows.go | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/embed.go b/embed.go +index 087b137..4835736 100644 +--- a/embed.go ++++ b/embed.go +@@ -3,4 +3,4 @@ package main + import _ "embed" + + //go:embed examples/demo.tape +-var DemoTape []byte ++var demoTape []byte +diff --git a/main.go b/main.go +index 2dd7337..d5b6db1 100644 +--- a/main.go ++++ b/main.go +@@ -191,7 +191,7 @@ var ( + return err + } + +- _, err = f.Write(bytes.Replace(DemoTape, []byte("examples/demo.gif"), []byte(name+".gif"), 1)) ++ _, err = f.Write(bytes.Replace(demoTape, []byte("examples/demo.gif"), []byte(name+".gif"), 1)) + if err != nil { + return err + } +diff --git a/parser/parser_test.go b/parser/parser_test.go +index fd4e577..430d0d8 100644 +--- a/parser/parser_test.go ++++ b/parser/parser_test.go +@@ -302,7 +302,7 @@ func (st *parseSourceTest) run(t *testing.T) { + if st.writeFile { + err := os.WriteFile("source.tape", []byte(st.srcTape), os.ModePerm) + if err != nil { +- t.Fatalf(err.Error()) ++ t.Fatal(err) + } + } + +diff --git a/serve_windows.go b/serve_windows.go +index 4ba0a94..f84c613 100644 +--- a/serve_windows.go ++++ b/serve_windows.go +@@ -4,6 +4,6 @@ + package main + + // Windows doesn't support UID and GID, so we need to skip this. +-func dropUserPrivileges(gid int, uid int) error { ++func dropUserPrivileges(int, int) error { + return nil + } +-- +2.49.0 + diff --git a/sources b/sources index c8b5343..74510cd 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (vhs-0.10.0.tar.gz) = b89d9c72ee378b72f2718d4fe0c3e53e3a6ac999d28b0f4863ac0ccc8d03a03d182119418af4979f6fb937e8bef92a0de2dd0fcc35907b9d9290c1dc3d3c1371 -SHA512 (vhs-0.10.0-vendor.tar.gz) = 658d71032bf74ba6b36fcec8d33a918e0209c1a533ab81ccfe993aa9d4d029414f4c20f4693a77909219870568efbaebd9825e95b37e11edbcb0918ce7bd896c +SHA512 (vhs-0.9.0-vendor.tar.gz) = 5f39c68c4d225d1b0fa1e19b3c9beb5b63ceaa7d002fea77984ade63b40ff8d376c32d8480786aae98111cccb6ded7cb130d5e76d432dd2b95a0e114f8fcb7d3 +SHA512 (vhs-0.9.0.tar.gz) = f7977639868760ef68d1afe4042415c18ba5e34044263b98a97d680685b7427a64a73aef60343265af5ab0a4af8ee5c2247849c599fc68e072049766ec6cde90 diff --git a/vhs.spec b/vhs.spec index 30b3d27..8eff649 100644 --- a/vhs.spec +++ b/vhs.spec @@ -1,7 +1,7 @@ %define goipath github.com/charmbracelet/vhs Name: vhs -Version: 0.10.0 +Version: 0.9.0 Release: %autorelease Summary: Your CLI home video recorder URL: https://github.com/charmbracelet/vhs @@ -30,17 +30,14 @@ URL: https://github.com/charmbracelet/vhs # github.com/aymerick/douceur # github.com/caarlos0/env/v11 # github.com/charmbracelet/bubbletea -# github.com/charmbracelet/colorprofile # github.com/charmbracelet/glamour # github.com/charmbracelet/keygen # github.com/charmbracelet/lipgloss # github.com/charmbracelet/log # github.com/charmbracelet/wish # github.com/charmbracelet/x/ansi -# github.com/charmbracelet/x/cellbuf # github.com/charmbracelet/x/conpty # github.com/charmbracelet/x/errors -# github.com/charmbracelet/x/exp/slice # github.com/charmbracelet/x/term # github.com/charmbracelet/x/termios # github.com/creack/pty @@ -63,7 +60,6 @@ URL: https://github.com/charmbracelet/vhs # github.com/muesli/roff # github.com/muesli/termenv # github.com/rivo/uniseg -# github.com/xo/terminfo # github.com/ysmood/fetchup # github.com/ysmood/goob # github.com/ysmood/got @@ -81,31 +77,31 @@ Source0: %{url}/archive/v%{version}/vhs-%{version}.tar.gz Source1: vhs-%{version}-vendor.tar.gz Source2: create-vendor-tarball.sh +# https://github.com/charmbracelet/vhs/commit/b41d47fa1d2e5847aa3c5fd0e5e2b284fd83f08c +Patch: 0001-ci-fix-build-602.patch + BuildRequires: go-rpm-macros ExclusiveArch: %{golang_arches_future} -# https://github.com/charmbracelet/vhs/blob/v0.10.0/go.mod#L3 -BuildRequires: golang >= 1.24.1 +# https://github.com/charmbracelet/vhs/commit/41ce6be9acfdc4932479376b02aae7a45e1ab191 +BuildRequires: golang >= 1.21 -Provides: bundled(golang(github.com/agnivade/levenshtein)) = 1.2.1 +Provides: bundled(golang(github.com/agnivade/levenshtein)) = 1.2.0 Provides: bundled(golang(github.com/alecthomas/chroma/v2)) = 2.14.0 Provides: bundled(golang(github.com/anmitsu/go-shlex)) = 38f4b40 Provides: bundled(golang(github.com/atotto/clipboard)) = 0.1.4 Provides: bundled(golang(github.com/aymanbagabas/go-osc52/v2)) = 2.0.1 Provides: bundled(golang(github.com/aymerick/douceur)) = 0.2.0 Provides: bundled(golang(github.com/caarlos0/env/v11)) = 11.3.1 -Provides: bundled(golang(github.com/charmbracelet/bubbletea)) = 1.3.4 -Provides: bundled(golang(github.com/charmbracelet/colorprofile)) = f60798e -Provides: bundled(golang(github.com/charmbracelet/glamour)) = 0.10.0 -Provides: bundled(golang(github.com/charmbracelet/keygen)) = 0.5.3 -Provides: bundled(golang(github.com/charmbracelet/lipgloss)) = 76690c6 -Provides: bundled(golang(github.com/charmbracelet/log)) = 0.4.1 -Provides: bundled(golang(github.com/charmbracelet/ssh)) = 98fd5ae -Provides: bundled(golang(github.com/charmbracelet/wish)) = 1.4.7 -Provides: bundled(golang(github.com/charmbracelet/x/ansi)) = 0.8.0 -Provides: bundled(golang(github.com/charmbracelet/x/cellbuf)) = 0.0.13 +Provides: bundled(golang(github.com/charmbracelet/bubbletea)) = 1.2.4 +Provides: bundled(golang(github.com/charmbracelet/glamour)) = 0.8.0 +Provides: bundled(golang(github.com/charmbracelet/keygen)) = 0.5.1 +Provides: bundled(golang(github.com/charmbracelet/lipgloss)) = 1.0.0 +Provides: bundled(golang(github.com/charmbracelet/log)) = 0.4.0 +Provides: bundled(golang(github.com/charmbracelet/ssh)) = 4fe22b0 +Provides: bundled(golang(github.com/charmbracelet/wish)) = 1.4.4 +Provides: bundled(golang(github.com/charmbracelet/x/ansi)) = 0.4.5 Provides: bundled(golang(github.com/charmbracelet/x/conpty)) = 0.1.0 Provides: bundled(golang(github.com/charmbracelet/x/errors)) = e8e43e1 -Provides: bundled(golang(github.com/charmbracelet/x/exp/slice)) = 2fdc977 Provides: bundled(golang(github.com/charmbracelet/x/term)) = 0.2.1 Provides: bundled(golang(github.com/charmbracelet/x/termios)) = 0.1.0 Provides: bundled(golang(github.com/creack/pty)) = 1.1.24 @@ -130,25 +126,24 @@ Provides: bundled(golang(github.com/muesli/mango-cobra)) = 1.2.0 Provides: bundled(golang(github.com/muesli/mango-pflag)) = 0.1.0 Provides: bundled(golang(github.com/muesli/reflow)) = 0.3.0 Provides: bundled(golang(github.com/muesli/roff)) = 0.1.0 -Provides: bundled(golang(github.com/muesli/termenv)) = 0.16.0 +Provides: bundled(golang(github.com/muesli/termenv)) = 98d742f Provides: bundled(golang(github.com/rivo/uniseg)) = 0.4.7 -Provides: bundled(golang(github.com/spf13/cobra)) = 1.9.1 -Provides: bundled(golang(github.com/spf13/pflag)) = 1.0.6 -Provides: bundled(golang(github.com/xo/terminfo)) = abceb7e +Provides: bundled(golang(github.com/spf13/cobra)) = 1.8.1 +Provides: bundled(golang(github.com/spf13/pflag)) = 1.0.5 Provides: bundled(golang(github.com/ysmood/fetchup)) = 0.2.3 Provides: bundled(golang(github.com/ysmood/goob)) = 0.4.0 Provides: bundled(golang(github.com/ysmood/got)) = 0.40.0 Provides: bundled(golang(github.com/ysmood/gson)) = 0.7.3 Provides: bundled(golang(github.com/ysmood/leakless)) = 0.9.0 -Provides: bundled(golang(github.com/yuin/goldmark)) = 1.7.8 -Provides: bundled(golang(github.com/yuin/goldmark-emoji)) = 1.0.5 -Provides: bundled(golang(golang.org/x/crypto)) = 0.39.0 -Provides: bundled(golang(golang.org/x/exp)) = 8a7402a -Provides: bundled(golang(golang.org/x/net)) = 0.39.0 -Provides: bundled(golang(golang.org/x/sync)) = 0.15.0 -Provides: bundled(golang(golang.org/x/sys)) = 0.33.0 -Provides: bundled(golang(golang.org/x/term)) = 0.32.0 -Provides: bundled(golang(golang.org/x/text)) = 0.26.0 +Provides: bundled(golang(github.com/yuin/goldmark)) = 1.7.4 +Provides: bundled(golang(github.com/yuin/goldmark-emoji)) = 1.0.3 +Provides: bundled(golang(golang.org/x/crypto)) = 0.32.0 +Provides: bundled(golang(golang.org/x/exp)) = 7918f67 +Provides: bundled(golang(golang.org/x/net)) = 0.33.0 +Provides: bundled(golang(golang.org/x/sync)) = 0.10.0 +Provides: bundled(golang(golang.org/x/sys)) = 0.29.0 +Provides: bundled(golang(golang.org/x/term)) = 0.28.0 +Provides: bundled(golang(golang.org/x/text)) = 0.21.0 Requires: ttyd Requires: ffmpeg-free