0.1.3-2

3 files changed, 74 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e5ab8aaaa86b..9ab2dfa8db50 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,35 +1,30 @@
 pkgbase = across
 	pkgdesc = The next GUI client for v2ray core
 	pkgver = 0.1.3
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/ArkToria/ACross
 	arch = x86_64
-	license = GPL3
-	makedepends = git
-	makedepends = cmake
+	license = GPL-3.0-only
 	makedepends = clang
-	makedepends = ninja
+	makedepends = cmake
 	makedepends = gcc
+	makedepends = git
 	makedepends = gtest
-	depends = hicolor-icon-theme
-	depends = qt6-base
-	depends = qt6-svg
-	depends = qt6-quickcontrols2
-	depends = qt6-translations
-	depends = qt6-tools
-	depends = qt6-imageformats
-	depends = qt6-5compat
+	makedepends = ninja
+	makedepends = nlohmann-json
+	makedepends = qt6-tools
 	depends = curl
 	depends = fmt
 	depends = grpc
-	depends = nlohmann-json
+	depends = hicolor-icon-theme
 	depends = protobuf
+	depends = qt6-5compat
+	depends = qt6-base
+	depends = qt6-quickcontrols2
 	depends = spdlog
 	depends = zxing-cpp
-	depends = clang
 	optdepends = v2ray: use system v2ray core.
 	optdepends = noto-fonts: default display fonts
-	provides = across
 	source = across-0.1.3.tar.gz::https://github.com/ArkToria/ACross/archive/refs/tags/v0.1.3.tar.gz
 	sha256sums = 5010a2473a4e25f4fcd329ca6ff54912157744f53a3b890fcd6f80c177172b32
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..018a3de08144
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*
+!PKGBUILD
+!.SRCINFO
+!.gitignore
diff --git a/PKGBUILD b/PKGBUILD
index fb502fb61d61..b567bde2213e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,70 @@
-# Maintainer: DuckSoft <realducksoft@gmail.com>
-pkgname=across
-_pkgname=ACross
+# Maintainer:
+# Contributor: DuckSoft <realducksoft@gmail.com>
+
+_pkgname="across"
+pkgname="$_pkgname"
 pkgver=0.1.3
-pkgrel=1
+pkgrel=2
 pkgdesc="The next GUI client for v2ray core"
+url="https://github.com/ArkToria/ACross"
+license=('GPL-3.0-only')
 arch=('x86_64')
-url='https://github.com/ArkToria/ACross'
-license=('GPL3')
-depends=('hicolor-icon-theme' 'qt6-base' 'qt6-svg' 'qt6-quickcontrols2' 'qt6-translations'
-    'qt6-tools' 'qt6-imageformats' 'qt6-5compat' 'curl' 'fmt' 'grpc'
-    'nlohmann-json' 'protobuf' 'spdlog' 'zxing-cpp' 'clang')
-makedepends=('git' 'cmake' 'clang' 'ninja' 'gcc' 'gtest')
-optdepends=('v2ray: use system v2ray core.'
-    'noto-fonts: default display fonts')
-provides=('across')
-
-source=("across-${pkgver}.tar.gz::https://github.com/ArkToria/ACross/archive/refs/tags/v${pkgver}.tar.gz")
 
+depends=(
+  'curl'
+  'fmt'
+  'grpc'
+  'hicolor-icon-theme'
+  'protobuf'
+  'qt6-5compat'
+  'qt6-base'
+  'qt6-quickcontrols2'
+  'spdlog'
+  'zxing-cpp'
+)
+makedepends=(
+  'clang'
+  'cmake'
+  'gcc'
+  'git'
+  'gtest'
+  'ninja'
+  'nlohmann-json'
+  'qt6-tools'
+)
+optdepends=(
+  'v2ray: use system v2ray core.'
+  'noto-fonts: default display fonts'
+)
+
+_pkgsrc="ACross-$pkgver"
+_pkgext="tar.gz"
+source=("$_pkgname-$pkgver.$_pkgext"::"$url/archive/refs/tags/v$pkgver.$_pkgext")
 sha256sums=('5010a2473a4e25f4fcd329ca6ff54912157744f53a3b890fcd6f80c177172b32')
 
+prepare() {
+  local _ver_zxing="2.2.1"
+
+  sed -E \
+    -e '/zxing-cpp/{n;s&^(\s*VERSION) [0-9\.]+$&\1 '"${_ver_zxing}"'&}' \
+    -i "$_pkgsrc/CMakeLists.txt"
+}
+
 build() {
-    cd "${srcdir}/${_pkgname}-${pkgver}/"
-
-    mkdir -p build && cd build
-    cmake .. \
-        -DCMAKE_INSTALL_PREFIX=${pkgdir}/usr \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DBUILD_INFO="Arch Linux - ${pkgver}" \
-        -GNinja
-    ninja
+  local _cmake_options=(
+    -B build
+    -S "$_pkgsrc"
+    -G Ninja
+    -DCMAKE_BUILD_TYPE=None
+    -DCMAKE_INSTALL_PREFIX='/usr'
+    -DBUILD_INFO="Arch Linux - $pkgver"
+    -Wno-dev
+  )
+
+  cmake "${_cmake_options[@]}"
+  cmake --build build
 }
 
 package() {
-    cd "${srcdir}/${_pkgname}-${pkgver}"
-    ninja -C "build" install
+  DESTDIR="$pkgdir" cmake --install build
 }