Browse Source

Update memoffset to 0.9.0, arboard to 3.3.1, and remove egui_glow's needless 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
pull/4037/head
Magnus Larsen 9 months ago
committed by GitHub
parent
commit
7a4ab666b4
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 87
      Cargo.lock
  2. 2
      crates/egui-winit/Cargo.toml
  3. 18
      crates/egui_glow/Cargo.toml

87
Cargo.lock

@ -199,9 +199,9 @@ checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
[[package]] [[package]]
name = "arboard" name = "arboard"
version = "3.3.0" version = "3.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aafb29b107435aa276664c1db8954ac27a6e105cdad3c88287a199eb0e313c08" checksum = "1faa3c733d9a3dd6fbaf85da5d162a2e03b2e0033a90dceb0e2a90fdd1e5380a"
dependencies = [ dependencies = [
"clipboard-win", "clipboard-win",
"log", "log",
@ -210,8 +210,7 @@ dependencies = [
"objc_id", "objc_id",
"parking_lot", "parking_lot",
"thiserror", "thiserror",
"winapi", "x11rb",
"x11rb 0.12.0",
] ]
[[package]] [[package]]
@ -789,13 +788,11 @@ checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
[[package]] [[package]]
name = "clipboard-win" name = "clipboard-win"
version = "4.5.0" version = "5.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362" checksum = "3ec832972fefb8cf9313b45a0d1945e29c9c251f1d4c6eafc5fe2124c02d2e81"
dependencies = [ dependencies = [
"error-code", "error-code",
"str-buf",
"winapi",
] ]
[[package]] [[package]]
@ -1349,7 +1346,7 @@ dependencies = [
"glutin", "glutin",
"glutin-winit", "glutin-winit",
"log", "log",
"memoffset", "memoffset 0.9.0",
"puffin", "puffin",
"raw-window-handle 0.5.2", "raw-window-handle 0.5.2",
"wasm-bindgen", "wasm-bindgen",
@ -1510,13 +1507,9 @@ dependencies = [
[[package]] [[package]]
name = "error-code" name = "error-code"
version = "2.3.1" version = "3.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21" checksum = "281e452d3bad4005426416cdba5ccfd4f5c1280e10099e21db27f7c1c28347fc"
dependencies = [
"libc",
"str-buf",
]
[[package]] [[package]]
name = "event-listener" name = "event-listener"
@ -1731,16 +1724,6 @@ dependencies = [
"version_check", "version_check",
] ]
[[package]]
name = "gethostname"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb65d4ba3173c56a500b555b532f72c42e8d1fe64962b518897f8959fae2c177"
dependencies = [
"libc",
"winapi",
]
[[package]] [[package]]
name = "gethostname" name = "gethostname"
version = "0.4.3" version = "0.4.3"
@ -2380,6 +2363,15 @@ dependencies = [
"autocfg", "autocfg",
] ]
[[package]]
name = "memoffset"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
dependencies = [
"autocfg",
]
[[package]] [[package]]
name = "metal" name = "metal"
version = "0.27.0" version = "0.27.0"
@ -2501,7 +2493,7 @@ dependencies = [
"bitflags 1.3.2", "bitflags 1.3.2",
"cfg-if", "cfg-if",
"libc", "libc",
"memoffset", "memoffset 0.7.1",
] ]
[[package]] [[package]]
@ -3527,12 +3519,6 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
[[package]]
name = "str-buf"
version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0"
[[package]] [[package]]
name = "strict-num" name = "strict-num"
version = "0.1.1" version = "0.1.1"
@ -4375,15 +4361,6 @@ dependencies = [
"winapi", "winapi",
] ]
[[package]]
name = "winapi-wsapoll"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e"
dependencies = [
"winapi",
]
[[package]] [[package]]
name = "winapi-x86_64-pc-windows-gnu" name = "winapi-x86_64-pc-windows-gnu"
version = "0.4.0" version = "0.4.0"
@ -4628,7 +4605,7 @@ dependencies = [
"web-time", "web-time",
"windows-sys 0.48.0", "windows-sys 0.48.0",
"x11-dl", "x11-dl",
"x11rb 0.13.0", "x11rb",
"xkbcommon-dl", "xkbcommon-dl",
] ]
@ -4652,19 +4629,6 @@ dependencies = [
"pkg-config", "pkg-config",
] ]
[[package]]
name = "x11rb"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b1641b26d4dec61337c35a1b1aaf9e3cba8f46f0b43636c609ab0291a648040a"
dependencies = [
"gethostname 0.3.0",
"nix",
"winapi",
"winapi-wsapoll",
"x11rb-protocol 0.12.0",
]
[[package]] [[package]]
name = "x11rb" name = "x11rb"
version = "0.13.0" version = "0.13.0"
@ -4672,21 +4636,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a" checksum = "f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a"
dependencies = [ dependencies = [
"as-raw-xcb-connection", "as-raw-xcb-connection",
"gethostname 0.4.3", "gethostname",
"libc", "libc",
"libloading 0.8.0", "libloading 0.8.0",
"once_cell", "once_cell",
"rustix 0.38.21", "rustix 0.38.21",
"x11rb-protocol 0.13.0", "x11rb-protocol",
]
[[package]]
name = "x11rb-protocol"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "82d6c3f9a0fb6701fab8f6cea9b0c0bd5d6876f1f89f7fada07e558077c344bc"
dependencies = [
"nix",
] ]
[[package]] [[package]]

2
crates/egui-winit/Cargo.toml

@ -77,4 +77,4 @@ webbrowser = { version = "0.8.3", optional = true }
smithay-clipboard = { version = "0.7.0", optional = true } smithay-clipboard = { version = "0.7.0", optional = true }
[target.'cfg(not(target_os = "android"))'.dependencies] [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
crates/egui_glow/Cargo.toml

@ -55,11 +55,7 @@ egui = { workspace = true, default-features = false, features = ["bytemuck"] }
bytemuck = "1.7" bytemuck = "1.7"
glow.workspace = true glow.workspace = true
log.workspace = true log.workspace = true
memoffset = "0.7" memoffset = "0.9"
# glutin stuck on old version of raw-window-handle:
rwh_05 = { package = "raw-window-handle", version = "0.5.2", features = [
"std",
] }
#! ### Optional dependencies #! ### Optional dependencies
## Enable this when generating docs. ## Enable this when generating docs.
@ -70,7 +66,6 @@ document-features = { workspace = true, optional = true }
egui-winit = { workspace = true, optional = true, default-features = false } egui-winit = { workspace = true, optional = true, default-features = false }
puffin = { workspace = true, optional = true } puffin = { workspace = true, optional = true }
winit = { workspace = true, optional = true, default-features = false, features = [ 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 "rwh_06", # for compatibility with egui-winit
] } ] }
@ -83,8 +78,15 @@ wasm-bindgen = "0.2"
[dev-dependencies] [dev-dependencies]
glutin = "0.31" # examples/pure_glow glutin = "0.31" # examples/pure_glow
glutin-winit = "0.4.0" 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]] [[example]]
name = "pure_glow" 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
]

Loading…
Cancel
Save