diff --git a/.changes/fix-nsis-resources-cross-compiling.md b/.changes/fix-nsis-resources-cross-compiling.md deleted file mode 100644 index 45b3c6ca..00000000 --- a/.changes/fix-nsis-resources-cross-compiling.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -"cargo-packager": patch -"@crabnebula/packager": patch ---- - -Fixes resources paths on NSIS when cross compiling. \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index ef931df4..9c5233f8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -26,22 +26,22 @@ checksum = "74a4b14f3d99c1255dcba8f45621ab1a2e7540a0009652d33989005a4d0bfc6b" [[package]] name = "accesskit" -version = "0.16.1" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef7442f1f520649b8e11ee3af6caeec24123fed4b63bc36a85b67308d8514fdf" +checksum = "99b76d84ee70e30a4a7e39ab9018e2b17a6a09e31084176cc7c0b2dec036ba45" [[package]] name = "accesskit_atspi_common" -version = "0.9.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab9d2b364833ae6e2eae9359a374108b1c5488877a9f43d26f0cb700560af9ae" +checksum = "f5393c75d4666f580f4cac0a968bc97c36076bb536a129f28210dac54ee127ed" dependencies = [ - "accesskit 0.16.1", - "accesskit_consumer 0.24.1", - "atspi-common", + "accesskit 0.16.3", + "accesskit_consumer 0.24.3", + "atspi-common 0.6.0", "serde", "thiserror", - "zvariant 3.15.2", + "zvariant 4.2.0", ] [[package]] @@ -55,11 +55,11 @@ dependencies = [ [[package]] name = "accesskit_consumer" -version = "0.24.1" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7072a4f17b8e7440a88ce08eb657d1ec84be061b1a94be78f9699aa18e583885" +checksum = "7a12dc159d52233c43d9fe5415969433cbdd52c3d6e0df51bda7d447427b9986" dependencies = [ - "accesskit 0.16.1", + "accesskit 0.16.3", "immutable-chunkmap", ] @@ -77,12 +77,12 @@ dependencies = [ [[package]] name = "accesskit_macos" -version = "0.17.1" +version = "0.17.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "716698a26b5113812348a9f99ec250cb7b4154c89a83bc55a8b7d8678a1ecf02" +checksum = "49509c722e8da39e6c569f7d13ec51620208988913e738abbc67e3c65f06e6d5" dependencies = [ - "accesskit 0.16.1", - "accesskit_consumer 0.24.1", + "accesskit 0.16.3", + "accesskit_consumer 0.24.3", "objc2 0.5.2", "objc2-app-kit", "objc2-foundation", @@ -99,7 +99,7 @@ dependencies = [ "accesskit_consumer 0.16.1", "async-channel", "async-once-cell", - "atspi", + "atspi 0.19.0", "futures-lite 1.13.0", "once_cell", "serde", @@ -108,20 +108,20 @@ dependencies = [ [[package]] name = "accesskit_unix" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd552c7bae0cd2ba1131fb0cedad32f8915743e0ed086f989fd706431641f56e" +checksum = "be7f5cf6165be10a54b2655fa2e0e12b2509f38ed6fc43e11c31fdb7ee6230bb" dependencies = [ - "accesskit 0.16.1", + "accesskit 0.16.3", "accesskit_atspi_common", "async-channel", "async-executor", "async-task", - "atspi", - "futures-lite 1.13.0", + "atspi 0.22.0", + "futures-lite 2.3.0", "futures-util", "serde", - "zbus 3.15.2", + "zbus 4.4.0", ] [[package]] @@ -140,12 +140,12 @@ dependencies = [ [[package]] name = "accesskit_windows" -version = "0.23.0" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d134e9eb16c98b35d1ff7056a027d7482968bcab0d8b625e7e72895b748d705" +checksum = "974e96c347384d9133427167fb8a58c340cb0496988dacceebdc1ed27071023b" dependencies = [ - "accesskit 0.16.1", - "accesskit_consumer 0.24.1", + "accesskit 0.16.3", + "accesskit_consumer 0.24.3", "paste", "static_assertions", "windows 0.58.0", @@ -167,14 +167,14 @@ dependencies = [ [[package]] name = "accesskit_winit" -version = "0.22.1" +version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "156c5066e7b3ac9a82fb80fc18dcee42f79967c47e0ff431bae23e7ee8412a83" +checksum = "9987e852fe7e4e5a493f8c8af0b729b47da2750f0dea10a4c8984fe1117ebaec" dependencies = [ - "accesskit 0.16.1", - "accesskit_macos 0.17.1", - "accesskit_unix 0.12.1", - "accesskit_windows 0.23.0", + "accesskit 0.16.3", + "accesskit_macos 0.17.3", + "accesskit_unix 0.12.3", + "accesskit_windows 0.23.2", "raw-window-handle 0.6.2", "winit 0.30.5", ] @@ -719,9 +719,20 @@ version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6059f350ab6f593ea00727b334265c4dfc7fd442ee32d264794bd9bdc68e87ca" dependencies = [ - "atspi-common", - "atspi-connection", - "atspi-proxies", + "atspi-common 0.3.0", + "atspi-connection 0.3.0", + "atspi-proxies 0.3.0", +] + +[[package]] +name = "atspi" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be534b16650e35237bb1ed189ba2aab86ce65e88cc84c66f4935ba38575cecbf" +dependencies = [ + "atspi-common 0.6.0", + "atspi-connection 0.6.0", + "atspi-proxies 0.6.0", ] [[package]] @@ -738,29 +749,69 @@ dependencies = [ "zvariant 3.15.2", ] +[[package]] +name = "atspi-common" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1909ed2dc01d0a17505d89311d192518507e8a056a48148e3598fef5e7bb6ba7" +dependencies = [ + "enumflags2", + "serde", + "static_assertions", + "zbus 4.4.0", + "zbus-lockstep", + "zbus-lockstep-macros", + "zbus_names 3.0.0", + "zvariant 4.2.0", +] + [[package]] name = "atspi-connection" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0c65e7d70f86d4c0e3b2d585d9bf3f979f0b19d635a336725a88d279f76b939" dependencies = [ - "atspi-common", - "atspi-proxies", + "atspi-common 0.3.0", + "atspi-proxies 0.3.0", "futures-lite 1.13.0", "zbus 3.15.2", ] +[[package]] +name = "atspi-connection" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "430c5960624a4baaa511c9c0fcc2218e3b58f5dbcc47e6190cafee344b873333" +dependencies = [ + "atspi-common 0.6.0", + "atspi-proxies 0.6.0", + "futures-lite 2.3.0", + "zbus 4.4.0", +] + [[package]] name = "atspi-proxies" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6495661273703e7a229356dcbe8c8f38223d697aacfaf0e13590a9ac9977bb52" dependencies = [ - "atspi-common", + "atspi-common 0.3.0", "serde", "zbus 3.15.2", ] +[[package]] +name = "atspi-proxies" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e6c5de3e524cf967569722446bcd458d5032348554d9a17d7d72b041ab7496" +dependencies = [ + "atspi-common 0.6.0", + "serde", + "zbus 4.4.0", + "zvariant 4.2.0", +] + [[package]] name = "auto_enums" version = "0.8.6" @@ -831,9 +882,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bindgen" -version = "0.69.4" +version = "0.69.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088" dependencies = [ "bitflags 2.6.0", "cexpr", @@ -1159,7 +1210,7 @@ dependencies = [ [[package]] name = "cargo-packager" -version = "0.11.0" +version = "0.11.1" dependencies = [ "ar", "base64 0.22.1", @@ -1443,9 +1494,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.19" +version = "4.5.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7be5744db7978a28d9df86a214130d106a89ce49644cbc4e3f0c22c3fba30615" +checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8" dependencies = [ "clap_builder", "clap_derive", @@ -1453,9 +1504,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.19" +version = "4.5.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5fbc17d3ef8278f55b282b2a2e75ae6f6c7d4bb70ed3d0382375104bfafdb4b" +checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54" dependencies = [ "anstream", "anstyle", @@ -2574,9 +2625,9 @@ checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" [[package]] name = "dwrote" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da3498378ed373237bdef1eddcc64e7be2d3ba4841f4c22a998e81cadeea83c" +checksum = "70182709525a3632b2ba96b6569225467b18ecb4a77f46d255f713a6bebf05fd" dependencies = [ "lazy_static", "libc", @@ -4175,8 +4226,8 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4831644094018b8533264d601ab54f585ba6cc834068e8eae77e571d4cc5b70e" dependencies = [ - "accesskit 0.16.1", - "accesskit_winit 0.22.1", + "accesskit 0.16.3", + "accesskit_winit 0.22.3", "bytemuck", "cfg-if", "cfg_aliases 0.2.1", @@ -4752,9 +4803,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.70" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +checksum = "0cb94a0ffd3f3ee755c20f7d8752f45cac88605a4dcf808abcff72873296ec7b" dependencies = [ "wasm-bindgen", ] @@ -6642,6 +6693,16 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" +[[package]] +name = "quick-xml" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" +dependencies = [ + "memchr", + "serde", +] + [[package]] name = "quick-xml" version = "0.32.0" @@ -9389,9 +9450,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.93" +version = "0.2.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +checksum = "ef073ced962d62984fb38a36e5fdc1a2b23c9e0e1fa0689bb97afa4202ef6887" dependencies = [ "cfg-if", "once_cell", @@ -9400,9 +9461,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.93" +version = "0.2.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +checksum = "c4bfab14ef75323f4eb75fa52ee0a3fb59611977fd3240da19b2cf36ff85030e" dependencies = [ "bumpalo", "log", @@ -9415,9 +9476,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.43" +version = "0.4.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" +checksum = "65471f79c1022ffa5291d33520cbbb53b7687b01c2f8e83b57d102eed7ed479d" dependencies = [ "cfg-if", "js-sys", @@ -9427,9 +9488,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.93" +version = "0.2.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +checksum = "a7bec9830f60924d9ceb3ef99d55c155be8afa76954edffbb5936ff4509474e7" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -9437,9 +9498,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.93" +version = "0.2.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +checksum = "4c74f6e152a76a2ad448e223b0fc0b6b5747649c3d769cc6bf45737bf97d0ed6" dependencies = [ "proc-macro2", "quote", @@ -9450,9 +9511,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.93" +version = "0.2.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" +checksum = "a42f6c679374623f295a8623adfe63d9284091245c3504bde47c17a3ce2777d9" [[package]] name = "wasm-streams" @@ -9616,9 +9677,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.70" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +checksum = "44188d185b5bdcae1052d08bcbcf9091a5524038d4572cc4f4f2bb9d5554ddd9" dependencies = [ "js-sys", "wasm-bindgen", @@ -10821,6 +10882,30 @@ dependencies = [ "zvariant 4.2.0", ] +[[package]] +name = "zbus-lockstep" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca2c5dceb099bddaade154055c926bb8ae507a18756ba1d8963fd7b51d8ed1d" +dependencies = [ + "zbus_xml", + "zvariant 4.2.0", +] + +[[package]] +name = "zbus-lockstep-macros" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "709ab20fc57cb22af85be7b360239563209258430bccf38d8b979c5a2ae3ecce" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", + "zbus-lockstep", + "zbus_xml", + "zvariant 4.2.0", +] + [[package]] name = "zbus_macros" version = "3.15.2" @@ -10870,6 +10955,19 @@ dependencies = [ "zvariant 4.2.0", ] +[[package]] +name = "zbus_xml" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab3f374552b954f6abb4bd6ce979e6c9b38fb9d0cd7cc68a7d796e70c9f3a233" +dependencies = [ + "quick-xml 0.30.0", + "serde", + "static_assertions", + "zbus_names 3.0.0", + "zvariant 4.2.0", +] + [[package]] name = "zerocopy" version = "0.7.35" diff --git a/bindings/packager/nodejs/CHANGELOG.md b/bindings/packager/nodejs/CHANGELOG.md index ddef8e33..524b6406 100644 --- a/bindings/packager/nodejs/CHANGELOG.md +++ b/bindings/packager/nodejs/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## \[0.11.1] + +- [`4523722`](https://www.github.com/crabnebula-dev/cargo-packager/commit/4523722d0808faef4a91dbb227badd0354f4c71a) ([#283](https://www.github.com/crabnebula-dev/cargo-packager/pull/283)) Fixes resources paths on NSIS when cross compiling. + +### Dependencies + +- Upgraded to `cargo-packager@0.11.1` + ## \[0.11.0] - [`41b05d0`](https://www.github.com/crabnebula-dev/cargo-packager/commit/41b05d08a635d593df4cf4eefbe921b92ace77b7) ([#277](https://www.github.com/crabnebula-dev/cargo-packager/pull/277)) Add `--target` flag to specify target triple to package. diff --git a/bindings/packager/nodejs/package.json b/bindings/packager/nodejs/package.json index dc092061..ab3f92bd 100644 --- a/bindings/packager/nodejs/package.json +++ b/bindings/packager/nodejs/package.json @@ -1,6 +1,6 @@ { "name": "@crabnebula/packager", - "version": "0.11.0", + "version": "0.11.1", "main": "build/index.js", "module": "build/index.js", "types": "build/index.d.ts", diff --git a/crates/packager/CHANGELOG.md b/crates/packager/CHANGELOG.md index 1e224629..1be67b48 100644 --- a/crates/packager/CHANGELOG.md +++ b/crates/packager/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[0.11.1] + +- [`4523722`](https://www.github.com/crabnebula-dev/cargo-packager/commit/4523722d0808faef4a91dbb227badd0354f4c71a) ([#283](https://www.github.com/crabnebula-dev/cargo-packager/pull/283)) Fixes resources paths on NSIS when cross compiling. + ## \[0.11.0] - [`41b05d0`](https://www.github.com/crabnebula-dev/cargo-packager/commit/41b05d08a635d593df4cf4eefbe921b92ace77b7) ([#277](https://www.github.com/crabnebula-dev/cargo-packager/pull/277)) Respect `target-triple` config option when packaging rust binaries. diff --git a/crates/packager/Cargo.toml b/crates/packager/Cargo.toml index ceecd44b..2c985fb8 100644 --- a/crates/packager/Cargo.toml +++ b/crates/packager/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cargo-packager" -version = "0.11.0" +version = "0.11.1" description = "Executable packager and bundler distributed as a CLI and library." authors = [ "CrabNebula Ltd.",