From b68750a609a7c97f69a6f37050eb942a2378d1a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Tue, 3 Oct 2023 12:00:41 +0200 Subject: [PATCH] update to current PBS and cbindgen MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit cbindgen still requires syn 1.x unfortunately, the new version picks up wakeup_callback which we don't actually need in our interface, so exclude it at least until the next bump happens for other reasons. Signed-off-by: Fabian Grünbichler --- Cargo.toml | 4 ++-- build.rs | 1 + debian/control | 2 +- submodules/proxmox-backup | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 2d19add..fc07604 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,13 +16,13 @@ build = "build.rs" crate-type = ['lib', 'cdylib', 'staticlib'] [build-dependencies] -cbindgen = "0.24.0" +cbindgen = "0.26.0" [dependencies] anyhow = "1.0" bytes = "1.0" # only so cargo-fairy picks it up.. -cbindgen = "0.24.0" +cbindgen = "0.26.0" futures = "0.3" hex = "0.4.3" h2 = { version = "0.3", features = [ "stream" ] } diff --git a/build.rs b/build.rs index 8a1008f..f96d123 100644 --- a/build.rs +++ b/build.rs @@ -19,6 +19,7 @@ fn main() { .with_crate(&crate_dir) .with_header(header) .with_include_guard("PROXMOX_BACKUP_QEMU_H") + .exclude_item("wakeup_callback") .generate() .unwrap() .write_to_file("proxmox-backup-qemu.h"); diff --git a/debian/control b/debian/control index 39a2a11..a1583ff 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Build-Depends: cargo:native, librust-bincode-1+default-dev, librust-bitflags-1+default-dev (>= 1.2.1-~~), librust-bytes-1+default-dev, - librust-cbindgen-0.24+default-dev, + librust-cbindgen-0.26+default-dev, librust-crc32fast-1+default-dev, librust-endian-trait-0.6+arrays-dev, librust-endian-trait-0.6+default-dev, diff --git a/submodules/proxmox-backup b/submodules/proxmox-backup index a8f60bd..6ee22cd 160000 --- a/submodules/proxmox-backup +++ b/submodules/proxmox-backup @@ -1 +1 @@ -Subproject commit a8f60bd1287b7b2c7e50d3f7e1def79a01a1babc +Subproject commit 6ee22cdd41c6577051f729ed3efd2a9a88e8d262