tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1From b2ae30bab412472f1d2ff90439134a8a465fdf9a Mon Sep 17 00:00:00 2001
2From: Kenny Levinsen <kl@kl.wtf>
3Date: Mon, 2 May 2022 11:21:47 +0200
4Subject: [PATCH 2/2] Update fontconfig
5
6---
7 Cargo.lock | 38 +++++++++++++++++++++++++++++---------
8 Cargo.toml | 2 +-
9 2 files changed, 30 insertions(+), 10 deletions(-)
10
11diff --git a/Cargo.lock b/Cargo.lock
12index 1ad4a86..6821181 100644
13--- a/Cargo.lock
14+++ b/Cargo.lock
15@@ -137,7 +137,16 @@ version = "0.4.2"
16 source = "registry+https://github.com/rust-lang/crates.io-index"
17 checksum = "b11f15d1e3268f140f68d390637d5e76d849782d971ae7063e0da69fe9709a76"
18 dependencies = [
19- "libloading",
20+ "libloading 0.6.7",
21+]
22+
23+[[package]]
24+name = "dlib"
25+version = "0.5.0"
26+source = "registry+https://github.com/rust-lang/crates.io-index"
27+checksum = "ac1b7517328c04c2aa68422fc60a41b92208182142ed04a25879c26c8f878794"
28+dependencies = [
29+ "libloading 0.7.3",
30 ]
31
32 [[package]]
33@@ -166,9 +175,9 @@ checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
34
35 [[package]]
36 name = "fontconfig"
37-version = "0.2.0"
38+version = "0.5.0"
39 source = "registry+https://github.com/rust-lang/crates.io-index"
40-checksum = "a5570e7ce35ffb621b31934530c4b3b8ce9fdd8bf8436e98f9c7ebadff2ef259"
41+checksum = "a25320ad784a9578ada0b395dd7dcd2321109404bbb341ec27e64b01a1e49b47"
42 dependencies = [
43 "yeslogic-fontconfig-sys",
44 ]
45@@ -237,6 +246,16 @@ dependencies = [
46 "winapi",
47 ]
48
49+[[package]]
50+name = "libloading"
51+version = "0.7.3"
52+source = "registry+https://github.com/rust-lang/crates.io-index"
53+checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd"
54+dependencies = [
55+ "cfg-if 1.0.0",
56+ "winapi",
57+]
58+
59 [[package]]
60 name = "libpulse-binding"
61 version = "2.23.0"
62@@ -398,9 +417,9 @@ dependencies = [
63
64 [[package]]
65 name = "once_cell"
66-version = "1.5.2"
67+version = "1.10.0"
68 source = "registry+https://github.com/rust-lang/crates.io-index"
69-checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0"
70+checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9"
71
72 [[package]]
73 name = "opaque-debug"
74@@ -803,7 +822,7 @@ dependencies = [
75 "byteorder",
76 "chrono",
77 "dbus",
78- "dlib",
79+ "dlib 0.4.2",
80 "fontconfig",
81 "fuzzy-matcher",
82 "itertools",
83@@ -843,11 +862,12 @@ dependencies = [
84
85 [[package]]
86 name = "yeslogic-fontconfig-sys"
87-version = "2.11.1"
88+version = "3.0.1"
89 source = "registry+https://github.com/rust-lang/crates.io-index"
90-checksum = "e194a0c5cd1b5c87215eed9d26aca9799fa1b599fe2e178977d6f8ccc812e3d3"
91+checksum = "cb3f5a91c31bef6650d3a1b69192b4217fd88e4cfedc8101813e4dc3394ecbb8"
92 dependencies = [
93 "const-cstr",
94- "libc",
95+ "dlib 0.5.0",
96+ "once_cell",
97 "pkg-config",
98 ]
99diff --git a/Cargo.toml b/Cargo.toml
100index abb3807..691daa7 100644
101--- a/Cargo.toml
102+++ b/Cargo.toml
103@@ -46,5 +46,5 @@ serde_yaml = { version = "0.8", optional = true }
104
105 libpulse-binding = { version = "2.22", optional = true }
106 alsa = { version = "0.4.0", optional = true }
107-fontconfig = "0.2.0"
108+fontconfig = "0.5.0"
109 unicode-segmentation = "1.6.0"
110--
1112.44.0
112