Date: Wed, 26 Apr 2023 11:10:18 GMT From: Mikael Urankar <mikael@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: eec16e488b05 - main - net-im/libsignal-node: Fix build with rust 1.69.0 Message-ID: <202304261110.33QBAINs082691@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=eec16e488b05684cc15c25e63e0106b6d519b06b commit eec16e488b05684cc15c25e63e0106b6d519b06b Author: Mikael Urankar <mikael@FreeBSD.org> AuthorDate: 2023-04-26 11:00:55 +0000 Commit: Mikael Urankar <mikael@FreeBSD.org> CommitDate: 2023-04-26 11:10:16 +0000 net-im/libsignal-node: Fix build with rust 1.69.0 Upstream PR: https://github.com/signalapp/libsignal/issues/519 Obtained from: https://gitlab.alpinelinux.org/alpine/aports/-/blob/master/testing/signal-desktop/libsignal-fix-build-rust-1.69.patch --- net-im/libsignal-node/files/patch-rust-1.69.0 | 47 +++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/net-im/libsignal-node/files/patch-rust-1.69.0 b/net-im/libsignal-node/files/patch-rust-1.69.0 new file mode 100644 index 000000000000..6bb5d3dbbbe2 --- /dev/null +++ b/net-im/libsignal-node/files/patch-rust-1.69.0 @@ -0,0 +1,47 @@ +PR: https://github.com/signalapp/libsignal/issues/519 +Obtained from: https://gitlab.alpinelinux.org/alpine/aports/-/blob/master/testing/signal-desktop/libsignal-fix-build-rust-1.69.patch + +diff --git a/rust/attest/src/dcap/sgx_report_body.rs b/rust/attest/src/dcap/sgx_report_body.rs +index 056bef2b..6d3f0d5d 100644 +--- rust/attest/src/dcap/sgx_report_body.rs ++++ rust/attest/src/dcap/sgx_report_body.rs +@@ -20,7 +20,7 @@ const SGX_HASH_SIZE: usize = 32; + + pub type MREnclave = [u8; SGX_HASH_SIZE]; + +-#[derive(Debug)] ++#[derive(Copy, Clone, Debug)] + #[repr(C, packed)] + // sgx_report_body_t + pub(crate) struct SgxReportBody { +diff --git a/rust/attest/src/endian.rs b/rust/attest/src/endian.rs +index ae9351eb..2e08c711 100644 +--- rust/attest/src/endian.rs ++++ rust/attest/src/endian.rs +@@ -7,7 +7,7 @@ use std::convert::{TryFrom, TryInto}; + + use hex::FromHex; + +-#[derive(Debug)] ++#[derive(Copy, Clone, Debug)] + #[repr(C, packed)] + pub(crate) struct UInt16LE { + bytes: [u8; 2], +@@ -27,7 +27,7 @@ impl From<u16> for UInt16LE { + } + } + +-#[derive(Debug)] ++#[derive(Copy, Clone, Debug)] + #[repr(C, packed)] + pub(crate) struct UInt32LE { + bytes: [u8; 4], +@@ -66,7 +66,7 @@ impl FromHex for UInt32LE { + } + } + +-#[derive(Debug)] ++#[derive(Copy, Clone, Debug)] + #[repr(C, packed)] + pub(crate) struct UInt64LE { + bytes: [u8; 8],
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304261110.33QBAINs082691>