Upgrading to version 0.7.0

3 files changed, 30 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c2a031f4f0b8..88bfa4000b7c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = teams-for-linux
 	pkgdesc = Unofficial Microsoft Teams client for Linux using Electron.
-	pkgver = 0.6.7
+	pkgver = 0.7.0
 	pkgrel = 1
 	url = https://github.com/IsmaelMartinez/teams-for-linux
 	arch = aarch64
@@ -14,10 +14,12 @@ pkgbase = teams-for-linux
 	depends = gtk3
 	depends = libxss
 	depends = nss
-	source = teams-for-linux-0.6.7.tar.gz::https://github.com/IsmaelMartinez/teams-for-linux/archive/v0.6.7.tar.gz
+	source = teams-for-linux-0.7.0.tar.gz::https://github.com/IsmaelMartinez/teams-for-linux/archive/v0.7.0.tar.gz
 	source = teams-for-linux.desktop
-	sha256sums = 3b7dd061a13348b3384314f19b0335edbec81d748e4f3c63dc3147bd3d21db05
+	source = index.patch
+	sha256sums = bf5d621308d957ad30e23995f13a0de51e10859dd94bfcf4ea540c00bca2ebbe
 	sha256sums = f33ab4997c329567bbe172fe77ee6cbced5c5d4354e12ef52a89dd702422fded
+	sha256sums = e0f567168c43d9a030ede2f7b9a617014faf9ea7cd9e0ead9b082e9855e77e70
 
 pkgname = teams-for-linux
 
diff --git a/PKGBUILD b/PKGBUILD
index 8b3da99d07e9..e0be3584feb9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Ivelin Velkov <ivelin dot velkov at gmail dot com>
 
 pkgname=teams-for-linux
-pkgver=0.6.7
+pkgver=0.7.0
 pkgrel=1
 pkgdesc="Unofficial Microsoft Teams client for Linux using Electron."
 arch=("aarch64" "armv7h" "i686" "x86_64")
@@ -13,12 +13,19 @@ makedepends=("node-gyp" "python2" "yarn")
 source=(
   "${pkgname}-${pkgver}.tar.gz::https://github.com/IsmaelMartinez/${pkgname}/archive/v${pkgver}.tar.gz"
   "${pkgname}.desktop"
+  "index.patch"
 )
 sha256sums=(
-  "3b7dd061a13348b3384314f19b0335edbec81d748e4f3c63dc3147bd3d21db05"
+  "bf5d621308d957ad30e23995f13a0de51e10859dd94bfcf4ea540c00bca2ebbe"
   "f33ab4997c329567bbe172fe77ee6cbced5c5d4354e12ef52a89dd702422fded"
+  "e0f567168c43d9a030ede2f7b9a617014faf9ea7cd9e0ead9b082e9855e77e70"
 )
 
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/index.patch"
+}
+
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   yarn install --non-interactive --pure-lockfile --cache-folder "${srcdir}/yarn-cache"
diff --git a/index.patch b/index.patch
new file mode 100644
index 000000000000..668ff6c4a37e
--- /dev/null
+++ b/index.patch
@@ -0,0 +1,16 @@
+diff --git a/app/config/index.js b/app/config/index.js
+index a5b54e0..30345a5 100644
+--- a/app/config/index.js
++++ b/app/config/index.js
+@@ -88,11 +88,7 @@ function getConfigFile(configPath) {
+ 	try {
+ 		return require(path.join(configPath, 'config.json'));
+ 	} catch (e){
+-<<<<<<< HEAD
+ 		console.info('Failed to get the config file, using default values');
+-=======
+-		console.error('Failed to get the config file', e);
+->>>>>>> origin
+ 		return {};
+ 	}
+ }