diff --git a/.gitignore b/.gitignore index 2e27463..54ed3c6 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /zstd-sys-2.0.7+zstd.1.5.4.crate /zstd-sys-2.0.8+zstd.1.5.5.crate /zstd-sys-2.0.9+zstd.1.5.5.crate +/zstd-sys-2.0.10+zstd.1.5.6.crate diff --git a/0001-unconditionally-use-bindgen-and-pkg-config-to-link-a.patch b/0001-unconditionally-use-bindgen-and-pkg-config-to-link-a.patch index ee7134c..d12ab70 100644 --- a/0001-unconditionally-use-bindgen-and-pkg-config-to-link-a.patch +++ b/0001-unconditionally-use-bindgen-and-pkg-config-to-link-a.patch @@ -1,15 +1,15 @@ -From 94271fbfcdafac911bfa9ec7bdfee7c33f6423c4 Mon Sep 17 00:00:00 2001 +From 2c6e27c3723ccb3c83e28a0b6c2033564f9f515e Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 1 Aug 2023 15:13:34 +0200 Subject: [PATCH] unconditionally use bindgen and pkg-config to link against system libzstd --- - build.rs | 210 +------------------------------------------------------ - 1 file changed, 3 insertions(+), 207 deletions(-) + build.rs | 211 +------------------------------------------------------ + 1 file changed, 3 insertions(+), 208 deletions(-) diff --git a/build.rs b/build.rs -index a77a10e..e748b4b 100644 +index c7b52f5..2274c45 100644 --- a/build.rs +++ b/build.rs @@ -1,8 +1,6 @@ @@ -23,7 +23,7 @@ index a77a10e..e748b4b 100644 fn generate_bindings(defs: Vec<&str>, headerpaths: Vec) { let bindings = bindgen::Builder::default().header("zstd.h"); #[cfg(feature = "zdict_builder")] -@@ -35,9 +33,6 @@ fn generate_bindings(defs: Vec<&str>, headerpaths: Vec) { +@@ -36,9 +34,6 @@ fn generate_bindings(defs: Vec<&str>, headerpaths: Vec) { .expect("Could not write bindings"); } @@ -33,7 +33,7 @@ index a77a10e..e748b4b 100644 fn pkg_config() -> (Vec<&'static str>, Vec) { let library = pkg_config::Config::new() .statik(true) -@@ -47,31 +42,6 @@ fn pkg_config() -> (Vec<&'static str>, Vec) { +@@ -48,31 +43,6 @@ fn pkg_config() -> (Vec<&'static str>, Vec) { (vec!["PKG_CONFIG"], library.include_paths) } @@ -65,7 +65,7 @@ index a77a10e..e748b4b 100644 /// This function would find the first flag in `flags` that is supported /// and add that to `config`. #[allow(dead_code)] -@@ -85,156 +55,6 @@ fn flag_if_supported_with_fallbacks(config: &mut cc::Build, flags: &[&str]) { +@@ -86,157 +56,6 @@ fn flag_if_supported_with_fallbacks(config: &mut cc::Build, flags: &[&str]) { } } @@ -116,9 +116,10 @@ index a77a10e..e748b4b 100644 - // Note that Emscripten already provides its own C standard library so - // wasm32-unknown-emscripten should not be included here. - // See: https://github.com/gyscos/zstd-rs/pull/209 -- let need_wasm_shim = env::var("TARGET").map_or(false, |target| { -- target == "wasm32-unknown-unknown" || target == "wasm32-wasi" -- }); +- let need_wasm_shim = !cfg!(feature = "no_wasm_shim") +- && env::var("TARGET").map_or(false, |target| { +- target == "wasm32-unknown-unknown" || target == "wasm32-wasi" +- }); - - if need_wasm_shim { - cargo_print(&"rerun-if-changed=wasm-shim/stdlib.h"); @@ -222,7 +223,7 @@ index a77a10e..e748b4b 100644 /// Print a line for cargo. /// /// If non-cargo is set, do not print anything. -@@ -247,32 +67,8 @@ fn cargo_print(content: &dyn fmt::Display) { +@@ -249,32 +68,8 @@ fn cargo_print(content: &dyn fmt::Display) { fn main() { cargo_print(&"rerun-if-env-changed=ZSTD_SYS_USE_PKG_CONFIG"); @@ -257,5 +258,5 @@ index a77a10e..e748b4b 100644 let includes: Vec<_> = headerpaths .iter() -- -2.41.0 +2.44.0 diff --git a/rust-zstd-sys.spec b/rust-zstd-sys.spec index 1fabb16..59f74a1 100644 --- a/rust-zstd-sys.spec +++ b/rust-zstd-sys.spec @@ -1,12 +1,12 @@ -# Generated by rust2rpm 25 +# Generated by rust2rpm 26 %bcond_without check %global debug_package %{nil} %global crate zstd-sys -%global upstream_version 2.0.9+zstd.1.5.5 +%global upstream_version 2.0.10+zstd.1.5.6 Name: rust-zstd-sys -Version: 2.0.9 +Version: 2.0.10 Release: %autorelease Summary: Low-level bindings for the zstd compression library @@ -18,7 +18,6 @@ Source: %{crates_source %{crate} %{upstream_version}} Patch: zstd-sys-fix-metadata-auto.diff # Manually created patch for downstream crate metadata changes # * make bindgen build-dependency non-optional -# * temporarily downgrade bindgen build-dependency from 0.64 to 0.63 # * fix logic for included / excluded files # * exclude files that are only useful for upstream development Patch: zstd-sys-fix-metadata.diff @@ -26,6 +25,7 @@ Patch: zstd-sys-fix-metadata.diff Patch: 0001-unconditionally-use-bindgen-and-pkg-config-to-link-a.patch BuildRequires: cargo-rpm-macros >= 24 +BuildRequires: pkgconfig(libzstd) %global _description %{expand: Low-level bindings for the zstd compression library.} @@ -225,7 +225,6 @@ rm -vr zstd/ %generate_buildrequires %cargo_generate_buildrequires -echo 'pkgconfig(libzstd)' %build %cargo_build diff --git a/rust2rpm.toml b/rust2rpm.toml index 032c439..316fa30 100644 --- a/rust2rpm.toml +++ b/rust2rpm.toml @@ -1,4 +1,22 @@ +[package] +cargo-toml-patch-comments = [ + "make bindgen build-dependency non-optional", + "fix logic for included / excluded files", + "exclude files that are only useful for upstream development", +] + +[features] +hide = [ + "no_wasm_shim", +] + [requires] build = ["pkgconfig(libzstd)"] lib = ["pkgconfig(libzstd)"] +[scripts] +prep.post = [ + "# * remove bundled zstd sources", + "rm -vr zstd/", +] + diff --git a/sources b/sources index fe3d26f..6d2f008 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zstd-sys-2.0.9+zstd.1.5.5.crate) = 604c01eae4975745aca1dc1d351db98fec34f7036143e59dfeb4d36e6ee18ac9f3871a288557c8ebdc9e816967a008da43154dc9a0eb3cac85071ccb05bf58aa +SHA512 (zstd-sys-2.0.10+zstd.1.5.6.crate) = 588008a436a9c7751fa7c088620bf04434751e508c9a729e6840e42a14a2cc26c8ee252e8f129a5ae00eb1f76ae6ecfffaac043d854b61381d386f71d80993f9 diff --git a/zstd-sys-fix-metadata-auto.diff b/zstd-sys-fix-metadata-auto.diff index 8e7545c..7fc31ca 100644 --- a/zstd-sys-fix-metadata-auto.diff +++ b/zstd-sys-fix-metadata-auto.diff @@ -1,15 +1,15 @@ ---- zstd-sys-2.0.9+zstd.1.5.5/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ zstd-sys-2.0.9+zstd.1.5.5/Cargo.toml 2024-01-15T14:42:57.236818+00:00 +--- zstd-sys-2.0.10+zstd.1.5.6/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ zstd-sys-2.0.10+zstd.1.5.6/Cargo.toml 2024-05-06T19:33:10.568159+00:00 @@ -13,7 +13,7 @@ edition = "2018" rust-version = "1.64" name = "zstd-sys" --version = "2.0.9+zstd.1.5.5" -+version = "2.0.9" +-version = "2.0.10+zstd.1.5.6" ++version = "2.0.10" authors = ["Alexandre Bury "] build = "build.rs" links = "zstd" -@@ -83,3 +83,4 @@ +@@ -84,3 +84,4 @@ thin-lto = [] zdict_builder = [] zstdmt = [] diff --git a/zstd-sys-fix-metadata.diff b/zstd-sys-fix-metadata.diff index d8499d2..63614c6 100644 --- a/zstd-sys-fix-metadata.diff +++ b/zstd-sys-fix-metadata.diff @@ -1,5 +1,5 @@ ---- zstd-sys-2.0.9+zstd.1.5.5/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ zstd-sys-2.0.9+zstd.1.5.5/Cargo.toml 2024-01-15T14:43:55.623033+00:00 +--- zstd-sys-2.0.10+zstd.1.5.6/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ zstd-sys-2.0.10+zstd.1.5.6/Cargo.toml 2024-05-06T19:33:42.572623+00:00 @@ -17,18 +17,11 @@ authors = ["Alexandre Bury "] build = "build.rs"