diff --git a/Cargo.lock b/Cargo.lock index f4126b6..3fd291e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1086,7 +1086,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#045dca649a6d5f820670c1d0423c35c7e89e7ee6" +source = "git+https://github.com/pop-os/libcosmic#356500a95af340a16e4baa4ec0e11f42a73a3b20" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -1103,7 +1103,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#045dca649a6d5f820670c1d0423c35c7e89e7ee6" +source = "git+https://github.com/pop-os/libcosmic#356500a95af340a16e4baa4ec0e11f42a73a3b20" dependencies = [ "quote", "syn 1.0.109", @@ -1114,7 +1114,7 @@ name = "cosmic-edit" version = "0.1.0" dependencies = [ "cosmic-syntax-theme", - "cosmic-text 0.10.0 (git+https://github.com/pop-os/cosmic-text)", + "cosmic-text", "env_logger", "fork", "grep", @@ -1149,29 +1149,7 @@ dependencies = [ [[package]] name = "cosmic-text" version = "0.10.0" -source = "git+https://github.com/pop-os/cosmic-text.git?rev=1b025ae#1b025ae56e0122cff5798b9f54fc56d47a182d2b" -dependencies = [ - "bitflags 2.4.2", - "fontdb", - "libm", - "log", - "rangemap", - "rustc-hash", - "rustybuzz", - "self_cell 1.0.3", - "swash", - "sys-locale", - "ttf-parser 0.20.0", - "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#cc75bb66b40794702ebc9fc9e30b1b29d7438bb5" +source = "git+https://github.com/pop-os/cosmic-text#be471833c9ee563866f07593354a41dd40761a18" dependencies = [ "bitflags 2.4.2", "cosmic_undo_2", @@ -1196,7 +1174,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#045dca649a6d5f820670c1d0423c35c7e89e7ee6" +source = "git+https://github.com/pop-os/libcosmic#356500a95af340a16e4baa4ec0e11f42a73a3b20" dependencies = [ "almost", "cosmic-config", @@ -1349,7 +1327,7 @@ checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" [[package]] name = "d3d12" version = "0.19.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=faed98b#faed98b45cdc105df78b110e3fd6ca3eef36efc7" +source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" dependencies = [ "bitflags 2.4.2", "libloading 0.8.1", @@ -2328,9 +2306,9 @@ dependencies = [ [[package]] name = "glyphon" version = "0.5.0" -source = "git+https://github.com/wash2/glyphon.git?tag=cosmic-0.5#b6d630e2151cddaa41cb0b10133c5bc3ee9dacc6" +source = "git+https://github.com/pop-os/glyphon.git?tag=v0.5.0#1b0646ff8f74da92d3be704dfc2257d7f4d7eed8" dependencies = [ - "cosmic-text 0.10.0 (git+https://github.com/pop-os/cosmic-text.git?rev=1b025ae)", + "cosmic-text", "etagere", "lru", "wgpu", @@ -2687,7 +2665,7 @@ dependencies = [ [[package]] name = "iced" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#045dca649a6d5f820670c1d0423c35c7e89e7ee6" +source = "git+https://github.com/pop-os/libcosmic#356500a95af340a16e4baa4ec0e11f42a73a3b20" dependencies = [ "iced_accessibility", "iced_core", @@ -2702,7 +2680,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#045dca649a6d5f820670c1d0423c35c7e89e7ee6" +source = "git+https://github.com/pop-os/libcosmic#356500a95af340a16e4baa4ec0e11f42a73a3b20" dependencies = [ "accesskit", "accesskit_winit", @@ -2711,7 +2689,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#045dca649a6d5f820670c1d0423c35c7e89e7ee6" +source = "git+https://github.com/pop-os/libcosmic#356500a95af340a16e4baa4ec0e11f42a73a3b20" dependencies = [ "bitflags 1.3.2", "log", @@ -2728,7 +2706,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#045dca649a6d5f820670c1d0423c35c7e89e7ee6" +source = "git+https://github.com/pop-os/libcosmic#356500a95af340a16e4baa4ec0e11f42a73a3b20" dependencies = [ "futures", "iced_core", @@ -2741,11 +2719,11 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#045dca649a6d5f820670c1d0423c35c7e89e7ee6" +source = "git+https://github.com/pop-os/libcosmic#356500a95af340a16e4baa4ec0e11f42a73a3b20" dependencies = [ "bitflags 1.3.2", "bytemuck", - "cosmic-text 0.10.0 (git+https://github.com/pop-os/cosmic-text.git?rev=1b025ae)", + "cosmic-text", "glam", "half", "iced_core", @@ -2765,7 +2743,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#045dca649a6d5f820670c1d0423c35c7e89e7ee6" +source = "git+https://github.com/pop-os/libcosmic#356500a95af340a16e4baa4ec0e11f42a73a3b20" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2777,7 +2755,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#045dca649a6d5f820670c1d0423c35c7e89e7ee6" +source = "git+https://github.com/pop-os/libcosmic#356500a95af340a16e4baa4ec0e11f42a73a3b20" dependencies = [ "iced_core", "iced_futures", @@ -2787,7 +2765,7 @@ dependencies = [ [[package]] name = "iced_style" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#045dca649a6d5f820670c1d0423c35c7e89e7ee6" +source = "git+https://github.com/pop-os/libcosmic#356500a95af340a16e4baa4ec0e11f42a73a3b20" dependencies = [ "iced_core", "once_cell", @@ -2797,10 +2775,10 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#045dca649a6d5f820670c1d0423c35c7e89e7ee6" +source = "git+https://github.com/pop-os/libcosmic#356500a95af340a16e4baa4ec0e11f42a73a3b20" dependencies = [ "bytemuck", - "cosmic-text 0.10.0 (git+https://github.com/pop-os/cosmic-text.git?rev=1b025ae)", + "cosmic-text", "iced_graphics", "kurbo", "log", @@ -2814,7 +2792,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#045dca649a6d5f820670c1d0423c35c7e89e7ee6" +source = "git+https://github.com/pop-os/libcosmic#356500a95af340a16e4baa4ec0e11f42a73a3b20" dependencies = [ "bitflags 1.3.2", "bytemuck", @@ -2833,7 +2811,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#045dca649a6d5f820670c1d0423c35c7e89e7ee6" +source = "git+https://github.com/pop-os/libcosmic#356500a95af340a16e4baa4ec0e11f42a73a3b20" dependencies = [ "iced_renderer", "iced_runtime", @@ -2847,7 +2825,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#045dca649a6d5f820670c1d0423c35c7e89e7ee6" +source = "git+https://github.com/pop-os/libcosmic#356500a95af340a16e4baa4ec0e11f42a73a3b20" dependencies = [ "iced_graphics", "iced_runtime", @@ -3198,7 +3176,7 @@ checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#045dca649a6d5f820670c1d0423c35c7e89e7ee6" +source = "git+https://github.com/pop-os/libcosmic#356500a95af340a16e4baa4ec0e11f42a73a3b20" dependencies = [ "apply", "ashpd", @@ -3583,7 +3561,7 @@ checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b" [[package]] name = "naga" version = "0.19.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=faed98b#faed98b45cdc105df78b110e3fd6ca3eef36efc7" +source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" dependencies = [ "arrayvec 0.7.4", "bit-set", @@ -6260,7 +6238,7 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "wgpu" version = "0.19.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=faed98b#faed98b45cdc105df78b110e3fd6ca3eef36efc7" +source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" dependencies = [ "arrayvec 0.7.4", "cfg-if 1.0.0", @@ -6284,7 +6262,7 @@ dependencies = [ [[package]] name = "wgpu-core" version = "0.19.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=faed98b#faed98b45cdc105df78b110e3fd6ca3eef36efc7" +source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" dependencies = [ "arrayvec 0.7.4", "bit-vec", @@ -6309,7 +6287,7 @@ dependencies = [ [[package]] name = "wgpu-hal" version = "0.19.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=faed98b#faed98b45cdc105df78b110e3fd6ca3eef36efc7" +source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" dependencies = [ "android_system_properties", "arrayvec 0.7.4", @@ -6352,7 +6330,7 @@ dependencies = [ [[package]] name = "wgpu-types" version = "0.19.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=faed98b#faed98b45cdc105df78b110e3fd6ca3eef36efc7" +source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" dependencies = [ "bitflags 2.4.2", "js-sys", diff --git a/Cargo.toml b/Cargo.toml index f3442a2..cfca138 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,7 +30,6 @@ git = "https://github.com/pop-os/cosmic-syntax-theme" [dependencies.cosmic-text] git = "https://github.com/pop-os/cosmic-text" features = ["syntect", "vi"] -#path = "../cosmic-text" [dependencies.libcosmic] git = "https://github.com/pop-os/libcosmic" @@ -58,9 +57,6 @@ fork = "0.1" default = ["rfd", "wgpu"] wgpu = ["libcosmic/wgpu"] -[patch.crates-io] -wgpu = { git = "https://github.com/gfx-rs/wgpu", rev = "faed98b" } - [profile.release-with-debug] inherits = "release" debug = true