1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
|
Description: use system-shared libraries
Author: Jonas Smedegaard <dr@jones.dk>
Forwarded: not-needed
Last-Update: 2023-09-09
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/meli/Cargo.toml
+++ b/meli/Cargo.toml
@@ -32,7 +32,6 @@
indexmap = { version = "^2.3", default-features = false, features = ["serde", "std"] }
itoa = { version = "1.0.11", default-features = false }
libc = { version = "0.2.125", default-features = false, features = ["extra_traits"] }
-libz-sys = { version = "1.1", features = ["static"], optional = true }
linkify = { version = ">= 0.9.0, <= 0.10", default-features = false }
melib = { path = "../melib", version = "0.8.12", features = [] }
nix = { version = "0.29", default-features = false, features = ["signal", "poll", "term", "ioctl", "process"] }
@@ -50,7 +49,7 @@
xdg = { version = "2.1.0" }
[features]
-default = ["sqlite3", "notmuch", "smtp", "dbus-notifications", "gpgme", "cli-docs", "jmap", "static"]
+default = ["sqlite3", "notmuch", "smtp", "dbus-notifications", "gpgme", "cli-docs", "jmap"]
notmuch = ["melib/notmuch"]
jmap = ["melib/jmap"]
sqlite3 = ["melib/sqlite3"]
@@ -60,13 +59,6 @@
cli-docs = ["dep:flate2"]
# svgscreenshot = ["dep:svg_crate"]
gpgme = ["melib/gpgme"]
-# Static / vendoring features.
-tls-static = ["melib/tls-static"]
-http-static = ["melib/http-static"]
-sqlite3-static = ["melib/sqlite3-static"]
-dbus-static = ["dep:notify-rust", "notify-rust?/d_vendored"]
-libz-static = ["dep:libz-sys", "libz-sys?/static"]
-static = ["tls-static", "http-static", "sqlite3-static", "dbus-static", "libz-static"]
# Print tracing logs as meli runs in stderr
# enable for debug tracing logs: build with --features=debug-tracing and export MELI_DEBUG_STDERR
--- a/melib/Cargo.toml
+++ b/melib/Cargo.toml
@@ -71,10 +71,10 @@
notmuch = ["maildir"]
smtp = ["tls"]
smtp-trace = ["smtp"]
-sqlite3 = ["sqlite3-static"]
-sqlite3-static = ["rusqlite", "rusqlite/bundled-full"]
+sqlite3 = ["rusqlite"]
+sqlite3-static = []
tls = ["native-tls"]
-tls-static = ["tls", "native-tls/vendored"]
+tls-static = []
[build-dependencies]
flate2 = { version = "1.0.16" }
--- a/melib/src/gpgme/mod.rs
+++ b/melib/src/gpgme/mod.rs
@@ -246,7 +246,7 @@
impl Context {
pub fn new() -> Result<Self> {
let lib = Arc::new(
- match unsafe { libloading::Library::new(libloading::library_filename("gpgme")) } {
+ match unsafe { libloading::Library::new("libgpgme.so.11") } {
Ok(v) => v,
Err(err) => {
let source = Error::from(err).set_kind(ErrorKind::LinkedLibrary("gpgme"));
|
