Skip to content

Commit

Permalink
Update memoffset to 0.9.0, arboard to 3.3.1, and remove egui_glow's n…
Browse files Browse the repository at this point in the history
…eedless dependency on pure_glow's deps (#4036)

<!--
Please read the "Making a PR" section of
[`CONTRIBUTING.md`](https://github.com/emilk/egui/blob/master/CONTRIBUTING.md)
before opening a Pull Request!

* Keep your PR:s small and focused.
* The PR title is what ends up in the changelog, so make it descriptive!
* If applicable, add a screenshot or gif.
* If it is a non-trivial addition, consider adding a demo for it to
`egui_demo_lib`, or a new example.
* Do NOT open PR:s from your `master` branch, as that makes it hard for
maintainers to add commits to your PR.
* Remember to run `cargo fmt` and `cargo cranky`.
* Open the PR as a draft until you have self-reviewed it and run
`./scripts/check.sh`.
* When you have addressed a PR comment, mark it as resolved.

Please be patient! I will review your PR, but my time is limited!
-->

These are the latest versions of memoffset and arboard.

The changes to egui_glow/pure_glow allow downstream crates to not depend
on rwh 0.5, which is only needed for pure_glow (and other projects that
use glutin)

Thanks for your time & work
  • Loading branch information
Nopey authored Feb 13, 2024
1 parent d22ee81 commit 7a4ab66
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 75 deletions.
87 changes: 21 additions & 66 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion crates/egui-winit/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,4 @@ webbrowser = { version = "0.8.3", optional = true }
smithay-clipboard = { version = "0.7.0", optional = true }

[target.'cfg(not(target_os = "android"))'.dependencies]
arboard = { version = "3.2", optional = true, default-features = false }
arboard = { version = "3.3", optional = true, default-features = false }
18 changes: 10 additions & 8 deletions crates/egui_glow/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,7 @@ egui = { workspace = true, default-features = false, features = ["bytemuck"] }
bytemuck = "1.7"
glow.workspace = true
log.workspace = true
memoffset = "0.7"
# glutin stuck on old version of raw-window-handle:
rwh_05 = { package = "raw-window-handle", version = "0.5.2", features = [
"std",
] }
memoffset = "0.9"

#! ### Optional dependencies
## Enable this when generating docs.
Expand All @@ -70,7 +66,6 @@ document-features = { workspace = true, optional = true }
egui-winit = { workspace = true, optional = true, default-features = false }
puffin = { workspace = true, optional = true }
winit = { workspace = true, optional = true, default-features = false, features = [
"rwh_05", # glutin stuck on old version of raw-window-handle
"rwh_06", # for compatibility with egui-winit
] }

Expand All @@ -83,8 +78,15 @@ wasm-bindgen = "0.2"
[dev-dependencies]
glutin = "0.31" # examples/pure_glow
glutin-winit = "0.4.0"

# glutin stuck on old version of raw-window-handle:
rwh_05 = { package = "raw-window-handle", version = "0.5.2", features = [
"std",
] }

[[example]]
name = "pure_glow"
required-features = ["winit", "egui/default_fonts"]
required-features = [
"winit",
"egui/default_fonts",
"winit/rwh_05", # glutin stuck on old version of raw-window-handle
]

0 comments on commit 7a4ab66

Please sign in to comment.