From 4626da96156859ae56ffe7832be7ee7469e8fa69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matt=C3=A9o=20Rossillol=E2=80=91=E2=80=91Laruelle?= Date: Mon, 7 Jul 2025 11:29:38 +0200 Subject: [PATCH] net-misc/ffsend: fix build failure due to `traitobject` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattéo Rossillol‑‑Laruelle --- net-misc/ffsend/Manifest | 2 +- net-misc/ffsend/ffsend-0.2.77.ebuild | 9 ++++++ net-misc/ffsend/ffsend-9999.ebuild | 9 ++++++ .../files/ffsend-bump-traitobject.patch | 30 +++++++++++++++++++ 4 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 net-misc/ffsend/files/ffsend-bump-traitobject.patch diff --git a/net-misc/ffsend/Manifest b/net-misc/ffsend/Manifest index b735ca1ebd..ff2bb1eff1 100644 --- a/net-misc/ffsend/Manifest +++ b/net-misc/ffsend/Manifest @@ -1,2 +1,2 @@ -DIST ffsend-0.2.77-crates.tar.xz 30781576 BLAKE2B 7bc4f9b4bde32bf9b65334645a812cd2d92b7a6f9023d36a79c74a4b1c2ce7d67f749a986313f91fc9cc76f314d9fdfb229a6d836c44ea3a035a2db127231164 SHA512 d14a98cfaa6e2c873c8b0f5c6de9eb868dd9f5a999dee56150b66a722ef89d1b7cba61054474a147f3bb13d1e0c7e9cebce68bcc045a328be0544fe60109d415 +DIST ffsend-0.2.77-crates.tar.xz 30781572 BLAKE2B 1906139e895ef8ee2d5a58aec6757c9fbac59aa00ab5d1ad89b27654dca6ab69d5650a678be66f5942777a462e8910d50ce5ddf4cbf6cce3cd3fee831dd8ff00 SHA512 dfaf135e84976208471a973b962d03c2b34367146d1afd8181ff3638b69066bef93a3b1e371d0515128bec5c9d8823bda3a3a1fa92ba0865a0a7aa0f13ec27e3 DIST ffsend-0.2.77.tar.gz 195500 BLAKE2B 0b67fccadf433031dbd9372892e089fb468ae82228f999b9ffbb81b5995635976045c40b6b666de7fd4210a3f8285ba6d7dea2f8bf0c031f83de0c16440978cf SHA512 0dc47d8fffc98e8ebbfbf43b12f31d6ecb9bb237188f15650c641a03050eebbbc25443e9b6b5bb132d3e020bb4796487da78cc80bc0d4d6798d73e524fc0e9ff diff --git a/net-misc/ffsend/ffsend-0.2.77.ebuild b/net-misc/ffsend/ffsend-0.2.77.ebuild index 7f2c6a3c69..f77ca9011d 100644 --- a/net-misc/ffsend/ffsend-0.2.77.ebuild +++ b/net-misc/ffsend/ffsend-0.2.77.ebuild @@ -37,11 +37,20 @@ DOCS=( ) src_unpack() { + patch_cargo_file() + { + pushd "${S}" &>> /dev/null || die + eapply "${FILESDIR}/${PN}-bump-traitobject.patch" + popd &>> /dev/null || die + } + if [[ "${PV}" = "9999" ]]; then git-r3_src_unpack + patch_cargo_file cargo_live_src_unpack else cargo_src_unpack + patch_cargo_file fi } diff --git a/net-misc/ffsend/ffsend-9999.ebuild b/net-misc/ffsend/ffsend-9999.ebuild index 7f2c6a3c69..f77ca9011d 100644 --- a/net-misc/ffsend/ffsend-9999.ebuild +++ b/net-misc/ffsend/ffsend-9999.ebuild @@ -37,11 +37,20 @@ DOCS=( ) src_unpack() { + patch_cargo_file() + { + pushd "${S}" &>> /dev/null || die + eapply "${FILESDIR}/${PN}-bump-traitobject.patch" + popd &>> /dev/null || die + } + if [[ "${PV}" = "9999" ]]; then git-r3_src_unpack + patch_cargo_file cargo_live_src_unpack else cargo_src_unpack + patch_cargo_file fi } diff --git a/net-misc/ffsend/files/ffsend-bump-traitobject.patch b/net-misc/ffsend/files/ffsend-bump-traitobject.patch new file mode 100644 index 0000000000..c0cc1ed494 --- /dev/null +++ b/net-misc/ffsend/files/ffsend-bump-traitobject.patch @@ -0,0 +1,30 @@ +From 29eb167d4367929a2546c20b3f2bbf890b63c631 Mon Sep 17 00:00:00 2001 +From: Rui Chen +Date: Mon, 16 Jun 2025 17:23:14 -0400 +Subject: [PATCH] chore(build): bump traitobject to 0.1.1 to build against rust + 1.87.0 + +Signed-off-by: Rui Chen +--- + Cargo.lock | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index fabde0d..8f82361 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -2691,9 +2691,9 @@ dependencies = [ + + [[package]] + name = "traitobject" +-version = "0.1.0" ++version = "0.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079" ++checksum = "04a79e25382e2e852e8da874249358d382ebaf259d0d34e75d8db16a7efabbc7" + + [[package]] + name = "try-lock" +-- +GitLab +