git: ffb62231298a - main - net-im/dissent: avoid working around "make gomod-vendor"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 17 Sep 2024 14:40:43 UTC
The branch main has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=ffb62231298a40a188174d514f7b66cdce0cc477
commit ffb62231298a40a188174d514f7b66cdce0cc477
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2024-09-17 14:37:37 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2024-09-17 14:40:20 +0000
net-im/dissent: avoid working around "make gomod-vendor"
---
net-im/dissent/Makefile | 4 +--
net-im/dissent/files/patch-gtksourceview-5.4 | 46 ++++++++++++++--------------
net-im/dissent/files/patch-vendor | 28 -----------------
3 files changed, 25 insertions(+), 53 deletions(-)
diff --git a/net-im/dissent/Makefile b/net-im/dissent/Makefile
index 239698935254..35771cdbdc03 100644
--- a/net-im/dissent/Makefile
+++ b/net-im/dissent/Makefile
@@ -27,8 +27,8 @@ GH_TUPLE= KarpelesLab:weak:v0.1.1:karpeleslab_weak/vendor/github.com/KarpelesLab
diamondburned:ctxt:2db38a5d3c12:diamondburned_ctxt/vendor/libdb.so/ctxt \
diamondburned:go-emoji:39776eee41ac:diamondburned_go_emoji/vendor/libdb.so/go-emoji \
diamondburned:gotk4-adwaita:824c3ce8a5f4:diamondburned_gotk4_adwaita_pkg/vendor/github.com/diamondburned/gotk4-adwaita \
- diamondburned:gotk4-sourceview:98263515a466:diamondburned_gotk4_sourceview/vendor/libdb.so/gotk4-sourceview/pkg \
- diamondburned:gotk4-spelling:ee26db878626:diamondburned_gotk4_spelling/vendor/libdb.so/gotk4-spelling/pkg \
+ diamondburned:gotk4-sourceview:98263515a466:diamondburned_gotk4_sourceview/vendor/libdb.so/gotk4-sourceview \
+ diamondburned:gotk4-spelling:ee26db878626:diamondburned_gotk4_spelling/vendor/libdb.so/gotk4-spelling \
diamondburned:gotk4:v0.3.1:diamondburned_gotk4_pkg/vendor/github.com/diamondburned/gotk4 \
diamondburned:gotkit:aa2fb5bc486d:diamondburned_gotkit/vendor/github.com/diamondburned/gotkit \
diamondburned:ningen:f1a24c0da3d8:diamondburned_ningen_v3/vendor/github.com/diamondburned/ningen/v3 \
diff --git a/net-im/dissent/files/patch-gtksourceview-5.4 b/net-im/dissent/files/patch-gtksourceview-5.4
index 915c229df499..c7874c74bcf9 100644
--- a/net-im/dissent/files/patch-gtksourceview-5.4
+++ b/net-im/dissent/files/patch-gtksourceview-5.4
@@ -1,17 +1,17 @@
Drop after x11-toolkits/gtksourceview5 >= 5.6 update
-vendor/libdb.so/gotk4-sourceview/pkg/pkg/gtksource/v5/gtksourcebuffer.go:500:10: could not determine kind of name for C.gtk_source_buffer_get_loading
-vendor/libdb.so/gotk4-sourceview/pkg/pkg/gtksource/v5/gtksourcecompletioncontext.go:301:10: could not determine kind of name for C.gtk_source_completion_context_get_proposals_for_provider
-vendor/libdb.so/gotk4-sourceview/pkg/pkg/gtksource/v5/gtksourcecompletioncontext.go:376:10: could not determine kind of name for C.gtk_source_completion_context_list_providers
-vendor/libdb.so/gotk4-sourceview/pkg/pkg/gtksource/v5/gtksourcecompletionproposal.go:88:10: could not determine kind of name for C.gtk_source_completion_proposal_get_typed_text
-vendor/libdb.so/gotk4-sourceview/pkg/pkg/gtksource/v5/gtksourcegutterlines.go:341:10: could not determine kind of name for C.gtk_source_gutter_lines_has_any_class
-vendor/libdb.so/gotk4-sourceview/pkg/pkg/gtksource/v5/gtksourcesearchsettings.go:192:10: could not determine kind of name for C.gtk_source_search_settings_get_visible_only
-vendor/libdb.so/gotk4-sourceview/pkg/pkg/gtksource/v5/gtksourcesearchsettings.go:340:2: could not determine kind of name for C.gtk_source_search_settings_set_visible_only
-vendor/libdb.so/gotk4-sourceview/pkg/pkg/gtksource/v5/gtksourcesnippet.go:138:10: could not determine kind of name for C.gtk_source_snippet_new_parsed
-vendor/libdb.so/gotk4-sourceview/pkg/pkg/gtksource/v5/gtksourcesnippetmanager.go:178:10: could not determine kind of name for C.gtk_source_snippet_manager_list_all
+vendor/libdb.so/gotk4-sourceview/pkg/gtksource/v5/gtksourcebuffer.go:500:10: could not determine kind of name for C.gtk_source_buffer_get_loading
+vendor/libdb.so/gotk4-sourceview/pkg/gtksource/v5/gtksourcecompletioncontext.go:301:10: could not determine kind of name for C.gtk_source_completion_context_get_proposals_for_provider
+vendor/libdb.so/gotk4-sourceview/pkg/gtksource/v5/gtksourcecompletioncontext.go:376:10: could not determine kind of name for C.gtk_source_completion_context_list_providers
+vendor/libdb.so/gotk4-sourceview/pkg/gtksource/v5/gtksourcecompletionproposal.go:88:10: could not determine kind of name for C.gtk_source_completion_proposal_get_typed_text
+vendor/libdb.so/gotk4-sourceview/pkg/gtksource/v5/gtksourcegutterlines.go:341:10: could not determine kind of name for C.gtk_source_gutter_lines_has_any_class
+vendor/libdb.so/gotk4-sourceview/pkg/gtksource/v5/gtksourcesearchsettings.go:192:10: could not determine kind of name for C.gtk_source_search_settings_get_visible_only
+vendor/libdb.so/gotk4-sourceview/pkg/gtksource/v5/gtksourcesearchsettings.go:340:2: could not determine kind of name for C.gtk_source_search_settings_set_visible_only
+vendor/libdb.so/gotk4-sourceview/pkg/gtksource/v5/gtksourcesnippet.go:138:10: could not determine kind of name for C.gtk_source_snippet_new_parsed
+vendor/libdb.so/gotk4-sourceview/pkg/gtksource/v5/gtksourcesnippetmanager.go:178:10: could not determine kind of name for C.gtk_source_snippet_manager_list_all
---- vendor/libdb.so/gotk4-sourceview/pkg/pkg/gtksource/v5/gtksourcebuffer.go.orig 2024-08-18 07:05:27 UTC
-+++ vendor/libdb.so/gotk4-sourceview/pkg/pkg/gtksource/v5/gtksourcebuffer.go
+--- vendor/libdb.so/gotk4-sourceview/pkg/gtksource/v5/gtksourcebuffer.go.orig 2024-08-18 07:05:27 UTC
++++ vendor/libdb.so/gotk4-sourceview/pkg/gtksource/v5/gtksourcebuffer.go
@@ -491,24 +491,6 @@ func (buffer *Buffer) Language() *Language {
return _language
}
@@ -37,8 +37,8 @@ vendor/libdb.so/gotk4-sourceview/pkg/pkg/gtksource/v5/gtksourcesnippetmanager.go
// SourceMarksAtIter returns the list of marks of the given category at iter.
//
// If category is NULL it returns all marks at iter.
---- vendor/libdb.so/gotk4-sourceview/pkg/pkg/gtksource/v5/gtksourcecompletioncontext.go.orig 2024-08-18 07:05:27 UTC
-+++ vendor/libdb.so/gotk4-sourceview/pkg/pkg/gtksource/v5/gtksourcecompletioncontext.go
+--- vendor/libdb.so/gotk4-sourceview/pkg/gtksource/v5/gtksourcecompletioncontext.go.orig 2024-08-18 07:05:27 UTC
++++ vendor/libdb.so/gotk4-sourceview/pkg/gtksource/v5/gtksourcecompletioncontext.go
@@ -278,44 +278,6 @@ func (self *CompletionContext) Language() *Language {
return _language
}
@@ -117,8 +117,8 @@ vendor/libdb.so/gotk4-sourceview/pkg/pkg/gtksource/v5/gtksourcesnippetmanager.go
}
// SetProposalsForProvider: this function allows providers to update their
---- vendor/libdb.so/gotk4-sourceview/pkg/pkg/gtksource/v5/gtksourcecompletionproposal.go.orig 2024-08-18 07:05:27 UTC
-+++ vendor/libdb.so/gotk4-sourceview/pkg/pkg/gtksource/v5/gtksourcecompletionproposal.go
+--- vendor/libdb.so/gotk4-sourceview/pkg/gtksource/v5/gtksourcecompletionproposal.go.orig 2024-08-18 07:05:27 UTC
++++ vendor/libdb.so/gotk4-sourceview/pkg/gtksource/v5/gtksourcecompletionproposal.go
@@ -3,7 +3,6 @@ import (
package gtksource
@@ -202,8 +202,8 @@ vendor/libdb.so/gotk4-sourceview/pkg/pkg/gtksource/v5/gtksourcesnippetmanager.go
}
// CompletionProposalInterface: instance of this type is always passed by
---- vendor/libdb.so/gotk4-sourceview/pkg/pkg/gtksource/v5/gtksourcegutterlines.go.orig 2024-08-18 07:05:27 UTC
-+++ vendor/libdb.so/gotk4-sourceview/pkg/pkg/gtksource/v5/gtksourcegutterlines.go
+--- vendor/libdb.so/gotk4-sourceview/pkg/gtksource/v5/gtksourcegutterlines.go.orig 2024-08-18 07:05:27 UTC
++++ vendor/libdb.so/gotk4-sourceview/pkg/gtksource/v5/gtksourcegutterlines.go
@@ -319,38 +319,6 @@ func (lines *GutterLines) View() *gtk.TextView {
return _textView
}
@@ -243,8 +243,8 @@ vendor/libdb.so/gotk4-sourceview/pkg/pkg/gtksource/v5/gtksourcesnippetmanager.go
// HasClass checks to see if gutterlines.AddClass was called with the name for
// line.
//
---- vendor/libdb.so/gotk4-sourceview/pkg/pkg/gtksource/v5/gtksourcesearchsettings.go.orig 2024-08-18 07:05:27 UTC
-+++ vendor/libdb.so/gotk4-sourceview/pkg/pkg/gtksource/v5/gtksourcesearchsettings.go
+--- vendor/libdb.so/gotk4-sourceview/pkg/gtksource/v5/gtksourcesearchsettings.go.orig 2024-08-18 07:05:27 UTC
++++ vendor/libdb.so/gotk4-sourceview/pkg/gtksource/v5/gtksourcesearchsettings.go
@@ -182,27 +182,6 @@ func (settings *SearchSettings) SearchText() string {
// The function returns the following values:
@@ -303,8 +303,8 @@ vendor/libdb.so/gotk4-sourceview/pkg/pkg/gtksource/v5/gtksourcesnippetmanager.go
}
// SetWrapAround enables or disables the wrap around search.
---- vendor/libdb.so/gotk4-sourceview/pkg/pkg/gtksource/v5/gtksourcesnippet.go.orig 2024-08-18 07:05:27 UTC
-+++ vendor/libdb.so/gotk4-sourceview/pkg/pkg/gtksource/v5/gtksourcesnippet.go
+--- vendor/libdb.so/gotk4-sourceview/pkg/gtksource/v5/gtksourcesnippet.go.orig 2024-08-18 07:05:27 UTC
++++ vendor/libdb.so/gotk4-sourceview/pkg/gtksource/v5/gtksourcesnippet.go
@@ -6,7 +6,6 @@ import (
"runtime"
"unsafe"
@@ -353,8 +353,8 @@ vendor/libdb.so/gotk4-sourceview/pkg/pkg/gtksource/v5/gtksourcesnippetmanager.go
}
// AddChunk appends chunk to the snippet.
---- vendor/libdb.so/gotk4-sourceview/pkg/pkg/gtksource/v5/gtksourcesnippetmanager.go.orig 2024-08-18 07:05:27 UTC
-+++ vendor/libdb.so/gotk4-sourceview/pkg/pkg/gtksource/v5/gtksourcesnippetmanager.go
+--- vendor/libdb.so/gotk4-sourceview/pkg/gtksource/v5/gtksourcesnippetmanager.go.orig 2024-08-18 07:05:27 UTC
++++ vendor/libdb.so/gotk4-sourceview/pkg/gtksource/v5/gtksourcesnippetmanager.go
@@ -161,35 +161,6 @@ func (self *SnippetManager) Snippet(group, languageId,
return _snippet
}
diff --git a/net-im/dissent/files/patch-vendor b/net-im/dissent/files/patch-vendor
deleted file mode 100644
index d6b5a47fd160..000000000000
--- a/net-im/dissent/files/patch-vendor
+++ /dev/null
@@ -1,28 +0,0 @@
-internal/messages/composer/input_good_os.go:11:2: cannot find module providing package libdb.so/gotk4-sourceview/pkg/gtksource/v5: import lookup disabled by -mod=vendor
-internal/messages/composer/input_good_os.go:12:2: cannot find module providing package libdb.so/gotk4-spelling/pkg/spelling: import lookup disabled by -mod=vendor
-vendor/libdb.so/gotk4-spelling/pkg/pkg/spelling/spelling-text-buffer-adapter.go:13:2: cannot find module providing package libdb.so/gotk4-sourceview/pkg/gtksource/v5: import lookup disabled by -mod=vendor
-
---- internal/messages/composer/input_good_os.go.orig 2024-08-27 09:35:53 UTC
-+++ internal/messages/composer/input_good_os.go
-@@ -8,8 +8,8 @@ import (
- "github.com/diamondburned/gotk4/pkg/gtk/v4"
- "github.com/diamondburned/gotkit/app"
- "github.com/diamondburned/gotkit/app/prefs"
-- "libdb.so/gotk4-sourceview/pkg/gtksource/v5"
-- "libdb.so/gotk4-spelling/pkg/spelling"
-+ "libdb.so/gotk4-sourceview/pkg/pkg/gtksource/v5"
-+ "libdb.so/gotk4-spelling/pkg/pkg/spelling"
- )
-
- var spellCheck = prefs.NewBool(true, prefs.PropMeta{
---- vendor/libdb.so/gotk4-spelling/pkg/pkg/spelling/spelling-text-buffer-adapter.go.orig 2024-08-18 08:25:54 UTC
-+++ vendor/libdb.so/gotk4-spelling/pkg/pkg/spelling/spelling-text-buffer-adapter.go
-@@ -10,7 +10,7 @@ import (
- coreglib "github.com/diamondburned/gotk4/pkg/core/glib"
- "github.com/diamondburned/gotk4/pkg/gio/v2"
- "github.com/diamondburned/gotk4/pkg/gtk/v4"
-- "libdb.so/gotk4-sourceview/pkg/gtksource/v5"
-+ "libdb.so/gotk4-sourceview/pkg/pkg/gtksource/v5"
- )
-
- // #include <stdlib.h>