Browse Source

Use official rust-openssl stuff

tags/0.8.14^0
Julien Blanchard 11 months ago
parent
commit
95ad0b6874
4 changed files with 52 additions and 28 deletions
  1. 40
    23
      Cargo.lock
  2. 4
    4
      Cargo.toml
  3. 7
    0
      README.md
  4. 1
    1
      src/settings.rs

+ 40
- 23
Cargo.lock View File

@@ -112,7 +112,7 @@ dependencies = [
112 112
 
113 113
 [[package]]
114 114
 name = "castor"
115
-version = "0.8.13"
115
+version = "0.8.14"
116 116
 dependencies = [
117 117
  "ansi-parser",
118 118
  "dirs",
@@ -126,7 +126,6 @@ dependencies = [
126 126
  "native-tls",
127 127
  "open",
128 128
  "openssl",
129
- "openssl-sys",
130 129
  "pango",
131 130
  "pango-sys",
132 131
  "percent-encoding",
@@ -134,6 +133,7 @@ dependencies = [
134 133
  "serde",
135 134
  "serde_derive",
136 135
  "tempfile",
136
+ "textwrap",
137 137
  "toml",
138 138
  "url",
139 139
 ]
@@ -195,11 +195,10 @@ dependencies = [
195 195
 
196 196
 [[package]]
197 197
 name = "dirs-sys"
198
-version = "0.3.4"
198
+version = "0.3.5"
199 199
 source = "registry+https://github.com/rust-lang/crates.io-index"
200
-checksum = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b"
200
+checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a"
201 201
 dependencies = [
202
- "cfg-if",
203 202
  "libc",
204 203
  "redox_users",
205 204
  "winapi",
@@ -526,7 +525,8 @@ checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
526 525
 [[package]]
527 526
 name = "native-tls"
528 527
 version = "0.2.4"
529
-source = "git+https://github.com/julienXX/rust-native-tls#6496921fe0135e82d4fa9cff53d34847b2c80275"
528
+source = "registry+https://github.com/rust-lang/crates.io-index"
529
+checksum = "2b0d88c06fe90d5ee94048ba40409ef1d9315d86f6f38c2efdaad4fb50c58b2d"
530 530
 dependencies = [
531 531
  "lazy_static",
532 532
  "libc",
@@ -568,7 +568,8 @@ dependencies = [
568 568
 [[package]]
569 569
 name = "openssl"
570 570
 version = "0.10.29"
571
-source = "git+https://github.com/julienXX/rust-openssl#c2e14a7de3abd515aed51d48fa9965636888ad70"
571
+source = "registry+https://github.com/rust-lang/crates.io-index"
572
+checksum = "cee6d85f4cb4c4f59a6a85d5b68a233d280c82e29e822913b9c8b129fbf20bdd"
572 573
 dependencies = [
573 574
  "bitflags",
574 575
  "cfg-if",
@@ -586,8 +587,9 @@ checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
586 587
 
587 588
 [[package]]
588 589
 name = "openssl-sys"
589
-version = "0.9.56"
590
-source = "git+https://github.com/julienXX/rust-openssl#c2e14a7de3abd515aed51d48fa9965636888ad70"
590
+version = "0.9.58"
591
+source = "registry+https://github.com/rust-lang/crates.io-index"
592
+checksum = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de"
591 593
 dependencies = [
592 594
  "autocfg",
593 595
  "cc",
@@ -631,18 +633,18 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
631 633
 
632 634
 [[package]]
633 635
 name = "pin-project"
634
-version = "0.4.17"
636
+version = "0.4.20"
635 637
 source = "registry+https://github.com/rust-lang/crates.io-index"
636
-checksum = "edc93aeee735e60ecb40cf740eb319ff23eab1c5748abfdb5c180e4ce49f7791"
638
+checksum = "e75373ff9037d112bb19bc61333a06a159eaeb217660dcfbea7d88e1db823919"
637 639
 dependencies = [
638 640
  "pin-project-internal",
639 641
 ]
640 642
 
641 643
 [[package]]
642 644
 name = "pin-project-internal"
643
-version = "0.4.17"
645
+version = "0.4.20"
644 646
 source = "registry+https://github.com/rust-lang/crates.io-index"
645
-checksum = "e58db2081ba5b4c93bd6be09c40fd36cb9193a8336c384f3b40012e531aa7e40"
647
+checksum = "10b4b44893d3c370407a1d6a5cfde7c41ae0478e31c516c85f67eb3adc51be6d"
646 648
 dependencies = [
647 649
  "proc-macro2",
648 650
  "quote",
@@ -675,24 +677,24 @@ checksum = "7e0456befd48169b9f13ef0f0ad46d492cf9d2dbb918bcf38e01eed4ce3ec5e4"
675 677
 
676 678
 [[package]]
677 679
 name = "proc-macro-nested"
678
-version = "0.1.4"
680
+version = "0.1.5"
679 681
 source = "registry+https://github.com/rust-lang/crates.io-index"
680
-checksum = "8e946095f9d3ed29ec38de908c22f95d9ac008e424c7bcae54c75a79c527c694"
682
+checksum = "0afe1bd463b9e9ed51d0e0f0b50b6b146aec855c56fd182bb242388710a9b6de"
681 683
 
682 684
 [[package]]
683 685
 name = "proc-macro2"
684
-version = "1.0.17"
686
+version = "1.0.18"
685 687
 source = "registry+https://github.com/rust-lang/crates.io-index"
686
-checksum = "1502d12e458c49a4c9cbff560d0fe0060c252bc29799ed94ca2ed4bb665a0101"
688
+checksum = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa"
687 689
 dependencies = [
688 690
  "unicode-xid",
689 691
 ]
690 692
 
691 693
 [[package]]
692 694
 name = "quote"
693
-version = "1.0.6"
695
+version = "1.0.7"
694 696
 source = "registry+https://github.com/rust-lang/crates.io-index"
695
-checksum = "54a21852a652ad6f610c9510194f398ff6f8692e334fd1145fed931f7fbe44ea"
697
+checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
696 698
 dependencies = [
697 699
  "proc-macro2",
698 700
 ]
@@ -858,9 +860,9 @@ checksum = "c7cb5678e1615754284ec264d9bb5b4c27d2018577fd90ac0ceb578591ed5ee4"
858 860
 
859 861
 [[package]]
860 862
 name = "syn"
861
-version = "1.0.29"
863
+version = "1.0.30"
862 864
 source = "registry+https://github.com/rust-lang/crates.io-index"
863
-checksum = "bb37da98a55b1d08529362d9cbb863be17556873df2585904ab9d2bc951291d0"
865
+checksum = "93a56fabc59dce20fe48b6c832cc249c713e7ed88fa28b0ee0a3bfcaae5fe4e2"
864 866
 dependencies = [
865 867
  "proc-macro2",
866 868
  "quote",
@@ -882,6 +884,15 @@ dependencies = [
882 884
 ]
883 885
 
884 886
 [[package]]
887
+name = "textwrap"
888
+version = "0.11.0"
889
+source = "registry+https://github.com/rust-lang/crates.io-index"
890
+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
891
+dependencies = [
892
+ "unicode-width",
893
+]
894
+
895
+[[package]]
885 896
 name = "thread_local"
886 897
 version = "1.0.1"
887 898
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -918,6 +929,12 @@ dependencies = [
918 929
 ]
919 930
 
920 931
 [[package]]
932
+name = "unicode-width"
933
+version = "0.1.7"
934
+source = "registry+https://github.com/rust-lang/crates.io-index"
935
+checksum = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479"
936
+
937
+[[package]]
921 938
 name = "unicode-xid"
922 939
 version = "0.2.0"
923 940
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -936,9 +953,9 @@ dependencies = [
936 953
 
937 954
 [[package]]
938 955
 name = "vcpkg"
939
-version = "0.2.8"
956
+version = "0.2.9"
940 957
 source = "registry+https://github.com/rust-lang/crates.io-index"
941
-checksum = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168"
958
+checksum = "55d1e41d56121e07f1e223db0a4def204e45c85425f6a16d462fd07c8d10d74c"
942 959
 
943 960
 [[package]]
944 961
 name = "version_check"

+ 4
- 4
Cargo.toml View File

@@ -1,6 +1,6 @@
1 1
 [package]
2 2
 name = "castor"
3
-version = "0.8.13"
3
+version = "0.8.14"
4 4
 authors = ["Julien Blanchard <julien@typed-hole.org>"]
5 5
 edition = "2018"
6 6
 
@@ -16,9 +16,8 @@ pango = "*"
16 16
 pango-sys = "*"
17 17
 open = "*"
18 18
 regex = "*"
19
-native-tls = { git = "https://github.com/julienXX/rust-native-tls", branch="master" }
20
-openssl = { git = "https://github.com/julienXX/rust-openssl", branch="master" }
21
-openssl-sys = { git = "https://github.com/julienXX/rust-openssl", branch="master" }
19
+native-tls = "*"
20
+openssl = "*"
22 21
 url = "*"
23 22
 tempfile = "*"
24 23
 dirs = "*"
@@ -28,6 +27,7 @@ percent-encoding="*"
28 27
 toml="*"
29 28
 serde="*"
30 29
 serde_derive="*"
30
+textwrap="*"
31 31
 
32 32
 [dependencies.gtk]
33 33
 version = "0.8.0"

+ 7
- 0
README.md View File

@@ -77,6 +77,9 @@ h3 = "green"
77 77
 list = "#C71585"
78 78
 text = "#FF1493"
79 79
 background = "#FFC0CB"
80
+[colors.quote]
81
+    foreground="#e4e4e4"
82
+    background="grey"
80 83
 
81 84
 [characters]
82 85
 h1 = ">"
@@ -106,6 +109,10 @@ list = "🌼 "
106 109
     family = "sans"
107 110
     size = 11
108 111
     style = "oblique"
112
+[fonts.gemini.quote]
113
+    family = "sans"
114
+    size = 10
115
+    style = "italic"
109 116
 [fonts.gopher]
110 117
     family = "monospace"
111 118
     size = 11

+ 1
- 1
src/settings.rs View File

@@ -374,7 +374,7 @@ pub fn get_gemini_quote_foreground_color() -> String {
374 374
 
375 375
 pub fn get_gemini_quote_background_color() -> String {
376 376
     match quote_color() {
377
-        Some(color) => match color.foreground {
377
+        Some(color) => match color.background {
378 378
             Some(color) => color,
379 379
             None => String::from("grey"),
380 380
         },

Loading…
Cancel
Save