Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 20 Jan 2022 14:54:21 GMT
From:      Ashish SHUKLA <ashish@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: a38ab8dc5201 - main - devel/soft-serve: Unbreak on 32-bit platforms
Message-ID:  <202201201454.20KEsLKB077985@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by ashish:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a38ab8dc52010630ef28e1a42952ac67f8a0703b

commit a38ab8dc52010630ef28e1a42952ac67f8a0703b
Author:     Ashish SHUKLA <ashish@FreeBSD.org>
AuthorDate: 2022-01-20 13:51:19 +0000
Commit:     Ashish SHUKLA <ashish@FreeBSD.org>
CommitDate: 2022-01-20 14:53:03 +0000

    devel/soft-serve: Unbreak on 32-bit platforms
    
    Reported by:    pkg-fallout
---
 ...endor_github.com_charmbracelet_bubbletea_cancelreader__bsd.go | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/devel/soft-serve/files/extrapatch-vendor_github.com_charmbracelet_bubbletea_cancelreader__bsd.go b/devel/soft-serve/files/extrapatch-vendor_github.com_charmbracelet_bubbletea_cancelreader__bsd.go
index 877f7fcf2958..f523365feb6b 100644
--- a/devel/soft-serve/files/extrapatch-vendor_github.com_charmbracelet_bubbletea_cancelreader__bsd.go
+++ b/devel/soft-serve/files/extrapatch-vendor_github.com_charmbracelet_bubbletea_cancelreader__bsd.go
@@ -1,9 +1,12 @@
---- vendor/github.com/charmbracelet/bubbletea/cancelreader_bsd.go.orig	2021-12-11 06:31:30 UTC
+--- vendor/github.com/charmbracelet/bubbletea/cancelreader_bsd.go.orig	2022-01-07 18:25:29 UTC
 +++ vendor/github.com/charmbracelet/bubbletea/cancelreader_bsd.go
-@@ -134,9 +134,9 @@ func (r *kqueueCancelReader) wait() error {
+@@ -134,11 +134,11 @@ func (r *kqueueCancelReader) wait() error {
+ 		break
  	}
  
- 	switch events[0].Ident {
+-	ident := uint64(events[0].Ident)
++	ident := uint32(events[0].Ident)
+ 	switch ident {
 -	case uint64(r.file.Fd()):
 +	case uint32(r.file.Fd()):
  		return nil



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202201201454.20KEsLKB077985>