~exprez135/castor

95ad0b687433d6b8f49bd6413b7289c07ef1a5e4 — Julien Blanchard 1 year, 5 months ago aa1c169 0.8.14
Use official rust-openssl stuff
4 files changed, 52 insertions(+), 28 deletions(-)

M Cargo.lock
M Cargo.toml
M README.md
M src/settings.rs
M Cargo.lock => Cargo.lock +40 -23
@@ 112,7 112,7 @@ dependencies = [

[[package]]
name = "castor"
version = "0.8.13"
version = "0.8.14"
dependencies = [
 "ansi-parser",
 "dirs",


@@ 126,7 126,6 @@ dependencies = [
 "native-tls",
 "open",
 "openssl",
 "openssl-sys",
 "pango",
 "pango-sys",
 "percent-encoding",


@@ 134,6 133,7 @@ dependencies = [
 "serde",
 "serde_derive",
 "tempfile",
 "textwrap",
 "toml",
 "url",
]


@@ 195,11 195,10 @@ dependencies = [

[[package]]
name = "dirs-sys"
version = "0.3.4"
version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b"
checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a"
dependencies = [
 "cfg-if",
 "libc",
 "redox_users",
 "winapi",


@@ 526,7 525,8 @@ checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
[[package]]
name = "native-tls"
version = "0.2.4"
source = "git+https://github.com/julienXX/rust-native-tls#6496921fe0135e82d4fa9cff53d34847b2c80275"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b0d88c06fe90d5ee94048ba40409ef1d9315d86f6f38c2efdaad4fb50c58b2d"
dependencies = [
 "lazy_static",
 "libc",


@@ 568,7 568,8 @@ dependencies = [
[[package]]
name = "openssl"
version = "0.10.29"
source = "git+https://github.com/julienXX/rust-openssl#c2e14a7de3abd515aed51d48fa9965636888ad70"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cee6d85f4cb4c4f59a6a85d5b68a233d280c82e29e822913b9c8b129fbf20bdd"
dependencies = [
 "bitflags",
 "cfg-if",


@@ 586,8 587,9 @@ checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"

[[package]]
name = "openssl-sys"
version = "0.9.56"
source = "git+https://github.com/julienXX/rust-openssl#c2e14a7de3abd515aed51d48fa9965636888ad70"
version = "0.9.58"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de"
dependencies = [
 "autocfg",
 "cc",


@@ 631,18 633,18 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"

[[package]]
name = "pin-project"
version = "0.4.17"
version = "0.4.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "edc93aeee735e60ecb40cf740eb319ff23eab1c5748abfdb5c180e4ce49f7791"
checksum = "e75373ff9037d112bb19bc61333a06a159eaeb217660dcfbea7d88e1db823919"
dependencies = [
 "pin-project-internal",
]

[[package]]
name = "pin-project-internal"
version = "0.4.17"
version = "0.4.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e58db2081ba5b4c93bd6be09c40fd36cb9193a8336c384f3b40012e531aa7e40"
checksum = "10b4b44893d3c370407a1d6a5cfde7c41ae0478e31c516c85f67eb3adc51be6d"
dependencies = [
 "proc-macro2",
 "quote",


@@ 675,24 677,24 @@ checksum = "7e0456befd48169b9f13ef0f0ad46d492cf9d2dbb918bcf38e01eed4ce3ec5e4"

[[package]]
name = "proc-macro-nested"
version = "0.1.4"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e946095f9d3ed29ec38de908c22f95d9ac008e424c7bcae54c75a79c527c694"
checksum = "0afe1bd463b9e9ed51d0e0f0b50b6b146aec855c56fd182bb242388710a9b6de"

[[package]]
name = "proc-macro2"
version = "1.0.17"
version = "1.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1502d12e458c49a4c9cbff560d0fe0060c252bc29799ed94ca2ed4bb665a0101"
checksum = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa"
dependencies = [
 "unicode-xid",
]

[[package]]
name = "quote"
version = "1.0.6"
version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "54a21852a652ad6f610c9510194f398ff6f8692e334fd1145fed931f7fbe44ea"
checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
dependencies = [
 "proc-macro2",
]


@@ 858,9 860,9 @@ checksum = "c7cb5678e1615754284ec264d9bb5b4c27d2018577fd90ac0ceb578591ed5ee4"

[[package]]
name = "syn"
version = "1.0.29"
version = "1.0.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb37da98a55b1d08529362d9cbb863be17556873df2585904ab9d2bc951291d0"
checksum = "93a56fabc59dce20fe48b6c832cc249c713e7ed88fa28b0ee0a3bfcaae5fe4e2"
dependencies = [
 "proc-macro2",
 "quote",


@@ 882,6 884,15 @@ dependencies = [
]

[[package]]
name = "textwrap"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
dependencies = [
 "unicode-width",
]

[[package]]
name = "thread_local"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"


@@ 918,6 929,12 @@ dependencies = [
]

[[package]]
name = "unicode-width"
version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479"

[[package]]
name = "unicode-xid"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"


@@ 936,9 953,9 @@ dependencies = [

[[package]]
name = "vcpkg"
version = "0.2.8"
version = "0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168"
checksum = "55d1e41d56121e07f1e223db0a4def204e45c85425f6a16d462fd07c8d10d74c"

[[package]]
name = "version_check"

M Cargo.toml => Cargo.toml +4 -4
@@ 1,6 1,6 @@
[package]
name = "castor"
version = "0.8.13"
version = "0.8.14"
authors = ["Julien Blanchard <julien@typed-hole.org>"]
edition = "2018"



@@ 16,9 16,8 @@ pango = "*"
pango-sys = "*"
open = "*"
regex = "*"
native-tls = { git = "https://github.com/julienXX/rust-native-tls", branch="master" }
openssl = { git = "https://github.com/julienXX/rust-openssl", branch="master" }
openssl-sys = { git = "https://github.com/julienXX/rust-openssl", branch="master" }
native-tls = "*"
openssl = "*"
url = "*"
tempfile = "*"
dirs = "*"


@@ 28,6 27,7 @@ percent-encoding="*"
toml="*"
serde="*"
serde_derive="*"
textwrap="*"

[dependencies.gtk]
version = "0.8.0"

M README.md => README.md +7 -0
@@ 77,6 77,9 @@ h3 = "green"
list = "#C71585"
text = "#FF1493"
background = "#FFC0CB"
[colors.quote]
    foreground="#e4e4e4"
    background="grey"

[characters]
h1 = ">"


@@ 106,6 109,10 @@ list = "🌼 "
    family = "sans"
    size = 11
    style = "oblique"
[fonts.gemini.quote]
    family = "sans"
    size = 10
    style = "italic"
[fonts.gopher]
    family = "monospace"
    size = 11

M src/settings.rs => src/settings.rs +1 -1
@@ 374,7 374,7 @@ pub fn get_gemini_quote_foreground_color() -> String {

pub fn get_gemini_quote_background_color() -> String {
    match quote_color() {
        Some(color) => match color.foreground {
        Some(color) => match color.background {
            Some(color) => color,
            None => String::from("grey"),
        },