From 67d2e4adb75c83925dd890a567f79cb9f2905c8f Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Thu, 16 Nov 2023 08:12:14 -0700 Subject: [PATCH] Use master branch of libcosmic --- Cargo.lock | 32 ++++++++++++++++---------------- Cargo.toml | 1 - 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 66b340e..99f9029 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -834,7 +834,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic?branch=menu#3d5782eb772b801c179d1b0bf7c869167641ce59" +source = "git+https://github.com/pop-os/libcosmic#7ea8a6103b923bee3b06771fb7ae0b6635d623ea" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -848,7 +848,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic?branch=menu#3d5782eb772b801c179d1b0bf7c869167641ce59" +source = "git+https://github.com/pop-os/libcosmic#7ea8a6103b923bee3b06771fb7ae0b6635d623ea" dependencies = [ "quote", "syn 1.0.109", @@ -920,7 +920,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic?branch=menu#3d5782eb772b801c179d1b0bf7c869167641ce59" +source = "git+https://github.com/pop-os/libcosmic#7ea8a6103b923bee3b06771fb7ae0b6635d623ea" dependencies = [ "almost", "cosmic-config", @@ -2165,7 +2165,7 @@ dependencies = [ [[package]] name = "iced" version = "0.10.0" -source = "git+https://github.com/pop-os/libcosmic?branch=menu#3d5782eb772b801c179d1b0bf7c869167641ce59" +source = "git+https://github.com/pop-os/libcosmic#7ea8a6103b923bee3b06771fb7ae0b6635d623ea" dependencies = [ "iced_accessibility", "iced_core", @@ -2180,7 +2180,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic?branch=menu#3d5782eb772b801c179d1b0bf7c869167641ce59" +source = "git+https://github.com/pop-os/libcosmic#7ea8a6103b923bee3b06771fb7ae0b6635d623ea" dependencies = [ "accesskit", "accesskit_winit", @@ -2189,7 +2189,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.10.0" -source = "git+https://github.com/pop-os/libcosmic?branch=menu#3d5782eb772b801c179d1b0bf7c869167641ce59" +source = "git+https://github.com/pop-os/libcosmic#7ea8a6103b923bee3b06771fb7ae0b6635d623ea" dependencies = [ "bitflags 1.3.2", "instant", @@ -2203,7 +2203,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.7.0" -source = "git+https://github.com/pop-os/libcosmic?branch=menu#3d5782eb772b801c179d1b0bf7c869167641ce59" +source = "git+https://github.com/pop-os/libcosmic#7ea8a6103b923bee3b06771fb7ae0b6635d623ea" dependencies = [ "futures", "iced_core", @@ -2215,7 +2215,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.9.0" -source = "git+https://github.com/pop-os/libcosmic?branch=menu#3d5782eb772b801c179d1b0bf7c869167641ce59" +source = "git+https://github.com/pop-os/libcosmic#7ea8a6103b923bee3b06771fb7ae0b6635d623ea" dependencies = [ "bitflags 1.3.2", "bytemuck", @@ -2233,7 +2233,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic?branch=menu#3d5782eb772b801c179d1b0bf7c869167641ce59" +source = "git+https://github.com/pop-os/libcosmic#7ea8a6103b923bee3b06771fb7ae0b6635d623ea" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2246,7 +2246,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.1.1" -source = "git+https://github.com/pop-os/libcosmic?branch=menu#3d5782eb772b801c179d1b0bf7c869167641ce59" +source = "git+https://github.com/pop-os/libcosmic#7ea8a6103b923bee3b06771fb7ae0b6635d623ea" dependencies = [ "iced_core", "iced_futures", @@ -2256,7 +2256,7 @@ dependencies = [ [[package]] name = "iced_style" version = "0.9.0" -source = "git+https://github.com/pop-os/libcosmic?branch=menu#3d5782eb772b801c179d1b0bf7c869167641ce59" +source = "git+https://github.com/pop-os/libcosmic#7ea8a6103b923bee3b06771fb7ae0b6635d623ea" dependencies = [ "iced_core", "once_cell", @@ -2266,7 +2266,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic?branch=menu#3d5782eb772b801c179d1b0bf7c869167641ce59" +source = "git+https://github.com/pop-os/libcosmic#7ea8a6103b923bee3b06771fb7ae0b6635d623ea" dependencies = [ "bytemuck", "cosmic-text 0.9.0", @@ -2284,7 +2284,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.11.1" -source = "git+https://github.com/pop-os/libcosmic?branch=menu#3d5782eb772b801c179d1b0bf7c869167641ce59" +source = "git+https://github.com/pop-os/libcosmic#7ea8a6103b923bee3b06771fb7ae0b6635d623ea" dependencies = [ "bitflags 1.3.2", "bytemuck", @@ -2306,7 +2306,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.1.3" -source = "git+https://github.com/pop-os/libcosmic?branch=menu#3d5782eb772b801c179d1b0bf7c869167641ce59" +source = "git+https://github.com/pop-os/libcosmic#7ea8a6103b923bee3b06771fb7ae0b6635d623ea" dependencies = [ "iced_renderer", "iced_runtime", @@ -2320,7 +2320,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.10.0" -source = "git+https://github.com/pop-os/libcosmic?branch=menu#3d5782eb772b801c179d1b0bf7c869167641ce59" +source = "git+https://github.com/pop-os/libcosmic#7ea8a6103b923bee3b06771fb7ae0b6635d623ea" dependencies = [ "iced_graphics", "iced_runtime", @@ -2577,7 +2577,7 @@ checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic?branch=menu#3d5782eb772b801c179d1b0bf7c869167641ce59" +source = "git+https://github.com/pop-os/libcosmic#7ea8a6103b923bee3b06771fb7ae0b6635d623ea" dependencies = [ "apply", "cosmic-config", diff --git a/Cargo.toml b/Cargo.toml index e5a16d4..4960e3b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,7 +28,6 @@ features = ["syntect", "vi"] [dependencies.libcosmic] git = "https://github.com/pop-os/libcosmic" -branch = "menu" default-features = false features = ["winit", "wgpu"] #path = "../libcosmic"