From nobody Tue Dec 31 14:00:38 2024 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 4YMvkd5ygcz5jV2b; Tue, 31 Dec 2024 14:00:41 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YMvkb1F56z4mlN; Tue, 31 Dec 2024 14:00:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735653639; 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=V6o1yOGxPmfF03yWU11Bf9btO5SeQC2Dt8fhmi+7MY4=; b=He2UWg0tzsorNIeZcQHZ20TvKEIcbg8IBgjONUWFSopH7PzbUC9FjGE0EceGMjg0Reoo7L rIvn1LkQc3J9j4UVzttquqmUzVrl7eld0Jynsy2yZXlcCHzILyXSY/htWEBA1qBhIN2Wfq znv+wCB2ERNDcM2i6KTm9R6dyDbN2MSoONvOU2PYVW7Q1XUiAQow5alk4S8aVETlYJmHTQ G8bvsp+0Y4YEZ+MQujlWZH8tQ2I/8ZoGNhzH7e+4Pms4sGGeWsEtb2H9cCr/d/X8O+pcRf dJ6nYH8b27ukpqcPKPvX4lPwsnSOFRtpTsrEMxIMzFWIDkWjLQrV1gW4QYFDiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735653639; 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=V6o1yOGxPmfF03yWU11Bf9btO5SeQC2Dt8fhmi+7MY4=; b=FHPIg3wqVD7DY8EGTvf1GyIb/lJ6wRZQjIQSns0gB6VvcOsdVZlZU5siLYujx/Wr2W0g9d pbtN+B6Cc7Zm5X4K3EKy9h1tcFSL3g3iXzQp0Z2LryZ2cb6LmAQb5hJ3XhPKwCy3YXoAM2 SV9egj/2EGdsBnG6XacQYpp1NM7QT0LpqiWM4I3A0XOSFvOFe0TfyLRunFjC2FyLCS13tP 1lLjaDp+0brgXIyl/Jg7cujXmx0IpHblIYG1td4Ud3jOFELisotZTBTsmfN7mDjepL3S8V 1XEFMbOkU9kHRFEcJYJT65gh7j6GggoQxXfGt+NRqC0NyunObENNIRxVui+x+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735653639; a=rsa-sha256; cv=none; b=i0tI+AdOuB+30NyAyf7QaXdkl7vQegBiYEti8CVUlXuaxn2nKovvj1g4FKoMDa00hTM//B KnSRVBw09SPgiT24OrmeePVCBzXeLRjTVe2enRdu6ebMfHLFt1znjZ81syps6EB1evuAK/ KGVy8Es8OjmdQwKJN+8f+LbFjebidaXz1ehVcdiRDKYQaEjJ5/pQKT7qXBjMfymF/z5caf KR+NgYvZX9L3ITYlIIz1/djvAHsqghZ9wndv+C5QtLx/asid/H5WOBGuL94A6Nv1sZApYu 0F7AubNXIzKZziJO/bQU51MabU/xWeaSf3DTRLh0LA/s+DeoxbeUqLlJaEkYXQ== 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 4YMvkZ6YDvzjL1; Tue, 31 Dec 2024 14:00:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BVE0cJU053120; Tue, 31 Dec 2024 14:00:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BVE0cKr053117; Tue, 31 Dec 2024 14:00:38 GMT (envelope-from git) Date: Tue, 31 Dec 2024 14:00:38 GMT Message-Id: <202412311400.4BVE0cKr053117@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 007dfde66093 - main - biology/coverm: fix build with char being unsigned 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 007dfde66093b7995840d9af068404d3f177f227 Auto-Submitted: auto-generated The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=007dfde66093b7995840d9af068404d3f177f227 commit 007dfde66093b7995840d9af068404d3f177f227 Author: Piotr Kubaj AuthorDate: 2024-12-26 16:48:39 +0000 Commit: Piotr Kubaj CommitDate: 2024-12-31 13:59:43 +0000 biology/coverm: fix build with char being unsigned error[E0308]: mismatched types --> /wrkdirs/usr/ports/biology/coverm/work/CoverM-0.7.0/cargo-crates/rust-htslib-0.44.1/src/bam/record.rs:2324:17 | 2319 | let ret = hts_sys::bam_mods_query_type( | ---------------------------- arguments to this function are incorrect ... 2324 | &mut canonical, | ^^^^^^^^^^^^^^ expected `*mut u8`, found `&mut i8` | = note: expected raw pointer `*mut u8` found mutable reference `&mut i8` --- ...cargo-crates_rust-htslib-0.44.1_src_bam_record.rs | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/biology/coverm/files/patch-cargo-crates_rust-htslib-0.44.1_src_bam_record.rs b/biology/coverm/files/patch-cargo-crates_rust-htslib-0.44.1_src_bam_record.rs new file mode 100644 index 000000000000..04465b46c6d1 --- /dev/null +++ b/biology/coverm/files/patch-cargo-crates_rust-htslib-0.44.1_src_bam_record.rs @@ -0,0 +1,20 @@ +--- cargo-crates/rust-htslib-0.44.1/src/bam/record.rs.orig 2024-12-26 16:34:58 UTC ++++ cargo-crates/rust-htslib-0.44.1/src/bam/record.rs +@@ -2216,7 +2216,7 @@ pub struct BaseModificationMetadata { + pub struct BaseModificationMetadata { + pub strand: i32, + pub implicit: i32, +- pub canonical: i8, ++ pub canonical: c_char, + } + + /// struct containing the internal state required to access +@@ -2314,7 +2314,7 @@ impl BaseModificationState<'_> { + unsafe { + let mut strand: i32 = 0; + let mut implicit: i32 = 0; +- let mut canonical: i8 = 0; ++ let mut canonical: c_char = 0; + + let ret = hts_sys::bam_mods_query_type( + self.state,