diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index e112548..e92100b 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -602,8 +602,8 @@ jobs: rust \ libiconv \ gettext-tools \ - autoconf-2.72 \ - automake-1.17 \ + autoconf%2.72 \ + automake%1.17 \ libtool \ gmake \ libxml \ diff --git a/Cargo.lock b/Cargo.lock index 0b501fa..b078751 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4850,7 +4850,7 @@ dependencies = [ "parking_lot", "percent-encoding", "raw-window-handle", - "tao-macros 0.1.4 (git+https://github.com/yuezk/tao?rev=1452ae7a42c9f134296ba199f91f514fc9077f61)", + "tao-macros", "unicode-segmentation", "url", "windows 0.62.2", @@ -4859,17 +4859,6 @@ dependencies = [ "x11-dl", ] -[[package]] -name = "tao-macros" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f7eeb6d99155545da6150a1795945f16ac9c178deb2a5f2e74d776107bd5849" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.119", -] - [[package]] name = "tao-macros" version = "0.1.4" @@ -6549,7 +6538,7 @@ dependencies = [ "raw-window-handle", "sha2", "soup3", - "tao-macros 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "tao-macros", "thiserror 2.0.21", "url", "webkit2gtk", diff --git a/Cargo.toml b/Cargo.toml index 40ce453..9b9080f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -70,6 +70,8 @@ proptest = "1" [patch.crates-io] # Restore BSD GTK resize hit testing until https://github.com/tauri-apps/tao/pull/1356 is released. tao = { git = "https://github.com/yuezk/tao", rev = "1452ae7a42c9f134296ba199f91f514fc9077f61" } +# Use one macro source for Tao and Wry so Cargo can vendor the workspace. +tao-macros = { git = "https://github.com/yuezk/tao", rev = "1452ae7a42c9f134296ba199f91f514fc9077f61" } [profile.release] opt-level = 'z' # Optimize for size diff --git a/docs/bsd-source-build.md b/docs/bsd-source-build.md index 96a2bbe..5367031 100644 --- a/docs/bsd-source-build.md +++ b/docs/bsd-source-build.md @@ -44,7 +44,7 @@ Install build and runtime dependencies: ```sh doas pkg_add -u -I -doas pkg_add -I git rust libiconv gettext-tools autoconf-2.72 automake-1.17 \ +doas pkg_add -I git rust libiconv gettext-tools autoconf%2.72 automake%1.17 \ libtool gmake libxml gnutls p11-kit gmp lz4 dbus \ gnome-keyring polkit webkitgtk41 xdg-utils ```