chore: use local winit and softbuffer
This commit is contained in:
parent
cf7828fb70
commit
362b4abb15
2 changed files with 22 additions and 17 deletions
14
Cargo.lock
generated
14
Cargo.lock
generated
|
|
@ -1658,7 +1658,6 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "dpi"
|
name = "dpi"
|
||||||
version = "0.1.2"
|
version = "0.1.2"
|
||||||
source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#261cda54017f98a12dc55569c864430fe6770366"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "drm"
|
name = "drm"
|
||||||
|
|
@ -6275,7 +6274,6 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "smithay-clipboard"
|
name = "smithay-clipboard"
|
||||||
version = "0.8.0"
|
version = "0.8.0"
|
||||||
source = "git+https://github.com/pop-os/smithay-clipboard?tag=sctk-0.20#859b02c88f45c554049a67c6ddeec1692ce0e20b"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"libc",
|
"libc",
|
||||||
"raw-window-handle",
|
"raw-window-handle",
|
||||||
|
|
@ -6333,7 +6331,6 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "softbuffer"
|
name = "softbuffer"
|
||||||
version = "0.4.1"
|
version = "0.4.1"
|
||||||
source = "git+https://github.com/pop-os/softbuffer?tag=cosmic-4.0#a3f77e251e7422803f693df6e3fc313c010c4dcb"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"as-raw-xcb-connection",
|
"as-raw-xcb-connection",
|
||||||
"bytemuck",
|
"bytemuck",
|
||||||
|
|
@ -8517,7 +8514,6 @@ checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "winit"
|
name = "winit"
|
||||||
version = "0.31.0-beta.2"
|
version = "0.31.0-beta.2"
|
||||||
source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#261cda54017f98a12dc55569c864430fe6770366"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.11.0",
|
"bitflags 2.11.0",
|
||||||
"cfg_aliases",
|
"cfg_aliases",
|
||||||
|
|
@ -8543,7 +8539,6 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "winit-android"
|
name = "winit-android"
|
||||||
version = "0.31.0-beta.2"
|
version = "0.31.0-beta.2"
|
||||||
source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#261cda54017f98a12dc55569c864430fe6770366"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"android-activity",
|
"android-activity",
|
||||||
"bitflags 2.11.0",
|
"bitflags 2.11.0",
|
||||||
|
|
@ -8558,7 +8553,6 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "winit-appkit"
|
name = "winit-appkit"
|
||||||
version = "0.31.0-beta.2"
|
version = "0.31.0-beta.2"
|
||||||
source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#261cda54017f98a12dc55569c864430fe6770366"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.11.0",
|
"bitflags 2.11.0",
|
||||||
"block2 0.6.2",
|
"block2 0.6.2",
|
||||||
|
|
@ -8580,7 +8574,6 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "winit-common"
|
name = "winit-common"
|
||||||
version = "0.31.0-beta.2"
|
version = "0.31.0-beta.2"
|
||||||
source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#261cda54017f98a12dc55569c864430fe6770366"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"memmap2 0.9.10",
|
"memmap2 0.9.10",
|
||||||
"objc2 0.6.4",
|
"objc2 0.6.4",
|
||||||
|
|
@ -8595,7 +8588,6 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "winit-core"
|
name = "winit-core"
|
||||||
version = "0.31.0-beta.2"
|
version = "0.31.0-beta.2"
|
||||||
source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#261cda54017f98a12dc55569c864430fe6770366"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.11.0",
|
"bitflags 2.11.0",
|
||||||
"cursor-icon",
|
"cursor-icon",
|
||||||
|
|
@ -8609,7 +8601,6 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "winit-orbital"
|
name = "winit-orbital"
|
||||||
version = "0.31.0-beta.2"
|
version = "0.31.0-beta.2"
|
||||||
source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#261cda54017f98a12dc55569c864430fe6770366"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.11.0",
|
"bitflags 2.11.0",
|
||||||
"dpi",
|
"dpi",
|
||||||
|
|
@ -8625,7 +8616,6 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "winit-uikit"
|
name = "winit-uikit"
|
||||||
version = "0.31.0-beta.2"
|
version = "0.31.0-beta.2"
|
||||||
source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#261cda54017f98a12dc55569c864430fe6770366"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.11.0",
|
"bitflags 2.11.0",
|
||||||
"block2 0.6.2",
|
"block2 0.6.2",
|
||||||
|
|
@ -8645,7 +8635,6 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "winit-wayland"
|
name = "winit-wayland"
|
||||||
version = "0.31.0-beta.2"
|
version = "0.31.0-beta.2"
|
||||||
source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#261cda54017f98a12dc55569c864430fe6770366"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"ahash",
|
"ahash",
|
||||||
"bitflags 2.11.0",
|
"bitflags 2.11.0",
|
||||||
|
|
@ -8671,7 +8660,6 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "winit-web"
|
name = "winit-web"
|
||||||
version = "0.31.0-beta.2"
|
version = "0.31.0-beta.2"
|
||||||
source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#261cda54017f98a12dc55569c864430fe6770366"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"atomic-waker",
|
"atomic-waker",
|
||||||
"bitflags 2.11.0",
|
"bitflags 2.11.0",
|
||||||
|
|
@ -8693,7 +8681,6 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "winit-win32"
|
name = "winit-win32"
|
||||||
version = "0.31.0-beta.2"
|
version = "0.31.0-beta.2"
|
||||||
source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#261cda54017f98a12dc55569c864430fe6770366"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.11.0",
|
"bitflags 2.11.0",
|
||||||
"cursor-icon",
|
"cursor-icon",
|
||||||
|
|
@ -8709,7 +8696,6 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "winit-x11"
|
name = "winit-x11"
|
||||||
version = "0.31.0-beta.2"
|
version = "0.31.0-beta.2"
|
||||||
source = "git+https://github.com/pop-os/winit.git?tag=cosmic-0.14#261cda54017f98a12dc55569c864430fe6770366"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.11.0",
|
"bitflags 2.11.0",
|
||||||
"bytemuck",
|
"bytemuck",
|
||||||
|
|
|
||||||
25
Cargo.toml
25
Cargo.toml
|
|
@ -278,7 +278,7 @@ cctk = { path = "../../cosmic-protocols/client-toolkit", package = "cosmic-clien
|
||||||
# Yoda: default-features=false drops softbuffer's x11 / x11-dlopen (pulled
|
# Yoda: default-features=false drops softbuffer's x11 / x11-dlopen (pulled
|
||||||
# tiny-xlib + as-raw-xcb-connection). The wayland + wayland-dlopen features
|
# tiny-xlib + as-raw-xcb-connection). The wayland + wayland-dlopen features
|
||||||
# are re-activated via iced_tiny_skia's own `wayland` feature propagation.
|
# are re-activated via iced_tiny_skia's own `wayland` feature propagation.
|
||||||
softbuffer = { git = "https://github.com/pop-os/softbuffer", tag = "cosmic-4.0", default-features = false }
|
softbuffer = { path = "../../softbuffer", default-features = false }
|
||||||
syntect = "5.2"
|
syntect = "5.2"
|
||||||
tokio = "1.0"
|
tokio = "1.0"
|
||||||
tracing = "0.1"
|
tracing = "0.1"
|
||||||
|
|
@ -315,10 +315,29 @@ mime = { path = "../../window_clipboard/mime" }
|
||||||
# pulls winit-x11, x11-dl, tiny-xlib, as-raw-xcb-connection. Our Wayland-only
|
# pulls winit-x11, x11-dl, tiny-xlib, as-raw-xcb-connection. Our Wayland-only
|
||||||
# fork doesn't need any of that — the wayland + wayland-dlopen features are
|
# fork doesn't need any of that — the wayland + wayland-dlopen features are
|
||||||
# re-enabled via iced_winit's own feature propagation from libcosmic-yoda.
|
# re-enabled via iced_winit's own feature propagation from libcosmic-yoda.
|
||||||
winit = { git = "https://github.com/pop-os/winit.git", tag = "cosmic-0.14", default-features = false }
|
winit = { path = "../../winit/winit", default-features = false }
|
||||||
winit-core = { git = "https://github.com/pop-os/winit.git", tag = "cosmic-0.14" }
|
winit-core = { path = "../../winit/winit-core" }
|
||||||
cursor-icon = "1.1.0"
|
cursor-icon = "1.1.0"
|
||||||
|
|
||||||
|
[patch.'https://github.com/pop-os/softbuffer']
|
||||||
|
softbuffer = { path = "../../softbuffer" }
|
||||||
|
|
||||||
|
[patch.'https://github.com/pop-os/smithay-clipboard']
|
||||||
|
smithay-clipboard = { path = "../../smithay-clipboard" }
|
||||||
|
|
||||||
|
[patch.'https://github.com/pop-os/winit.git']
|
||||||
|
dpi = { path = "../../winit/dpi" }
|
||||||
|
winit = { path = "../../winit/winit" }
|
||||||
|
winit-android = { path = "../../winit/winit-android" }
|
||||||
|
winit-appkit = { path = "../../winit/winit-appkit" }
|
||||||
|
winit-common = { path = "../../winit/winit-common" }
|
||||||
|
winit-core = { path = "../../winit/winit-core" }
|
||||||
|
winit-orbital = { path = "../../winit/winit-orbital" }
|
||||||
|
winit-uikit = { path = "../../winit/winit-uikit" }
|
||||||
|
winit-wayland = { path = "../../winit/winit-wayland" }
|
||||||
|
winit-web = { path = "../../winit/winit-web" }
|
||||||
|
winit-win32 = { path = "../../winit/winit-win32" }
|
||||||
|
winit-x11 = { path = "../../winit/winit-x11" }
|
||||||
|
|
||||||
[workspace.lints.rust]
|
[workspace.lints.rust]
|
||||||
rust_2018_idioms = { level = "deny", priority = -1 }
|
rust_2018_idioms = { level = "deny", priority = -1 }
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue