From d313a77f66b2f7f2dba7224f385ec5abc6868247 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Thu, 21 Jul 2022 00:25:42 -0400 Subject: [PATCH] libsqlite3-sys: drop bundled features --- .../patches/drop-bundled-features.patch | 38 +++++++++++++++++++ src/libsqlite3-sys/debian/patches/series | 1 + 2 files changed, 39 insertions(+) create mode 100644 src/libsqlite3-sys/debian/patches/drop-bundled-features.patch create mode 100644 src/libsqlite3-sys/debian/patches/series diff --git a/src/libsqlite3-sys/debian/patches/drop-bundled-features.patch b/src/libsqlite3-sys/debian/patches/drop-bundled-features.patch new file mode 100644 index 000000000..01fd4da8a --- /dev/null +++ b/src/libsqlite3-sys/debian/patches/drop-bundled-features.patch @@ -0,0 +1,38 @@ +Author: Daniel Kahn Gillmor +Description: Debian doesn't ship or encourage bundled/vendored mechanisms + +Furthermore, these additional variants create a huge Provides: line in +debian/control, which itself can cause problems for some tooling. + +It would be preferable to declaratively omit these features, but until +https://bugs.debian.org/1014613 is closed in debcargo, we can just +patch them. + +We also drop in_gecko, since this is not how libsqlite3-sys is built +on debian. + +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -55,22 +55,7 @@ + "pkg-config", + "vcpkg", + ] +-bundled = [ +- "cc", +- "bundled_bindings", +-] +-bundled-sqlcipher = ["bundled"] +-bundled-sqlcipher-vendored-openssl = [ +- "bundled-sqlcipher", +- "openssl-sys/vendored", +-] +-bundled-windows = [ +- "cc", +- "bundled_bindings", +-] +-bundled_bindings = [] + default = ["min_sqlite_version_3_6_8"] +-in_gecko = [] + min_sqlite_version_3_6_23 = [ + "pkg-config", + "vcpkg", diff --git a/src/libsqlite3-sys/debian/patches/series b/src/libsqlite3-sys/debian/patches/series new file mode 100644 index 000000000..6be85de48 --- /dev/null +++ b/src/libsqlite3-sys/debian/patches/series @@ -0,0 +1 @@ +drop-bundled-features.patch -- 2.39.5