From 3c441381acb7be825823ac5aa279b1821b6e4f7d Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sun, 1 Dec 2024 22:29:40 +0100 Subject: [PATCH] Update to version 1.0.133; Fixes RHBZ#2325400 --- .gitignore | 1 + cxx-fix-metadata.diff | 11 +++++++++-- rust-cxx.spec | 7 ++++--- rust2rpm.toml | 2 ++ sources | 2 +- 5 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 5f27ac4..fc262ab 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ /cxx-1.0.126.crate /cxx-1.0.128.crate /cxx-1.0.129.crate +/cxx-1.0.133.crate diff --git a/cxx-fix-metadata.diff b/cxx-fix-metadata.diff index 8908c0e..e1ad6d4 100644 --- a/cxx-fix-metadata.diff +++ b/cxx-fix-metadata.diff @@ -1,5 +1,5 @@ ---- cxx-1.0.129/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ cxx-1.0.129/Cargo.toml 2024-10-22T19:48:06.609852+00:00 +--- cxx-1.0.133/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ cxx-1.0.133/Cargo.toml 2024-12-01T21:20:13.312150+00:00 @@ -18,11 +18,19 @@ build = "build.rs" links = "cxxbridge1" @@ -21,3 +21,10 @@ ] autolib = false autobins = false +@@ -143,6 +151,3 @@ + "alloc", + "foldhash/std", + ] +- +-[target."cfg(any())".build-dependencies.cxxbridge-cmd] +-version = "=1.0.133" diff --git a/rust-cxx.spec b/rust-cxx.spec index b65333b..9b6d927 100644 --- a/rust-cxx.spec +++ b/rust-cxx.spec @@ -1,12 +1,12 @@ -# Generated by rust2rpm 26 +# Generated by rust2rpm 27 # * tests can only be run in-tree -%bcond_with check +%bcond check 0 %global debug_package %{nil} %global crate cxx Name: rust-cxx -Version: 1.0.129 +Version: 1.0.133 Release: %autorelease Summary: Safe interop between Rust and C++ @@ -14,6 +14,7 @@ License: MIT OR Apache-2.0 URL: https://crates.io/crates/cxx Source: %{crates_source} # Manually created patch for downstream crate metadata changes +# * drop dependency hack for executable-only cxxbridge-cmd crate # * exclude files that are only needed for integration in bazel or buck # * exclude unused docs sources Patch: cxx-fix-metadata.diff diff --git a/rust2rpm.toml b/rust2rpm.toml index 51ae19a..cd51027 100644 --- a/rust2rpm.toml +++ b/rust2rpm.toml @@ -1,5 +1,6 @@ [package] cargo-toml-patch-comments = [ + "drop dependency hack for executable-only cxxbridge-cmd crate", "exclude files that are only needed for integration in bazel or buck", "exclude unused docs sources", ] @@ -7,3 +8,4 @@ cargo-toml-patch-comments = [ [tests] run = ["none"] comments = ["tests can only be run in-tree"] + diff --git a/sources b/sources index 05cd037..931ffbc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cxx-1.0.129.crate) = a365c0bee5fbd94e80a07841f726489647351f962a5a1b5417ac6d7c775ba0d91d97cdd64e7eb57b713f61fc8e15e8241c0f3f1d937d6a31a1978ad8ca9abf1b +SHA512 (cxx-1.0.133.crate) = 551c4d450ba138cbf0bc2a6eaedaec25cec5182a4450db68629232d90f77c162e51086cfbc6834109e4063d30880dfa19bcd3fbf7df06a61f4bc1020b20732f0