1.20.2

4 files changed, 30 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bef2a4f2f140..508eb9e0e89d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = deltachat-desktop
 	pkgdesc = A privacy oriented chat application built on e-mail
 	pkgver = 1.20.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/deltachat/deltachat-desktop
 	arch = any
 	license = GPL
@@ -20,8 +20,8 @@ pkgbase = deltachat-desktop
 	sha256sums = aedc14d7b3339cf379112d7c5e67b70ba6ee58e826df56dafaf58c070c709540
 	sha256sums = 39bae164c234b3c89e7ae2bde89753c90065df7f37fece084f7f5acccbb9f1f1
 	sha256sums = c7d2c3675faa09bb568b7f7c10779971783b1a4f11a225db8b2846fc1a6b4e14
-	sha256sums = 1cf8e2277482c138439fb355f6b075ce357b893a00493d0393311384d627881a
-	sha256sums = 751767446cc6951c834a2c59a7bf3df9497635cb060845114948ef3edd587f15
+	sha256sums = c7aed1aa75a83eddeca9131261eb22b5ee5ac6c7bc06d68b70bd35739563e44c
+	sha256sums = 006a9f3179acb79843f98701cc0ebee739817130a9c6af3603c828a3a18c4843
 
 pkgname = deltachat-desktop
 
diff --git a/PKGBUILD b/PKGBUILD
index d193c2ee169b..294eb0d1aa33 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: tercean <cg@zknt.org>
 pkgname=deltachat-desktop
 pkgver=1.20.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A privacy oriented chat application built on e-mail"
 arch=("any")
 url="https://github.com/deltachat/deltachat-desktop"
@@ -20,8 +20,8 @@ source=(
 sha256sums=('aedc14d7b3339cf379112d7c5e67b70ba6ee58e826df56dafaf58c070c709540'
             '39bae164c234b3c89e7ae2bde89753c90065df7f37fece084f7f5acccbb9f1f1'
             'c7d2c3675faa09bb568b7f7c10779971783b1a4f11a225db8b2846fc1a6b4e14'
-            '1cf8e2277482c138439fb355f6b075ce357b893a00493d0393311384d627881a'
-            '751767446cc6951c834a2c59a7bf3df9497635cb060845114948ef3edd587f15')
+            'c7aed1aa75a83eddeca9131261eb22b5ee5ac6c7bc06d68b70bd35739563e44c'
+            '006a9f3179acb79843f98701cc0ebee739817130a9c6af3603c828a3a18c4843')
 
 prepare() {
     cd "$srcdir/${pkgname}-${pkgver}"
diff --git a/remove_git_submodule.patch b/remove_git_submodule.patch
index e4f83a47f3ba..860c5f319bb1 100644
--- a/remove_git_submodule.patch
+++ b/remove_git_submodule.patch
@@ -1,6 +1,6 @@
-diff --unified --recursive --text orig/package.json deltachat-desktop-1.15.3/package.json
---- orig/package.json	2021-03-18 13:55:27.000000000 +0100
-+++ deltachat-desktop-1.15.3/package.json	2021-03-18 19:48:25.361065415 +0100
+diff --unified --recursive --text orig/package.json patched/package.json
+--- orig/package.json	2021-06-04 12:23:59.000000000 +0200
++++ patched/package.json	2021-06-05 13:42:17.602981022 +0200
 @@ -4,8 +4,6 @@
    "description": "Desktop Application for delta.chat",
    "main": "index.js",
diff --git a/static_build_info.patch b/static_build_info.patch
index 56d6be31d3e5..7d193a9892de 100644
--- a/static_build_info.patch
+++ b/static_build_info.patch
@@ -1,7 +1,7 @@
-diff --unified --recursive --text a/bin/build-shared-version-info.js b/bin/build-shared-version-info.js
---- a/bin/build-shared-version-info.js	2021-02-13 11:36:03.000000000 +0100
-+++ b/bin/build-shared-version-info.js	2021-02-15 15:57:08.270159483 +0100
-@@ -2,36 +2,12 @@
+diff --unified --recursive --text orig/bin/build-shared-version-info.js patched/bin/build-shared-version-info.js
+--- orig/bin/build-shared-version-info.js	2021-06-04 12:23:59.000000000 +0200
++++ patched/bin/build-shared-version-info.js	2021-06-05 13:45:26.128357170 +0200
+@@ -2,40 +2,8 @@
  const fs = require('fs-extra')
  const { join } = require('path')
  
@@ -11,31 +11,35 @@ diff --unified --recursive --text a/bin/build-shared-version-info.js b/bin/build
 -  return stdout.toString().replace(/\n/g, '')
 -}
 -
- async function gatherBuildInfo() {
--  let git_describe, git_branch;
+ async function getGitRef() {
+-  if (process.env.VERSION_INFO_GIT_REF) {
+-    return process.env.VERSION_INFO_GIT_REF
+-  }
+-
+-  let git_describe, git_branch
 -  try {
 -    git_describe = gatherProcessStdout('git', ['describe'])
 -    try {
--      git_symbolic_ref = process.env.GITHUB_HEAD_REF || process.env.GITHUB_REF || gatherProcessStdout('git', ['symbolic-ref', 'HEAD'])
+-      git_symbolic_ref =
+-        process.env.GITHUB_HEAD_REF ||
+-        process.env.GITHUB_REF ||
+-        gatherProcessStdout('git', ['symbolic-ref', 'HEAD'])
 -      git_branch = git_symbolic_ref.split('/').pop()
 -      console.log(git_symbolic_ref, git_branch)
 -    } catch (err) {
 -      console.log(err)
--      git_branch = "master"
+-      git_branch = 'master'
 -    }
 -  } catch (err) {
 -    console.log(err)
+-    console.log('Hint: you can set the env var VERSION_INFO_GIT_REF manualy')
 -    process.exit(1)
 -  }
 -
--  const git_ref = git_describe + (git_branch === 'master' ? '' : '-' + git_branch)
--
-   const package = await fs.readJSON(join(__dirname, '../package.json'))
-   return {
-     VERSION: package.version,
-     BUILD_TIMESTAMP: Date.now(),
--    GIT_REF: git_ref
-+    GIT_REF: "NOGIT"
-   }
+-  const git_ref =
+-    git_describe + (git_branch === 'master' ? '' : '-' + git_branch)
+-  return git_ref
++  return "tags/v1.20.2"
  }
  
+ async function gatherBuildInfo() {