summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authordatabase641282022-01-15 03:33:52 +0800
committerdatabase641282022-01-15 03:33:52 +0800
commit6ccf0048cba5ea5d2dd79162cff9c3bd29ab0bfd (patch)
treef1e2f99381af495109d2af2ca1c7f98715718588
parent1d83675abdd3a753fbb8855943d97e3597f19a29 (diff)
downloadaur-6ccf0048cba5ea5d2dd79162cff9c3bd29ab0bfd.tar.gz
🧳 Use packaged libqv2ray-git
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD14
2 files changed, 12 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0634ed0fd7ca..10baf10baf8f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = qv2ray-git
pkgdesc = A cross platform connection manager for V2Ray and other backends
- pkgver = 3.0.0.rc1.r18.gdac7ed16
+ pkgver = 3.0.0.rc1.r19.g7898f0e2
pkgrel = 1
url = https://github.com/Shadowsocks-NET/Qv2ray
arch = x86_64
@@ -16,6 +16,7 @@ pkgbase = qv2ray-git
makedepends = which
depends = grpc
depends = hicolor-icon-theme
+ depends = libqv2ray-git
depends = protobuf
depends = qt6-base
depends = qt6-svg
diff --git a/PKGBUILD b/PKGBUILD
index 67cb9b65766c..8e83b229fe6f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,12 @@
# Maintainer: database64128 <free122448@hotmail.com>
pkgname=qv2ray-git
-pkgver=3.0.0.rc1.r18.gdac7ed16
+pkgver=3.0.0.rc1.r19.g7898f0e2
pkgrel=1
pkgdesc="A cross platform connection manager for V2Ray and other backends"
arch=(x86_64)
url="https://github.com/Shadowsocks-NET/Qv2ray"
license=('GPL3')
-depends=('grpc' 'hicolor-icon-theme' 'protobuf' 'qt6-base' 'qt6-svg')
+depends=('grpc' 'hicolor-icon-theme' 'libqv2ray-git' 'protobuf' 'qt6-base' 'qt6-svg')
makedepends=('cmake' 'gcc' 'git' 'grpc-cli' 'make' 'ninja' 'qt6-declarative' 'qt6-tools' 'which')
optdepends=('qt6-wayland: Wayland support (experimental)' 'v2ray: use packaged v2ray')
provides=('qv2ray')
@@ -21,7 +21,12 @@ pkgver() {
prepare() {
cd "$srcdir/$pkgname"
- git submodule update --init --recursive
+ git submodule update --init --recursive \
+ 3rdparty/SingleApplication \
+ 3rdparty/QCodeEditor \
+ 3rdparty/qt-qrcode \
+ src/plugins/v2ray/3rdparty/v2ray-core \
+ src/plugins/routingA/core
}
build() {
@@ -31,11 +36,12 @@ build() {
-DBUILD_TESTING=OFF \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=${pkgdir}/usr \
+ -DQV2RAY_AUTO_UPDATE=OFF \
-DQV2RAY_BUILD_INFO="qv2ray-git AUR package" \
-DQV2RAY_BUILD_EXTRA_INFO="r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)" \
-DQV2RAY_DEFAULT_VASSETS_PATH="/usr/share/v2ray" \
-DQV2RAY_DEFAULT_VCORE_PATH="/usr/bin/v2ray" \
- -DQV2RAY_AUTO_UPDATE=OFF \
+ -DQV2RAY_QV2RAYBASE_PROVIDER=package \
-GNinja
cmake --build . --parallel
}