add submodules to sources

3 files changed, 43 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 10baf10baf8f..415d4b30b704 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -26,6 +26,18 @@ pkgbase = qv2ray-git
 	conflicts = qv2ray
 	conflicts = xray
 	source = qv2ray-git::git+https://github.com/Shadowsocks-NET/Qv2ray.git
+	source = git+https://github.com/itay-grudev/SingleApplication.git
+	source = git+https://github.com/cpeditor/QCodeEditor.git
+	source = git+https://github.com/danielsanfr/qt-qrcode.git
+	source = git+https://github.com/xiaokangwang/v2ray-core-1.git
+	source = git+https://github.com/moodyhunter/libRoutingA.git
+	source = git+https://github.com/fukuchi/libqrencode.git
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
 	sha512sums = SKIP
 
 pkgname = qv2ray-git
diff --git a/.gitignore b/.gitignore
index 8a0864add897..279dfc8b7e4c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,3 @@
-pkg/
-src/
-qv2ray-git/
+*/
 
-*.tar.zst
+*.tar*
diff --git a/PKGBUILD b/PKGBUILD
index 8e83b229fe6f..71fc9fd9378d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,6 @@
 # Maintainer: database64128 <free122448@hotmail.com>
+# Contributor: Sam L. Yes <samlukeyes123 at gmail dot com>
+
 pkgname=qv2ray-git
 pkgver=3.0.0.rc1.r19.g7898f0e2
 pkgrel=1
@@ -11,22 +13,46 @@ makedepends=('cmake' 'gcc' 'git' 'grpc-cli' 'make' 'ninja' 'qt6-declarative' 'qt
 optdepends=('qt6-wayland: Wayland support (experimental)' 'v2ray: use packaged v2ray')
 provides=('qv2ray')
 conflicts=('qv2ray' 'xray')
-source=("$pkgname::git+$url.git")
-sha512sums=('SKIP')
+source=(
+    "$pkgname::git+$url.git"
+    "git+https://github.com/itay-grudev/SingleApplication.git"
+    "git+https://github.com/cpeditor/QCodeEditor.git"
+    "git+https://github.com/danielsanfr/qt-qrcode.git"
+    "git+https://github.com/xiaokangwang/v2ray-core-1.git"
+    "git+https://github.com/moodyhunter/libRoutingA.git"
+    "git+https://github.com/fukuchi/libqrencode.git"
+)
+sha512sums=(
+    'SKIP'
+    'SKIP'
+    'SKIP'
+    'SKIP'
+    'SKIP'
+    'SKIP'
+    'SKIP'
+)
 
 pkgver() {
     cd "$srcdir/$pkgname"
     git describe --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
+patch_gitmodules() {
+    sed -i "s|https://github.com/.*/|${srcdir}/|;s|\.git||" .gitmodules
+}
+
 prepare() {
     cd "$srcdir/$pkgname"
-    git submodule update --init --recursive \
+    patch_gitmodules
+    git submodule update --init \
         3rdparty/SingleApplication \
         3rdparty/QCodeEditor \
         3rdparty/qt-qrcode \
         src/plugins/v2ray/3rdparty/v2ray-core \
         src/plugins/routingA/core
+    cd 3rdparty/qt-qrcode
+    patch_gitmodules
+    git submodule update --init
 }
 
 build() {