From 6289e1539ac16e3cfaf12304c2baee87816dbef5 Mon Sep 17 00:00:00 2001 From: Kevin Yue Date: Wed, 6 May 2026 22:14:51 +0800 Subject: [PATCH] build: use vendored openconnect dependencies --- README.md | 2 +- packaging/deb/control.in | 12 ++++++++++++ packaging/pkgbuild/PKGBUILD.in | 4 ++-- packaging/rpm/globalprotect-openconnect.spec.in | 8 ++++++++ 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index e0d8781..7b81f1f 100644 --- a/README.md +++ b/README.md @@ -332,7 +332,7 @@ This project includes a DevContainer configuration that provides a consistent, r - [Rust 1.89 or later](https://www.rust-lang.org/tools/install) - [Tauri dependencies](https://tauri.app/start/prerequisites/) -- `libopenconnect-dev` (or `openconnect-devel` on RPM-based systems) +- OpenConnect source-build dependencies: `autoconf`, `automake`, `autopoint`/`gettext`, `libtool`, `patch`, `pkg-config`, `libxml2`, `zlib`, `lz4`, `gnutls`, `p11-kit`, `nettle`, and `gmp` development packages - `pkexec` and `gnome-keyring` (or `pam_kwallet` on KDE) - `nodejs` and `pnpm` (optional) diff --git a/packaging/deb/control.in b/packaging/deb/control.in index d3ea73f..2f85d05 100644 --- a/packaging/deb/control.in +++ b/packaging/deb/control.in @@ -4,9 +4,21 @@ Priority: optional Maintainer: Kevin Yue Standards-Version: 4.1.4 Build-Depends: debhelper (>= 9), + autoconf, + automake, + autopoint, + libtool, + patch, pkg-config, make (>= 4), libssl-dev, + libxml2-dev, + zlib1g-dev, + liblz4-dev, + libgnutls28-dev, + libp11-kit-dev, + nettle-dev, + libgmp-dev, libsecret-1-0, libayatana-appindicator3-1, gnome-keyring, diff --git a/packaging/pkgbuild/PKGBUILD.in b/packaging/pkgbuild/PKGBUILD.in index 1900753..3971900 100644 --- a/packaging/pkgbuild/PKGBUILD.in +++ b/packaging/pkgbuild/PKGBUILD.in @@ -8,9 +8,9 @@ pkgdesc="A GUI client for GlobalProtect VPN, based on OpenConnect, supports the arch=('x86_64' 'aarch64') url="https://github.com/yuezk/GlobalProtect-openconnect" license=('GPL3') -makedepends=('make' 'pkg-config' 'cargo' 'file') +makedepends=('make' 'pkg-config' 'cargo' 'file' 'autoconf' 'automake' 'gettext' 'libtool' 'patch') depends=('webkit2gtk-4.1' 'libappindicator-gtk3' 'librsvg' 'libsecret' 'openssl' 'appmenu-gtk-module' - 'gnutls' 'libxml2' 'lz4' 'libp11-kit' 'nettle' 'xdg-utils') + 'gnutls' 'libxml2' 'zlib' 'lz4' 'libp11-kit' 'nettle' 'gmp' 'xdg-utils') optdepends=('wmctrl: for window management') provides=('globalprotect-openconnect' 'gpclient' 'gpservice' 'gpauth' 'gpgui') diff --git a/packaging/rpm/globalprotect-openconnect.spec.in b/packaging/rpm/globalprotect-openconnect.spec.in index 697903a..20a8128 100644 --- a/packaging/rpm/globalprotect-openconnect.spec.in +++ b/packaging/rpm/globalprotect-openconnect.spec.in @@ -12,10 +12,18 @@ BuildRequires: make BuildRequires: libtool BuildRequires: autoconf BuildRequires: automake +BuildRequires: gettext BuildRequires: gcc-c++ BuildRequires: cargo BuildRequires: pkg-config BuildRequires: (openssl-devel or libopenssl-devel) +BuildRequires: libxml2-devel +BuildRequires: zlib-devel +BuildRequires: (lz4-devel or liblz4-devel) +BuildRequires: gnutls-devel +BuildRequires: p11-kit-devel +BuildRequires: (nettle-devel or libnettle-devel) +BuildRequires: gmp-devel BuildRequires: wget BuildRequires: file BuildRequires: perl