Upgrade to 4.2.3

4 files changed, 19 insertions, 61 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1e30f174c5ab..443bd633745e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mattermost-desktop
 	pkgdesc = Mattermost Desktop application for Linux (Beta)
-	pkgver = 4.2.1
+	pkgver = 4.2.3
 	pkgrel = 2
 	url = https://github.com/mattermost/desktop
 	arch = i686
@@ -9,16 +9,12 @@ pkgbase = mattermost-desktop
 	makedepends = npm
 	makedepends = git
 	depends = electron4
-	source = mattermost-desktop-4.2.1.tar.gz::https://github.com/mattermost/desktop/archive/v4.2.1.tar.gz
+	source = mattermost-desktop-4.2.3.tar.gz::https://github.com/mattermost/desktop/archive/v4.2.3.tar.gz
 	source = mattermost-desktop.sh
-	source = mattermost.desktop
 	source = mattermost-package-json.patch
-	source = https://github.com/mattermost/desktop/commit/40257cf93e153a84a94f888aea3225788fbb9d3a.patch
-	sha512sums = 54484871cdeb52f70241b6f154215f7aaeaa0aac0abae4293e19988032e18a50fa1744dbecab5ce333c35f4ba151434101b68f49c7a256cd3aaf70395fc94afb
+	sha512sums = 478124a2cf9fff618035d408a73176fd68c21d16fdbecc307c621bf576d9bbdd2663a52a1dd4be6e3a0ea52029270d3f1d92c2180f0158b3c29d4116630c6f37
 	sha512sums = ec10960a56593429996f153d0832345d1f9279aa386d5d09f078aed39a5e8e4c3d1900fc8ff608318c9c57a161c3850b2c7924d86af0ae41f76649c080fccc1f
-	sha512sums = a8db88c1db7cba497ee2a1db059430d235942052322b26a2ece7a1340a28ae24686630fa89a37fcfa6bf9f277cbf8a7018ce78e7117b247b2b408fa0fb709d84
-	sha512sums = 09605ae4d5b6fe895f1ca9904984393ea7e2a3c08ca519e270d3d26fa0b14ae353c374bfd5917055f7fa3034f33a428e5bcd9b6c70c64dcbdf106a1733de023a
-	sha512sums = beb984681a1a381de59e6eb3b5dc65a8fbffe3f4a14bf9568f4b18c7394d45c449386a033de34ea625e59b17b7a85273040ea86472455ff2ce177d0b12ff9ea1
+	sha512sums = c5e6f14152eb325eab4cf43355f586a82975210a48599cb5b555eb56a4d25d3d66f669a95056baac43cb0372208ac954aa726d901411c9f16b8884c3a19777ed
 
 pkgname = mattermost-desktop
 
diff --git a/PKGBUILD b/PKGBUILD
index b2af9112d456..3ff8fe73946e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Bruno Pagani <archange at archlinux dot org>
 
 pkgname=mattermost-desktop
-pkgver=4.2.1
+pkgver=4.2.3
 pkgrel=2
 pkgdesc="Mattermost Desktop application for Linux (Beta)"
 arch=('i686' 'x86_64')
@@ -15,22 +15,19 @@ makedepends=('npm' 'git')
 source=(
     "${pkgname}-${pkgver}.tar.gz"::"${url}/archive/v${pkgver}.tar.gz"
     "${pkgname}.sh"
-    "${pkgname/-/.}"
     "${pkgname%%-*}-package-json.patch"
-    "https://github.com/mattermost/desktop/commit/40257cf93e153a84a94f888aea3225788fbb9d3a.patch"
 )
-sha512sums=('54484871cdeb52f70241b6f154215f7aaeaa0aac0abae4293e19988032e18a50fa1744dbecab5ce333c35f4ba151434101b68f49c7a256cd3aaf70395fc94afb'
-            'ec10960a56593429996f153d0832345d1f9279aa386d5d09f078aed39a5e8e4c3d1900fc8ff608318c9c57a161c3850b2c7924d86af0ae41f76649c080fccc1f'
-            'a8db88c1db7cba497ee2a1db059430d235942052322b26a2ece7a1340a28ae24686630fa89a37fcfa6bf9f277cbf8a7018ce78e7117b247b2b408fa0fb709d84'
-            '09605ae4d5b6fe895f1ca9904984393ea7e2a3c08ca519e270d3d26fa0b14ae353c374bfd5917055f7fa3034f33a428e5bcd9b6c70c64dcbdf106a1733de023a'
-            'beb984681a1a381de59e6eb3b5dc65a8fbffe3f4a14bf9568f4b18c7394d45c449386a033de34ea625e59b17b7a85273040ea86472455ff2ce177d0b12ff9ea1')
+sha512sums=(
+    '478124a2cf9fff618035d408a73176fd68c21d16fdbecc307c621bf576d9bbdd2663a52a1dd4be6e3a0ea52029270d3f1d92c2180f0158b3c29d4116630c6f37'
+    'ec10960a56593429996f153d0832345d1f9279aa386d5d09f078aed39a5e8e4c3d1900fc8ff608318c9c57a161c3850b2c7924d86af0ae41f76649c080fccc1f'
+    'c5e6f14152eb325eab4cf43355f586a82975210a48599cb5b555eb56a4d25d3d66f669a95056baac43cb0372208ac954aa726d901411c9f16b8884c3a19777ed'
+)
 
 prepare() {
     cd "desktop-${pkgver}"
 
     # Bump dependencies. Temporary patch. Remove when 4.3 is out.
     patch < "${srcdir}"/mattermost-package-json.patch
-    patch -p1 < "${srcdir}"/40257cf93e153a84a94f888aea3225788fbb9d3a.patch
 
     # Depending on the architecture, in order to accelerate the build process,
     # removes the compilation of ia32 or x64 build.
diff --git a/mattermost-package-json.patch b/mattermost-package-json.patch
index da3b8befa3ea..b581d195016a 100644
--- a/mattermost-package-json.patch
+++ b/mattermost-package-json.patch
@@ -1,16 +1,14 @@
-diff --git a/package.json b/package.json
-index f5c8657..550526d 100644
---- a/package.json
-+++ b/package.json
-@@ -28,46 +28,45 @@
+--- package.json	2019-09-26 16:42:50.915815809 +0200
++++ package.json	2019-09-26 16:52:44.822830028 +0200
+@@ -28,32 +28,31 @@
      "test": "npm-run-all test:* lint:*",
      "test:app": "cross-env NODE_ENV=production npm run build && mocha -r babel-register --reporter mocha-circleci-reporter --recursive test/specs",
      "package:all": "cross-env NODE_ENV=production npm-run-all check-build-config package:windows package:mac package:linux",
 -    "package:windows": "cross-env NODE_ENV=production npm-run-all check-build-config build && build --win --x64 --ia32 --config.extraMetadata.name=mattermost --publish=never",
-+    "package:windows": "cross-env NODE_ENV=production npm-run-all check-build-config build && build --win --x64  --config.extraMetadata.name=mattermost --publish=never",
++    "package:windows": "cross-env NODE_ENV=production npm-run-all check-build-config build && build --win --x64 --config.extraMetadata.name=mattermost --publish=never",
      "package:mac": "cross-env NODE_ENV=production npm-run-all check-build-config build && build --mac --publish=never",
 -    "package:linux": "cross-env NODE_ENV=production npm-run-all check-build-config build && build --linux --x64 --ia32 --config.extraMetadata.name=mattermost-desktop --publish=never",
-+    "package:linux": "cross-env NODE_ENV=production npm-run-all check-build-config build && build --linux --x64  --config.extraMetadata.name=mattermost-desktop --publish=never",
++    "package:linux": "cross-env NODE_ENV=production npm-run-all check-build-config build && build --linux --x64 --config.extraMetadata.name=mattermost-desktop --publish=never",
      "manipulate-windows-zip": "node scripts/manipulate_windows_zip.js",
      "lint:js": "eslint --ignore-path .gitignore --ignore-pattern node_modules --ext .js --ext .jsx .",
      "fix:js": "eslint --ignore-path .gitignore --ignore-pattern node_modules --quiet --ext .js --ext .jsx . --fix",
@@ -41,36 +39,11 @@ index f5c8657..550526d 100644
 -    "electron-builder-squirrel-windows": "~20.14.0",
 -    "electron-connect": "^0.6.3",
 -    "eslint": "^4.19.1",
--    "eslint-plugin-header": "^1.2.0",
--    "eslint-plugin-import": "^2.12.0",
--    "eslint-plugin-react": "^7.8.2",
--    "file-loader": "^1.1.6",
-+    "electron": "^2.0.14",
++    "electron": "^2.0.0",
 +    "electron-builder": "^20.38.0",
 +    "electron-builder-squirrel-windows": "^20.14.0",
 +    "electron-connect": "^0.6.0",
 +    "eslint": "^5.9.0",
-+    "eslint-plugin-header": "^2.0.0",
-+    "eslint-plugin-import": "^2.14.0",
-+    "eslint-plugin-react": "^7.11.1",
-+    "file-loader": "^2.0.0",
-     "mocha": "^5.2.0",
-     "mocha-circleci-reporter": "0.0.3",
--    "npm-run-all": "^4.1.3",
--    "react": "^16.4.0",
--    "react-dom": "^16.4.0",
-+    "npm-run-all": "^4.1.5",
-+    "react": "^16.6.3",
-+    "react-dom": "^16.6.3",
-     "spectron": "~3.8.0",
--    "style-loader": "^0.21.0",
--    "url-loader": "^1.0.1",
--    "webpack": "^4.8.3",
--    "webpack-cli": "^2.1.4",
-+    "style-loader": "^0.23.1",
-+    "url-loader": "^1.1.2",
-+    "webpack": "^4.20.2",
-+    "webpack-cli": "^3.1.1",
-     "webpack-dev-server": "^3.1.4",
-     "webpack-merge": "^4.1.2"
-   }
+     "eslint-plugin-eslint-comments": "^3.1.2",
+     "eslint-plugin-header": "^1.2.0",
+     "eslint-plugin-import": "^2.12.0",
diff --git a/mattermost.desktop b/mattermost.desktop
deleted file mode 100644
index 1520a1ebb33e..000000000000
--- a/mattermost.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Mattermost
-Comment=Mattermost Desktop application for Linux
-Exec=/usr/bin/mattermost-desktop
-Terminal=false
-Type=Application
-Icon=mattermost-desktop
-Categories=Network;InstantMessaging;