From e8f0d90572ca309bb8fc505a8ab20e70f91abdaf Mon Sep 17 00:00:00 2001 From: Michael Aaron Murphy Date: Tue, 18 Feb 2025 22:39:53 +0100 Subject: [PATCH] chore: font style changes in libcosmic --- Cargo.lock | 30 +++++++++++++++--------------- Cargo.toml | 8 +++++--- debian/control | 1 + 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5179db9..99c6c41 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1519,7 +1519,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#3f25af87a3a41c53bdbd69878f32766bbcda2194" +source = "git+https://github.com/pop-os/libcosmic#7d84d21129e0b4590fedf20b377da80b6a177b47" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -1541,7 +1541,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#3f25af87a3a41c53bdbd69878f32766bbcda2194" +source = "git+https://github.com/pop-os/libcosmic#7d84d21129e0b4590fedf20b377da80b6a177b47" dependencies = [ "quote", "syn 1.0.109", @@ -1843,7 +1843,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#3f25af87a3a41c53bdbd69878f32766bbcda2194" +source = "git+https://github.com/pop-os/libcosmic#7d84d21129e0b4590fedf20b377da80b6a177b47" dependencies = [ "almost", "cosmic-config", @@ -3216,7 +3216,7 @@ dependencies = [ [[package]] name = "iced" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#3f25af87a3a41c53bdbd69878f32766bbcda2194" +source = "git+https://github.com/pop-os/libcosmic#7d84d21129e0b4590fedf20b377da80b6a177b47" dependencies = [ "dnd", "iced_accessibility", @@ -3234,7 +3234,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#3f25af87a3a41c53bdbd69878f32766bbcda2194" +source = "git+https://github.com/pop-os/libcosmic#7d84d21129e0b4590fedf20b377da80b6a177b47" dependencies = [ "accesskit", "accesskit_winit", @@ -3243,7 +3243,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#3f25af87a3a41c53bdbd69878f32766bbcda2194" +source = "git+https://github.com/pop-os/libcosmic#7d84d21129e0b4590fedf20b377da80b6a177b47" dependencies = [ "bitflags 2.8.0", "bytes", @@ -3268,7 +3268,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#3f25af87a3a41c53bdbd69878f32766bbcda2194" +source = "git+https://github.com/pop-os/libcosmic#7d84d21129e0b4590fedf20b377da80b6a177b47" dependencies = [ "futures", "iced_core", @@ -3294,7 +3294,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#3f25af87a3a41c53bdbd69878f32766bbcda2194" +source = "git+https://github.com/pop-os/libcosmic#7d84d21129e0b4590fedf20b377da80b6a177b47" dependencies = [ "bitflags 2.8.0", "bytemuck", @@ -3316,7 +3316,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#3f25af87a3a41c53bdbd69878f32766bbcda2194" +source = "git+https://github.com/pop-os/libcosmic#7d84d21129e0b4590fedf20b377da80b6a177b47" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -3328,7 +3328,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#3f25af87a3a41c53bdbd69878f32766bbcda2194" +source = "git+https://github.com/pop-os/libcosmic#7d84d21129e0b4590fedf20b377da80b6a177b47" dependencies = [ "bytes", "cosmic-client-toolkit", @@ -3344,7 +3344,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#3f25af87a3a41c53bdbd69878f32766bbcda2194" +source = "git+https://github.com/pop-os/libcosmic#7d84d21129e0b4590fedf20b377da80b6a177b47" dependencies = [ "bytemuck", "cosmic-text", @@ -3360,7 +3360,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#3f25af87a3a41c53bdbd69878f32766bbcda2194" +source = "git+https://github.com/pop-os/libcosmic#7d84d21129e0b4590fedf20b377da80b6a177b47" dependencies = [ "as-raw-xcb-connection", "bitflags 2.8.0", @@ -3391,7 +3391,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#3f25af87a3a41c53bdbd69878f32766bbcda2194" +source = "git+https://github.com/pop-os/libcosmic#7d84d21129e0b4590fedf20b377da80b6a177b47" dependencies = [ "cosmic-client-toolkit", "dnd", @@ -3410,7 +3410,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#3f25af87a3a41c53bdbd69878f32766bbcda2194" +source = "git+https://github.com/pop-os/libcosmic#7d84d21129e0b4590fedf20b377da80b6a177b47" dependencies = [ "cosmic-client-toolkit", "dnd", @@ -4415,7 +4415,7 @@ checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#3f25af87a3a41c53bdbd69878f32766bbcda2194" +source = "git+https://github.com/pop-os/libcosmic#7d84d21129e0b4590fedf20b377da80b6a177b47" dependencies = [ "apply", "ashpd 0.9.2", diff --git a/Cargo.toml b/Cargo.toml index 96a47dd..f43f66f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -54,9 +54,11 @@ cosmic-client-toolkit = { git = "https://github.com/pop-os/cosmic-protocols//", # For development and testing purposes # [patch.'https://github.com/pop-os/libcosmic'] -# libcosmic = { git = "https://github.com/pop-os/libcosmic//", branch = "fontconfig" } -# cosmic-config = { git = "https://github.com/pop-os/libcosmic//", branch = "fontconfig" } -# cosmic-theme = { git = "https://github.com/pop-os/libcosmic//", branch = "fontconfig" } +# libcosmic = { git = "https://github.com/pop-os/libcosmic//", branch = "font" } +# cosmic-config = { git = "https://github.com/pop-os/libcosmic//", branch = "font" } +# cosmic-theme = { git = "https://github.com/pop-os/libcosmic//", branch = "font" } +# iced_futures = { git = "https://github.com/pop-os/libcosmic//", branch = "font" } + # libcosmic = { path = "../libcosmic" } # cosmic-config = { path = "../libcosmic/cosmic-config" } # cosmic-theme = { path = "../libcosmic/cosmic-theme" } diff --git a/debian/control b/debian/control index 72815ea..ed52958 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,7 @@ Maintainer: Michael Murphy Build-Depends: debhelper-compat (=13), cmake, + fonts-open-sans, just, libclang-dev, libexpat1-dev,