From 3f51b3a0ca9c8a9cd8508b8743531786081fe2dd Mon Sep 17 00:00:00 2001 From: LGUG2Z Date: Fri, 30 Oct 2026 12:41:30 -0700 Subject: [PATCH] build(repo): take the scrolling model from upstream's next branch komorebi-layouts and komorebi-themes move to the revision of next that has the platform-free half of the rework of the Scrolling layout, and komorebi-scrolling, the model of a strip of columns, is a dependency of komorebi at the same revision. --- Cargo.lock | 13 ++++++++++--- Cargo.toml | 12 ++++++++---- deny.toml | 5 +++++ komorebi/Cargo.toml | 1 + 4 files changed, 24 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7fab1b0d..82014303 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2503,6 +2503,7 @@ dependencies = [ "hotwatch", "komorebi-hotkeys", "komorebi-layouts", + "komorebi-scrolling", "komorebi-themes", "lazy_static", "nanoid", @@ -2543,10 +2544,11 @@ dependencies = [ [[package]] name = "komorebi-layouts" version = "0.1.42" -source = "git+https://github.com/LGUG2Z/komorebi?rev=efe91ce33223afd2a41da35afcf0670a3ea39050#efe91ce33223afd2a41da35afcf0670a3ea39050" +source = "git+https://github.com/LGUG2Z/komorebi?rev=6d862a11471b819236000a463c575abce2ed13c3#6d862a11471b819236000a463c575abce2ed13c3" dependencies = [ "clap", "color-eyre", + "komorebi-scrolling", "schemars 1.2.3", "serde", "serde_json_lenient", @@ -2555,10 +2557,15 @@ dependencies = [ "tracing", ] +[[package]] +name = "komorebi-scrolling" +version = "0.1.42" +source = "git+https://github.com/LGUG2Z/komorebi?rev=6d862a11471b819236000a463c575abce2ed13c3#6d862a11471b819236000a463c575abce2ed13c3" + [[package]] name = "komorebi-themes" version = "0.1.42" -source = "git+https://github.com/LGUG2Z/komorebi?rev=efe91ce33223afd2a41da35afcf0670a3ea39050#efe91ce33223afd2a41da35afcf0670a3ea39050" +source = "git+https://github.com/LGUG2Z/komorebi?rev=6d862a11471b819236000a463c575abce2ed13c3#6d862a11471b819236000a463c575abce2ed13c3" dependencies = [ "base16-egui-themes", "catppuccin-egui", @@ -5576,7 +5583,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.48.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 1527398c..6605cb3d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,13 +13,17 @@ members = [ version = "0.1.0" [workspace.dependencies] -# upstream's layouts, at a revision that has the fix for resizing a tile by dragging its edge -# (LGUG2Z/komorebi#1765) and the placement helpers komorebi for KDE uses -komorebi-layouts = { git = "https://github.com/LGUG2Z/komorebi", rev = "efe91ce33223afd2a41da35afcf0670a3ea39050", features = [ +# upstream's layouts, at a revision of its `next` branch that has the fix for resizing a tile by +# dragging its edge (LGUG2Z/komorebi#1765), the placement helpers komorebi for KDE uses and the +# platform-free half of the rework of the Scrolling layout +komorebi-layouts = { git = "https://github.com/LGUG2Z/komorebi", rev = "6d862a11471b819236000a463c575abce2ed13c3", features = [ "schemars", ] } +# the model of a strip of columns that the Scrolling layout is laid out with, from the same +# revision, whose layouts re-export it as `komorebi_layouts::scrolling::model` +komorebi-scrolling = { git = "https://github.com/LGUG2Z/komorebi", rev = "6d862a11471b819236000a463c575abce2ed13c3" } # the themes (and the palettes made from pictures), from the same upstream revision -komorebi-themes = { git = "https://github.com/LGUG2Z/komorebi", rev = "efe91ce33223afd2a41da35afcf0670a3ea39050" } +komorebi-themes = { git = "https://github.com/LGUG2Z/komorebi", rev = "6d862a11471b819236000a463c575abce2ed13c3" } chrono = "0.4" clap = { version = "4", features = ["derive", "wrap_help"] } diff --git a/deny.toml b/deny.toml index 5a4989fa..1ae68c4e 100644 --- a/deny.toml +++ b/deny.toml @@ -58,6 +58,11 @@ crate = "komorebi-layouts" expression = "LicenseRef-Komorebi-2.0" license-files = [] +[[licenses.clarify]] +crate = "komorebi-scrolling" +expression = "LicenseRef-Komorebi-2.0" +license-files = [] + [[licenses.clarify]] crate = "komorebic" expression = "LicenseRef-Komorebi-2.0" diff --git a/komorebi/Cargo.toml b/komorebi/Cargo.toml index d4428d44..551722e6 100644 --- a/komorebi/Cargo.toml +++ b/komorebi/Cargo.toml @@ -8,6 +8,7 @@ edition = "2024" komorebi-hotkeys = { path = "../komorebi-hotkeys" } komorebi-themes = { workspace = true } komorebi-layouts = { workspace = true } +komorebi-scrolling = { workspace = true } version = { path = "../version" } clap = { workspace = true }