From 26509deba22f8ae3030b191f5139d23d0df27d5b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fabian=20Gr=C3=BCnbichler?= Date: Mon, 24 Jun 2024 14:37:53 +0200 Subject: [PATCH] opener: cherry-pick fix to avoid vendored dbus MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit this is part of opener 0.7.1 as b6ead409a9a60f7a2705cf5f2be167719959440e Forwarded: https://github.com/Seeker14491/opener/pull/31 Signed-off-by: Fabian Grünbichler Workaround for rust-lang/cargo#10788 As described in Cargo Issue 10788, until Rust 1.71 there were cases where the dependency/feature syntax would not work correctly when used in combination with the dep:dependency syntax. Workarounds include adding an explicit feature dependency = ["dep:dependency"] but in many (most?) cases it is enough to only enable the dependency feature if the dependency is already enabled, via the dependency?/feature syntax. For context, here are some workarounds employed by others: - mstange/samply@89456d4 - alexrudy/tonic@f386954 - jwodder/confab@6f0e2fc Gbp-Pq: Topic prune Gbp-Pq: Name opener-cherry-pick-fix-to-avoid-vendored-dbus.patch --- vendor/opener-0.7.0/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/opener-0.7.0/Cargo.toml b/vendor/opener-0.7.0/Cargo.toml index 6915256873..46739db600 100644 --- a/vendor/opener-0.7.0/Cargo.toml +++ b/vendor/opener-0.7.0/Cargo.toml @@ -34,7 +34,7 @@ rustdoc-args = [ ] [features] -dbus-vendored = ["dbus/vendored"] +dbus-vendored = ["dbus?/vendored"] default = ["dbus-vendored"] reveal = [ "dep:url", -- 2.30.2