[packages/kitty] Go -mod=vendor patching is not needed

glen glen at pld-linux.org
Wed Feb 22 21:52:36 CET 2023


commit 699a0afdb50e97bcf921735a4d05a2db07662598
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Wed Feb 22 22:51:02 2023 +0200

    Go -mod=vendor patching is not needed
    
    > If the vendor directory is present in the main module’s root
    > directory, it will be used automatically if the go version in the main
    > module’s go.mod file is 1.14 or higher. To explicitly enable
    > vendoring, invoke the go command with the flag -mod=vendor. To disable
    > vendoring, use the flag -mod=readonly or -mod=mod.
    
    - https://go.dev/ref/mod#vendoring

 go-vendor.patch | 10 ----------
 kitty.spec      |  1 -
 2 files changed, 11 deletions(-)
---
diff --git a/kitty.spec b/kitty.spec
index 81ad1c2..ebc7fa2 100644
--- a/kitty.spec
+++ b/kitty.spec
@@ -27,7 +27,6 @@ tar -caf ~/kitty-vendor.tar.xz vendor
 Source4:	%{name}-%{version}-vendor.tar.xz
 # Source4-md5:	f6aac2e7f2b6a58e468a160899d823c2
 Patch0:		num-workers.patch
-Patch1:		go-vendor.patch
 URL:		https://sw.kovidgoyal.net/kitty
 BuildRequires:	appstream-glib
 BuildRequires:	dbus-devel
diff --git a/go-vendor.patch b/go-vendor.patch
deleted file mode 100644
index fddb47e..0000000
--- a/go-vendor.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- kitty-0.27.1/setup.py~	2023-02-22 20:30:46.000000000 +0200
-+++ kitty-0.27.1/setup.py	2023-02-22 20:32:42.454586120 +0200
-@@ -908,6 +908,7 @@
-     if not for_platform:
-         update_go_generated_files(args, os.path.join(launcher_dir, appname))
-     cmd = [go, 'build', '-v']
-+    cmd += ['-mod=vendor']
-     ld_flags = [f"-X 'kitty.VCSRevision={get_vcs_rev_define()}'"]
-     if for_freeze:
-         ld_flags.append("-X 'kitty.IsFrozenBuild=true'")
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kitty.git/commitdiff/699a0afdb50e97bcf921735a4d05a2db07662598



More information about the pld-cvs-commit mailing list