Update cosmic-text and libcosmic

This commit is contained in:
Jeremy Soller 2023-12-19 17:09:07 -07:00
parent 83bf38f899
commit 542df32172

162
Cargo.lock generated
View file

@ -992,7 +992,7 @@ dependencies = [
[[package]]
name = "cosmic-config"
version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic#11428723e55dfebad617cedf2636a1a8c804d42c"
source = "git+https://github.com/pop-os/libcosmic#18a5c670656f53aed4b9318b633f925403ba2e02"
dependencies = [
"atomicwrites",
"cosmic-config-derive",
@ -1006,7 +1006,7 @@ dependencies = [
[[package]]
name = "cosmic-config-derive"
version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic#11428723e55dfebad617cedf2636a1a8c804d42c"
source = "git+https://github.com/pop-os/libcosmic#18a5c670656f53aed4b9318b633f925403ba2e02"
dependencies = [
"quote",
"syn 1.0.109",
@ -1016,7 +1016,7 @@ dependencies = [
name = "cosmic-edit"
version = "0.1.0"
dependencies = [
"cosmic-text 0.10.0 (git+https://github.com/pop-os/cosmic-text?branch=refactor)",
"cosmic-text",
"env_logger",
"fork",
"grep",
@ -1040,37 +1040,16 @@ dependencies = [
[[package]]
name = "cosmic-text"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "75acbfb314aeb4f5210d379af45ed1ec2c98c7f1790bf57b8a4c562ac0c51b71"
dependencies = [
"fontdb 0.15.0",
"libm",
"log",
"rangemap",
"rustc-hash",
"rustybuzz 0.11.0",
"self_cell 1.0.2",
"swash",
"sys-locale",
"unicode-bidi",
"unicode-linebreak",
"unicode-script",
"unicode-segmentation",
]
[[package]]
name = "cosmic-text"
version = "0.10.0"
source = "git+https://github.com/pop-os/cosmic-text?branch=refactor#af7b0325198cfde22c1a3e3eef1be898fd04a437"
source = "git+https://github.com/pop-os/cosmic-text?branch=refactor#90bcfcf7d543de502cd0df5236a35c29a7d0d688"
dependencies = [
"cosmic_undo_2",
"fontdb 0.16.0",
"fontdb",
"libm",
"log",
"modit",
"rangemap",
"rustc-hash",
"rustybuzz 0.11.0",
"rustybuzz",
"self_cell 1.0.2",
"swash",
"syntect",
@ -1084,7 +1063,7 @@ dependencies = [
[[package]]
name = "cosmic-theme"
version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic#11428723e55dfebad617cedf2636a1a8c804d42c"
source = "git+https://github.com/pop-os/libcosmic#18a5c670656f53aed4b9318b633f925403ba2e02"
dependencies = [
"almost",
"cosmic-config",
@ -1845,21 +1824,7 @@ version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "674e258f4b5d2dcd63888c01c68413c51f565e8af99d2f7701c7b81d79ef41c4"
dependencies = [
"roxmltree",
]
[[package]]
name = "fontdb"
version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "020e203f177c0fb250fb19455a252e838d2bbbce1f80f25ecc42402aafa8cd38"
dependencies = [
"fontconfig-parser",
"log",
"memmap2 0.8.0",
"slotmap",
"tinyvec",
"ttf-parser 0.19.2",
"roxmltree 0.18.1",
]
[[package]]
@ -2268,9 +2233,9 @@ dependencies = [
[[package]]
name = "glyphon"
version = "0.3.0"
source = "git+https://github.com/grovesNL/glyphon.git?rev=2caa9fc5e5923c1d827d177c3619cab7e9885b85#2caa9fc5e5923c1d827d177c3619cab7e9885b85"
source = "git+https://github.com/jackpot51/glyphon.git?branch=refactor#cd704e6bd5d0ddb815d08358766ad205fd70fada"
dependencies = [
"cosmic-text 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
"cosmic-text",
"etagere",
"lru",
"wgpu",
@ -2623,7 +2588,7 @@ dependencies = [
[[package]]
name = "iced"
version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic#11428723e55dfebad617cedf2636a1a8c804d42c"
source = "git+https://github.com/pop-os/libcosmic#18a5c670656f53aed4b9318b633f925403ba2e02"
dependencies = [
"iced_accessibility",
"iced_core",
@ -2638,7 +2603,7 @@ dependencies = [
[[package]]
name = "iced_accessibility"
version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic#11428723e55dfebad617cedf2636a1a8c804d42c"
source = "git+https://github.com/pop-os/libcosmic#18a5c670656f53aed4b9318b633f925403ba2e02"
dependencies = [
"accesskit",
"accesskit_winit",
@ -2647,7 +2612,7 @@ dependencies = [
[[package]]
name = "iced_core"
version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic#11428723e55dfebad617cedf2636a1a8c804d42c"
source = "git+https://github.com/pop-os/libcosmic#18a5c670656f53aed4b9318b633f925403ba2e02"
dependencies = [
"bitflags 1.3.2",
"instant",
@ -2663,7 +2628,7 @@ dependencies = [
[[package]]
name = "iced_futures"
version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic#11428723e55dfebad617cedf2636a1a8c804d42c"
source = "git+https://github.com/pop-os/libcosmic#18a5c670656f53aed4b9318b633f925403ba2e02"
dependencies = [
"futures",
"iced_core",
@ -2676,11 +2641,11 @@ dependencies = [
[[package]]
name = "iced_graphics"
version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic#11428723e55dfebad617cedf2636a1a8c804d42c"
source = "git+https://github.com/pop-os/libcosmic#18a5c670656f53aed4b9318b633f925403ba2e02"
dependencies = [
"bitflags 1.3.2",
"bytemuck",
"cosmic-text 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
"cosmic-text",
"glam",
"half",
"iced_core",
@ -2699,7 +2664,7 @@ dependencies = [
[[package]]
name = "iced_renderer"
version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic#11428723e55dfebad617cedf2636a1a8c804d42c"
source = "git+https://github.com/pop-os/libcosmic#18a5c670656f53aed4b9318b633f925403ba2e02"
dependencies = [
"iced_graphics",
"iced_tiny_skia",
@ -2712,7 +2677,7 @@ dependencies = [
[[package]]
name = "iced_runtime"
version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic#11428723e55dfebad617cedf2636a1a8c804d42c"
source = "git+https://github.com/pop-os/libcosmic#18a5c670656f53aed4b9318b633f925403ba2e02"
dependencies = [
"iced_core",
"iced_futures",
@ -2722,7 +2687,7 @@ dependencies = [
[[package]]
name = "iced_style"
version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic#11428723e55dfebad617cedf2636a1a8c804d42c"
source = "git+https://github.com/pop-os/libcosmic#18a5c670656f53aed4b9318b633f925403ba2e02"
dependencies = [
"iced_core",
"once_cell",
@ -2732,10 +2697,10 @@ dependencies = [
[[package]]
name = "iced_tiny_skia"
version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic#11428723e55dfebad617cedf2636a1a8c804d42c"
source = "git+https://github.com/pop-os/libcosmic#18a5c670656f53aed4b9318b633f925403ba2e02"
dependencies = [
"bytemuck",
"cosmic-text 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
"cosmic-text",
"iced_graphics",
"kurbo",
"log",
@ -2750,7 +2715,7 @@ dependencies = [
[[package]]
name = "iced_wgpu"
version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic#11428723e55dfebad617cedf2636a1a8c804d42c"
source = "git+https://github.com/pop-os/libcosmic#18a5c670656f53aed4b9318b633f925403ba2e02"
dependencies = [
"bitflags 1.3.2",
"bytemuck",
@ -2770,7 +2735,7 @@ dependencies = [
[[package]]
name = "iced_widget"
version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic#11428723e55dfebad617cedf2636a1a8c804d42c"
source = "git+https://github.com/pop-os/libcosmic#18a5c670656f53aed4b9318b633f925403ba2e02"
dependencies = [
"iced_renderer",
"iced_runtime",
@ -2784,7 +2749,7 @@ dependencies = [
[[package]]
name = "iced_winit"
version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic#11428723e55dfebad617cedf2636a1a8c804d42c"
source = "git+https://github.com/pop-os/libcosmic#18a5c670656f53aed4b9318b633f925403ba2e02"
dependencies = [
"iced_graphics",
"iced_runtime",
@ -3094,7 +3059,7 @@ checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4"
[[package]]
name = "libcosmic"
version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic#11428723e55dfebad617cedf2636a1a8c804d42c"
source = "git+https://github.com/pop-os/libcosmic#18a5c670656f53aed4b9318b633f925403ba2e02"
dependencies = [
"apply",
"ashpd",
@ -3334,15 +3299,6 @@ dependencies = [
"libc",
]
[[package]]
name = "memmap2"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed"
dependencies = [
"libc",
]
[[package]]
name = "memmap2"
version = "0.9.3"
@ -4628,9 +4584,9 @@ checksum = "216080ab382b992234dda86873c18d4c48358f5cfcb70fd693d7f6f2131b628b"
[[package]]
name = "resvg"
version = "0.36.0"
version = "0.37.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cc7980f653f9a7db31acff916a262c3b78c562919263edea29bf41a056e20497"
checksum = "cadccb3d99a9efb8e5e00c16fbb732cbe400db2ec7fc004697ee7d97d86cf1f4"
dependencies = [
"gif 0.12.0",
"jpeg-decoder 0.3.0",
@ -4696,6 +4652,12 @@ dependencies = [
"xmlparser",
]
[[package]]
name = "roxmltree"
version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f"
[[package]]
name = "rust-embed"
version = "6.8.1"
@ -4800,27 +4762,11 @@ dependencies = [
[[package]]
name = "rustybuzz"
version = "0.10.0"
version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "71cd15fef9112a1f94ac64b58d1e4628192631ad6af4dc69997f995459c874e7"
checksum = "f0ae5692c5beaad6a9e22830deeed7874eae8a4e3ba4076fb48e12c56856222c"
dependencies = [
"bitflags 1.3.2",
"bytemuck",
"smallvec",
"ttf-parser 0.19.2",
"unicode-bidi-mirroring",
"unicode-ccc",
"unicode-properties",
"unicode-script",
]
[[package]]
name = "rustybuzz"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2ee8fe2a8461a0854a37101fe7a1b13998d0cfa987e43248e81d2a5f4570f6fa"
dependencies = [
"bitflags 1.3.2",
"bitflags 2.4.1",
"bytemuck",
"libm",
"smallvec",
@ -4956,9 +4902,9 @@ dependencies = [
[[package]]
name = "serde_spanned"
version = "0.6.4"
version = "0.6.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80"
checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
dependencies = [
"serde",
]
@ -5196,9 +5142,9 @@ checksum = "8fb1df15f412ee2e9dfc1c504260fa695c1c3f10fe9f4a6ee2d2184d7d6450e2"
[[package]]
name = "svgtypes"
version = "0.12.0"
version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d71499ff2d42f59d26edb21369a308ede691421f79ebc0f001e2b1fd3a7c9e52"
checksum = "6e44e288cd960318917cbd540340968b90becc8bc81f171345d706e7a89d9d70"
dependencies = [
"kurbo",
"siphasher",
@ -5600,12 +5546,6 @@ version = "0.15.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b3e06c9b9d80ed6b745c7159c40b311ad2916abb34a49e9be2653b90db0d8dd"
[[package]]
name = "ttf-parser"
version = "0.19.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49d64318d8311fc2668e48b63969f4343e0a85c4a109aa8460d6672e364b8bd1"
[[package]]
name = "ttf-parser"
version = "0.20.0"
@ -5766,9 +5706,9 @@ dependencies = [
[[package]]
name = "usvg"
version = "0.36.0"
version = "0.37.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c51daa774fe9ee5efcf7b4fec13019b8119cda764d9a8b5b06df02bb1445c656"
checksum = "38b0a51b72ab80ca511d126b77feeeb4fb1e972764653e61feac30adc161a756"
dependencies = [
"base64",
"log",
@ -5781,16 +5721,16 @@ dependencies = [
[[package]]
name = "usvg-parser"
version = "0.36.0"
version = "0.37.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "45c88a5ffaa338f0e978ecf3d4e00d8f9f493e29bed0752e1a808a1db16afc40"
checksum = "9bd4e3c291f45d152929a31f0f6c819245e2921bfd01e7bd91201a9af39a2bdc"
dependencies = [
"data-url",
"flate2",
"imagesize",
"kurbo",
"log",
"roxmltree",
"roxmltree 0.19.0",
"simplecss",
"siphasher",
"svgtypes",
@ -5799,14 +5739,14 @@ dependencies = [
[[package]]
name = "usvg-text-layout"
version = "0.36.0"
version = "0.37.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4d2374378cb7a3fb8f33894e0fdb8625e1bbc4f25312db8d91f862130b541593"
checksum = "d383a3965de199d7f96d4e11a44dd859f46e86de7f3dca9a39bf82605da0a37c"
dependencies = [
"fontdb 0.15.0",
"fontdb",
"kurbo",
"log",
"rustybuzz 0.10.0",
"rustybuzz",
"unicode-bidi",
"unicode-script",
"unicode-vo",
@ -5815,9 +5755,9 @@ dependencies = [
[[package]]
name = "usvg-tree"
version = "0.36.0"
version = "0.37.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6cacb0c5edeaf3e80e5afcf5b0d4004cc1d36318befc9a7c6606507e5d0f4062"
checksum = "8ee3d202ebdb97a6215604b8f5b4d6ef9024efd623cf2e373a6416ba976ec7d3"
dependencies = [
"rctree",
"strict-num",