mirror of
https://github.com/yuezk/GlobalProtect-openconnect.git
synced 2026-11-19 22:46:14 -05:00
fix(ci): restore BSD builds and OpenBSD dependencies
This commit is contained in:
5 files changed
+32
-14
No files matched your search
@@ -595,7 +595,9 @@ jobs:
|
|||||||
arch: ${{ matrix.arch }}
|
arch: ${{ matrix.arch }}
|
||||||
usesh: true
|
usesh: true
|
||||||
prepare: |
|
prepare: |
|
||||||
pkg_add -z \
|
set -eu
|
||||||
|
pkg_add -u -I
|
||||||
|
pkg_add -I \
|
||||||
git \
|
git \
|
||||||
rust \
|
rust \
|
||||||
libiconv \
|
libiconv \
|
||||||
@@ -603,16 +605,14 @@ jobs:
|
|||||||
autoconf-2.72 \
|
autoconf-2.72 \
|
||||||
automake-1.17 \
|
automake-1.17 \
|
||||||
libtool \
|
libtool \
|
||||||
patch \
|
|
||||||
gmake \
|
gmake \
|
||||||
pkgconf \
|
|
||||||
libxml \
|
libxml \
|
||||||
gnutls \
|
gnutls \
|
||||||
p11-kit \
|
p11-kit \
|
||||||
nettle \
|
|
||||||
gmp \
|
gmp \
|
||||||
|
lz4 \
|
||||||
|
dbus \
|
||||||
gnome-keyring \
|
gnome-keyring \
|
||||||
libappindicator \
|
|
||||||
polkit \
|
polkit \
|
||||||
webkitgtk41 \
|
webkitgtk41 \
|
||||||
xdg-utils
|
xdg-utils
|
||||||
|
|||||||
Generated
+13
-4
@@ -4823,8 +4823,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "tao"
|
name = "tao"
|
||||||
version = "0.37.1"
|
version = "0.37.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "git+https://github.com/yuezk/tao?rev=1452ae7a42c9f134296ba199f91f514fc9077f61#1452ae7a42c9f134296ba199f91f514fc9077f61"
|
||||||
checksum = "f37f381f4e048e6cdf038b5705f8cf14ad108279d46eb968140a7b291aba9400"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.13.2",
|
"bitflags 2.13.2",
|
||||||
"block2",
|
"block2",
|
||||||
@@ -4851,7 +4850,7 @@ dependencies = [
|
|||||||
"parking_lot",
|
"parking_lot",
|
||||||
"percent-encoding",
|
"percent-encoding",
|
||||||
"raw-window-handle",
|
"raw-window-handle",
|
||||||
"tao-macros",
|
"tao-macros 0.1.4 (git+https://github.com/yuezk/tao?rev=1452ae7a42c9f134296ba199f91f514fc9077f61)",
|
||||||
"unicode-segmentation",
|
"unicode-segmentation",
|
||||||
"url",
|
"url",
|
||||||
"windows 0.62.2",
|
"windows 0.62.2",
|
||||||
@@ -4871,6 +4870,16 @@ dependencies = [
|
|||||||
"syn 2.0.119",
|
"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]]
|
[[package]]
|
||||||
name = "tar"
|
name = "tar"
|
||||||
version = "0.4.46"
|
version = "0.4.46"
|
||||||
@@ -6540,7 +6549,7 @@ dependencies = [
|
|||||||
"raw-window-handle",
|
"raw-window-handle",
|
||||||
"sha2",
|
"sha2",
|
||||||
"soup3",
|
"soup3",
|
||||||
"tao-macros",
|
"tao-macros 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"thiserror 2.0.21",
|
"thiserror 2.0.21",
|
||||||
"url",
|
"url",
|
||||||
"webkit2gtk",
|
"webkit2gtk",
|
||||||
|
|||||||
@@ -67,6 +67,10 @@ tauri = { version = "2" }
|
|||||||
specta = "=2.0.0-rc.20"
|
specta = "=2.0.0-rc.20"
|
||||||
proptest = "1"
|
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]
|
[profile.release]
|
||||||
opt-level = 'z' # Optimize for size
|
opt-level = 'z' # Optimize for size
|
||||||
lto = true # Enable link-time optimization
|
lto = true # Enable link-time optimization
|
||||||
|
|||||||
@@ -276,7 +276,7 @@ package-openbsd: clean-bsd-package
|
|||||||
comment=$$(cat .build/openbsd/+COMMENT); \
|
comment=$$(cat .build/openbsd/+COMMENT); \
|
||||||
openbsd_arch=$$(uname -m | sed 's/x86_64/amd64/'); \
|
openbsd_arch=$$(uname -m | sed 's/x86_64/amd64/'); \
|
||||||
gnome_keyring_pkg=$$(pkg_info -e 'gnome-keyring-*' | sed 's/^inst://' | head -n 1); \
|
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); \
|
polkit_pkg=$$(pkg_info -e 'polkit-*' | sed 's/^inst://' | head -n 1); \
|
||||||
webkitgtk_pkg=$$(pkg_info -e 'webkitgtk41-*' | 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); \
|
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 \
|
-f .build/openbsd/PLIST \
|
||||||
-p $(PREFIX) \
|
-p $(PREFIX) \
|
||||||
-P x11/gnome/keyring:gnome-keyring-*:$$gnome_keyring_pkg \
|
-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 sysutils/polkit:polkit-*:$$polkit_pkg \
|
||||||
-P www/webkitgtk4,webkitgtk41:webkitgtk41-*:$$webkitgtk_pkg \
|
-P www/webkitgtk4,webkitgtk41:webkitgtk41-*:$$webkitgtk_pkg \
|
||||||
-P devel/xdg-utils:xdg-utils-*:$$xdg_utils_pkg \
|
-P devel/xdg-utils:xdg-utils-*:$$xdg_utils_pkg \
|
||||||
|
|||||||
@@ -43,11 +43,16 @@ gpauth --version
|
|||||||
Install build and runtime dependencies:
|
Install build and runtime dependencies:
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
doas pkg_add git rust libiconv gettext-tools autoconf-2.72 automake-1.17 \
|
doas pkg_add -u -I
|
||||||
libtool patch gmake pkgconf libxml gnutls p11-kit nettle gmp \
|
doas pkg_add -I git rust libiconv gettext-tools autoconf-2.72 automake-1.17 \
|
||||||
gnome-keyring libappindicator polkit webkitgtk41 xdg-utils
|
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:
|
Use the installed Autoconf and Automake versions:
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
|
|||||||
Reference in new issue
Block a user