patch 0.12.0 to skip git operations

3 files changed, 32 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 06b28d3ce8e4..a35755aa8f8e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -10,14 +10,19 @@ pkgbase = deltachat-desktop
 	makedepends = git
 	makedepends = rustup
 	makedepends = python
+	makedepends = unzip
 	depends = electron6
 	conflicts = deltachat-desktop-git
 	source = deltachat-desktop-1.12.0.tar.gz::https://github.com/deltachat/deltachat-desktop/archive/v1.12.0.tar.gz
 	source = deltachat-desktop.desktop
 	source = deltachat-desktop.sh
+	source = basicwebrtc.zip::https://github.com/cracker0dks/basicwebrtc/archive/7a339f7f164b9b1ecbca740121874bf71d57ca50.zip
+	source = remove_git_submodule.patch
 	sha256sums = 074d31f7691b58e74ee0421172c5a44bce65eafdc7c9cd62e8d4914d46f173bb
 	sha256sums = 39bae164c234b3c89e7ae2bde89753c90065df7f37fece084f7f5acccbb9f1f1
 	sha256sums = 5e20ea657599390e317523ae17b17aba0d26c59474a7f80282af5f2668002f59
+	sha256sums = 5b1bf04faef913980b9bfd0e60be9113edb47a718e8f18c8dab58ee4f3d75c6e
+	sha256sums = 12815b12e001ffc72943eba955e7c715856b43f8e62ec4ef880893f19acef9d9
 
 pkgname = deltachat-desktop
 
diff --git a/PKGBUILD b/PKGBUILD
index 246d577b147e..9a24088879a6 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,18 +8,31 @@ arch=("any")
 url="https://github.com/deltachat/deltachat-desktop"
 license=("GPL")
 depends=('electron6')
-makedepends=('npm' 'nodejs' 'git' 'rustup' 'python')
+makedepends=('npm' 'nodejs' 'git' 'rustup' 'python' 'unzip')
 conflicts=("deltachat-desktop-git")
+_basicwebrtc_commit=7a339f7f164b9b1ecbca740121874bf71d57ca50
 source=(
     "deltachat-desktop-${pkgver}.tar.gz::https://github.com/deltachat/deltachat-desktop/archive/v${pkgver}.tar.gz"
     "deltachat-desktop.desktop"
     "deltachat-desktop.sh"
+    "basicwebrtc.zip::https://github.com/cracker0dks/basicwebrtc/archive/$_basicwebrtc_commit.zip"
+    "remove_git_submodule.patch"
 )
 
 sha256sums=('074d31f7691b58e74ee0421172c5a44bce65eafdc7c9cd62e8d4914d46f173bb'
             '39bae164c234b3c89e7ae2bde89753c90065df7f37fece084f7f5acccbb9f1f1'
-            '5e20ea657599390e317523ae17b17aba0d26c59474a7f80282af5f2668002f59')
+            '5e20ea657599390e317523ae17b17aba0d26c59474a7f80282af5f2668002f59'
+            '5b1bf04faef913980b9bfd0e60be9113edb47a718e8f18c8dab58ee4f3d75c6e'
+            '12815b12e001ffc72943eba955e7c715856b43f8e62ec4ef880893f19acef9d9')
 
+prepare() {
+    cd "$srcdir/${pkgname}-${pkgver}"
+    unzip $srcdir/basicwebrtc.zip
+    rm -rf basicwebrtc
+    mv basicwebrtc-master basicwebrtc
+
+    patch --forward --strip=1 --input="${srcdir}/remove_git_submodule.patch"
+}
 
 build() {
     cd "$srcdir/${pkgname}-${pkgver}"
diff --git a/remove_git_submodule.patch b/remove_git_submodule.patch
new file mode 100644
index 000000000000..6b06272b3896
--- /dev/null
+++ b/remove_git_submodule.patch
@@ -0,0 +1,12 @@
+diff --unified --recursive --text deltachat-desktop-1.12.0.orig/package.json deltachat-desktop-1.12.0.patched/package.json
+--- deltachat-desktop-1.12.0.orig/package.json	2020-07-31 21:46:01.000000000 +0200
++++ deltachat-desktop-1.12.0.patched/package.json	2020-08-04 20:30:00.188436997 +0200
+@@ -4,8 +4,6 @@
+   "description": "Desktop Application for delta.chat",
+   "main": "index.js",
+   "scripts": {
+-    "install": "npm run install:submodules",
+-    "install:submodules": "git submodule update --recursive --init",
+     "test": "npm run check-formatting && npm run test-log-conventions && npm run test-unit",
+     "test-log-conventions": "node ./bin/log-conventions",
+     "test-unit": "node test/unit",