Update dependencies, rm fast_image_resize submod.

Dependency fast_image_resize fixed a conserning bug (UB in unsafe code)
in the 2.7.2 release, which is now available on crates.io - so use that
This commit is contained in:
Gergő Sályi 2023-05-05 08:07:18 +02:00
parent 9456b98150
commit d7a3107f4b
5 changed files with 31 additions and 44 deletions

3
.gitmodules vendored
View file

@ -1,3 +0,0 @@
[submodule "patch/fast_image_resize"]
path = patch/fast_image_resize
url = https://github.com/Cykooz/fast_image_resize

View file

@ -1,5 +1,8 @@
# Changelog
## 0.1.3 - 2023-05-05
- Update dependencies, including fast_image_resize which fixed a major bug
## 0.1.2 - 2023-04-27
- Fix crash on suspend [#1](https://github.com/gergo-salyi/multibg-sway/issues/1)
- Implement automatic image resizing

48
Cargo.lock generated
View file

@ -19,9 +19,9 @@ dependencies = [
[[package]]
name = "anstream"
version = "0.3.1"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6342bd4f5a1205d7f41e94a41a901f5647c938cdfa96036338e8533c9d6c2450"
checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163"
dependencies = [
"anstyle",
"anstyle-parse",
@ -116,9 +116,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "clap"
version = "4.2.4"
version = "4.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "956ac1f6381d8d82ab4684768f89c0ea3afe66925ceadb4eeb3fc452ffc55d62"
checksum = "34d21f9bf1b425d2968943631ec91202fe5e837264063503708b83013f8fc938"
dependencies = [
"clap_builder",
"clap_derive",
@ -127,9 +127,9 @@ dependencies = [
[[package]]
name = "clap_builder"
version = "4.2.4"
version = "4.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "84080e799e54cff944f4b4a4b0e71630b0e0443b25b985175c7dddc1a859b749"
checksum = "914c8c79fb560f238ef6429439a30023c862f7a28e688c58f7203f12b29970bd"
dependencies = [
"anstream",
"anstyle",
@ -299,7 +299,9 @@ dependencies = [
[[package]]
name = "fast_image_resize"
version = "2.7.0"
version = "2.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96b758d4361841076b6eb911a4405bfa8835d9afa6310a84ae0f5ebbd6dbd372"
dependencies = [
"num-traits",
"thiserror",
@ -316,12 +318,12 @@ dependencies = [
[[package]]
name = "flate2"
version = "1.0.25"
version = "1.0.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743"
dependencies = [
"crc32fast",
"miniz_oxide 0.6.2",
"miniz_oxide 0.7.1",
]
[[package]]
@ -504,9 +506,9 @@ dependencies = [
[[package]]
name = "linux-raw-sys"
version = "0.3.4"
version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "36eb31c1778188ae1e64398743890d0877fef36d11521ac60406b42016e8c2cf"
checksum = "ece97ea872ece730aed82664c424eb4c8291e1ff2480247ccf7409044bc6479f"
[[package]]
name = "lock_api"
@ -599,7 +601,7 @@ dependencies = [
[[package]]
name = "multibg-sway"
version = "0.1.2"
version = "0.1.3"
dependencies = [
"clap",
"env_logger",
@ -711,9 +713,9 @@ dependencies = [
[[package]]
name = "pkg-config"
version = "0.3.26"
version = "0.3.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
[[package]]
name = "png"
@ -805,9 +807,9 @@ checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c"
[[package]]
name = "rustix"
version = "0.37.15"
version = "0.37.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a0661814f891c57c930a610266415528da53c4933e6dea5fb350cbfe048a9ece"
checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d"
dependencies = [
"bitflags",
"errno",
@ -837,18 +839,18 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
[[package]]
name = "serde"
version = "1.0.160"
version = "1.0.162"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c"
checksum = "71b2f6e1ab5c2b98c05f0f35b236b22e8df7ead6ffbf51d7808da7f8817e7ab6"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.160"
version = "1.0.162"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df"
checksum = "a2a0814352fd64b58489904a44ea8d90cb1a91dcb6b4f5ebabc32c8318e93cb6"
dependencies = [
"proc-macro2",
"quote",
@ -1341,9 +1343,9 @@ dependencies = [
[[package]]
name = "zune-inflate"
version = "0.2.53"
version = "0.2.54"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "440a08fd59c6442e4b846ea9b10386c38307eae728b216e1ab2c305d1c9daaf8"
checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02"
dependencies = [
"simd-adler32",
]

View file

@ -1,6 +1,6 @@
[package]
name = "multibg-sway"
version = "0.1.2"
version = "0.1.3"
authors = ["Gergő Sályi <salyigergo94@gmail.com>"]
edition = "2021"
description = "Set a different wallpaper for the background of each Sway workspace"
@ -10,12 +10,12 @@ repository = "https://github.com/gergo-salyi/multibg-sway"
license = "MIT OR Apache-2.0"
keywords = ["wallpaper", "background", "desktop", "wayland", "sway"]
categories = ["command-line-utilities", "multimedia::images"]
exclude = ["PKGBUILD", "patch/fast_image_resize/data"]
exclude = ["PKGBUILD"]
[dependencies]
clap = { version = "4.2.1", features = ["derive"] }
env_logger = "0.10.0"
fast_image_resize = "2.7.0"
fast_image_resize = "2.7.2"
image = "0.24.6"
log = "0.4.17"
mio = { version = "0.8.6", features = ["os-ext", "os-poll"] }
@ -24,17 +24,3 @@ swayipc = "3.0.1"
[dependencies.smithay-client-toolkit]
version = "0.17.0"
default-features = false
# Apply yet unreleased fix for fast_image_resize
#
# Current releases of fast_image_resize are broken on rust nightly
# https://github.com/Cykooz/fast_image_resize/issues/15
#
# Issue is already fixed on master branch but the new verison is not released yet
# So temporarly use a clone of fast_image_resize current master branch
# as a local git submodule and add this corresponding patch field here
#
# This will be removed once fast_image_resize 2.7.1 is out
[patch.crates-io]
fast_image_resize = { path = "patch/fast_image_resize" }

@ -1 +0,0 @@
Subproject commit 8548ee562b16888461f1a6487e43c55ebf83dff6