fix(ci): restore BSD builds and OpenBSD dependencies

This commit is contained in:
Kevin Yue committed 2026-09-30 16:19:00 +08:00
1 parent b5f3bac256
commit cc43a88ade
5 files changed
+32 -14

No files matched your search

+5 -5
View File
@@ -595,7 +595,9 @@ jobs:
arch: ${{ matrix.arch }}
usesh: true
prepare: |
pkg_add -z \
set -eu
pkg_add -u -I
pkg_add -I \
git \
rust \
libiconv \
@@ -603,16 +605,14 @@ jobs:
autoconf-2.72 \
automake-1.17 \
libtool \
patch \
gmake \
pkgconf \
libxml \
gnutls \
p11-kit \
nettle \
gmp \
lz4 \
dbus \
gnome-keyring \
libappindicator \
polkit \
webkitgtk41 \
xdg-utils
Generated
+13 -4
View File
@@ -4823,8 +4823,7 @@ dependencies = [
[[package]]
name = "tao"
version = "0.37.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f37f381f4e048e6cdf038b5705f8cf14ad108279d46eb968140a7b291aba9400"
source = "git+https://github.com/yuezk/tao?rev=1452ae7a42c9f134296ba199f91f514fc9077f61#1452ae7a42c9f134296ba199f91f514fc9077f61"
dependencies = [
"bitflags 2.13.2",
"block2",
@@ -4851,7 +4850,7 @@ dependencies = [
"parking_lot",
"percent-encoding",
"raw-window-handle",
"tao-macros",
"tao-macros 0.1.4 (git+https://github.com/yuezk/tao?rev=1452ae7a42c9f134296ba199f91f514fc9077f61)",
"unicode-segmentation",
"url",
"windows 0.62.2",
@@ -4871,6 +4870,16 @@ dependencies = [
"syn 2.0.119",
]
[[package]]
name = "tao-macros"
version = "0.1.4"
source = "git+https://github.com/yuezk/tao?rev=1452ae7a42c9f134296ba199f91f514fc9077f61#1452ae7a42c9f134296ba199f91f514fc9077f61"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.119",
]
[[package]]
name = "tar"
version = "0.4.46"
@@ -6540,7 +6549,7 @@ dependencies = [
"raw-window-handle",
"sha2",
"soup3",
"tao-macros",
"tao-macros 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
"thiserror 2.0.21",
"url",
"webkit2gtk",
+4
View File
@@ -67,6 +67,10 @@ tauri = { version = "2" }
specta = "=2.0.0-rc.20"
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" }
[profile.release]
opt-level = 'z' # Optimize for size
lto = true # Enable link-time optimization
+2 -2
View File
@@ -276,7 +276,7 @@ package-openbsd: clean-bsd-package
comment=$$(cat .build/openbsd/+COMMENT); \
openbsd_arch=$$(uname -m | sed 's/x86_64/amd64/'); \
gnome_keyring_pkg=$$(pkg_info -e 'gnome-keyring-*' | sed 's/^inst://' | head -n 1); \
libappindicator_pkg=$$(pkg_info -e 'libappindicator-*' | sed 's/^inst://' | head -n 1); \
dbus_pkg=$$(pkg_info -e 'dbus-*' | sed 's/^inst://' | head -n 1); \
polkit_pkg=$$(pkg_info -e 'polkit-*' | sed 's/^inst://' | head -n 1); \
webkitgtk_pkg=$$(pkg_info -e 'webkitgtk41-*' | sed 's/^inst://' | head -n 1); \
xdg_utils_pkg=$$(pkg_info -e 'xdg-utils-*' | sed 's/^inst://' | head -n 1); \
@@ -287,7 +287,7 @@ package-openbsd: clean-bsd-package
-f .build/openbsd/PLIST \
-p $(PREFIX) \
-P x11/gnome/keyring:gnome-keyring-*:$$gnome_keyring_pkg \
-P x11/libappindicator:libappindicator-*:$$libappindicator_pkg \
-P x11/dbus:dbus-*:$$dbus_pkg \
-P sysutils/polkit:polkit-*:$$polkit_pkg \
-P www/webkitgtk4,webkitgtk41:webkitgtk41-*:$$webkitgtk_pkg \
-P devel/xdg-utils:xdg-utils-*:$$xdg_utils_pkg \
+8 -3
View File
@@ -43,11 +43,16 @@ gpauth --version
Install build and runtime dependencies:
```sh
doas pkg_add git rust libiconv gettext-tools autoconf-2.72 automake-1.17 \
libtool patch gmake pkgconf libxml gnutls p11-kit nettle gmp \
gnome-keyring libappindicator polkit webkitgtk41 xdg-utils
doas pkg_add -u -I
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
```
OpenBSD provides `patch` and `pkg-config` in the base system. GnuTLS installs
Nettle as a dependency. The separately built GUI uses a D-Bus StatusNotifier
tray backend on OpenBSD and requires a desktop with StatusNotifier support.
Use the installed Autoconf and Automake versions:
```sh