From nobody Thu Jan 20 14:54:21 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 0E3FF1956654; Thu, 20 Jan 2022 14:54:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jfls96xMgz3jDL; Thu, 20 Jan 2022 14:54:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642690462; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wIesEKrctLjRPAZaQXONKzw255H5AkcxNJEwPtk1BuI=; b=cvwL+D8hExlwGkBElyMZhj0qkllLG9hajZJ2c5LS4VpnYe0LYXL56Wslo4Zoc5RxgIxIqA o4W2hUWP5556Z9GOXwku72E2VG1E/UPB5GOSJaG8oL5XVPgBSKuOsDLXzCdAXMwLhO/XVP 1F0wF3ili3d4GmrPWbz/H/YymVAJwCHLpZbmKdlmnTsJwIG4fh6Gmvz3PeQdA+etnd3mes g8QALyIJjOIJFqIsos1gQvaMUwirZbQqQWEOb/rR5dYmFj23CMIufV0fTqFQaqMbA0sJIn PR12FCpgKL4VR5+YrZ+LrlALcjVZ37l7Z1iUUnBAkPAmDAbu9dK+dvU6CBiSLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CEA11213B; Thu, 20 Jan 2022 14:54:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20KEsL9t077986; Thu, 20 Jan 2022 14:54:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20KEsLKB077985; Thu, 20 Jan 2022 14:54:21 GMT (envelope-from git) Date: Thu, 20 Jan 2022 14:54:21 GMT Message-Id: <202201201454.20KEsLKB077985@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ashish SHUKLA Subject: git: a38ab8dc5201 - main - devel/soft-serve: Unbreak on 32-bit platforms List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ashish X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a38ab8dc52010630ef28e1a42952ac67f8a0703b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642690462; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wIesEKrctLjRPAZaQXONKzw255H5AkcxNJEwPtk1BuI=; b=kdZjbIX/Pxqk0BVIMkfS6nE246bZcBfbW/In4LjQFoeLVJxqY6NJO2BsOsf4D3yCNWr0BA k+RkW+MHIiJNFCcSLEaoU2bSSjiDbkDNsmkpgHlMThOhd9NqFcxG/9qkKoSXXrP+avPKU4 l03Ja72NueZ9r19er+Un2xGrdGSR1DqAN1c4HIxdcJnQH7mVU94M8Cm9QpKIzTolwF9218 vfw4Cu0E6EY9t9rSOkfvAMBOHZhll69mbUfJaMPKksWiKdgscZ3NQIcog62fpaSNse59/H MpZImpeHbHErjlqJeXk6KLjUeUsdxsN5P+XgDfTQcRR9oDRtfRPC/Le0yz1yww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642690462; a=rsa-sha256; cv=none; b=Q7ag7wTt8OwZfQFAlmYNO1ANiHZavPOjSXyXjMU/PhZA6NZa/kt20b5aipID3b6C7QAxNY x28/JyRB9kRTU9ype8mrwTvNb6rML3d4emDC9dtIO+jrGi1J899xOrJimo8k6Enfu6bv14 olHFGHLkq16RShktw9wHGIWMdjE4tYnW+U611Go7K1cVE7L/2rYHWKCZsdf8Q+MvcwRuA5 p/X5wucWiEQZhp6Ah1d+MKlGp0+7gWhFEn7j6GKBgboFd6CClsCbhDK5cYNoZRpicO1izq zb+ukL/eXnZm4ITAhAr6GjLVYwWRhkzpCULFwLOgJlyHr6WXss3rrNNsin9DHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ashish: URL: https://cgit.FreeBSD.org/ports/commit/?id=a38ab8dc52010630ef28e1a42952ac67f8a0703b commit a38ab8dc52010630ef28e1a42952ac67f8a0703b Author: Ashish SHUKLA AuthorDate: 2022-01-20 13:51:19 +0000 Commit: Ashish SHUKLA 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