upgpkg: rocketchat-desktop 2.13.0-1

Adjusted previous target dir patch.
Added new patch to allow easy choosing between x64 and ia32.

4 files changed, 50 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a8f4dbac6a54..74d5e6b305f1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = rocketchat-desktop
 	pkgdesc = Rocket.Chat Native Cross-Platform Desktop Application via Electron.
-	pkgver = 2.12.1
-	pkgrel = 3
+	pkgver = 2.13.0
+	pkgrel = 1
 	url = https://github.com/RocketChat/Rocket.Chat.Electron
 	arch = i686
 	arch = x86_64
@@ -17,10 +17,12 @@ pkgbase = rocketchat-desktop
 	depends = gtk3
 	depends = glibc
 	conflicts = rocketchat-client-bin
-	source = fix-icon-name_use_target_dir.patch
 	source = rocketchat-desktop-2.12.1.tar.gz::https://github.com/RocketChat/Rocket.Chat.Electron/archive/2.12.1.tar.gz
-	sha512sums = a56502c1c5604326ef98363caefb6f353375df18260aee731462caa120b49fa2334797eca9915e4d57839f194a3c2274d492734bf63576ebc4f59ebb564db309
-	sha512sums = 12c94d53d04748fd7876b6ffd2552d62ae10acdc07b49b928b0587b3421a9557f922d3595b3c431dc1cae44a5d5d2ab91e4ded8f3c2b5807d6598d428191d244
+	source = fix-icon-name_use_target_dir.patch
+	source = fix-gulp-release.patch
+	sha512sums = 96765b2e7f852448f229d7b42de98a9d31dbb6580ec6a84d3ddb22812d88c435c93bf142987b9cd8ee91e05546ffc783f7b078ad46220dcef53926eeb40ea6cc
+	sha512sums = 5fab6bf05f1ee924e2a79cc133908c043d72d119a299c38badeb793bf12f1a328eac98e8ed1afabcf8cd3c06aeea7265421d6350e0094d2c55bf64cc30501a88
+    sha512sums = 4494d43f2ff3eef3c6d188cd147ec04fe6894ae7518aee3a5a4d5e23e081402051e7d1a2bdfd1da35e9c3336b3b8d5d3d4a25ab9bb96ed75b7d54a180d954d56
 
 pkgname = rocketchat-desktop
 
diff --git a/PKGBUILD b/PKGBUILD
index c018ce1f0d16..1e05cd74828c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
 # Maintainer: Matthias Lisin <ml@visu.li>
 # Contributor: sum01 <sum01@protonmail.com>
 pkgname=rocketchat-desktop
-pkgver=2.12.1
+pkgver=2.13.0
 _srcname="Rocket.Chat.Electron-$pkgver"
-pkgrel=3
+pkgrel=1
 pkgdesc='Rocket.Chat Native Cross-Platform Desktop Application via Electron.'
 arch=('i686' 'x86_64')
 url="https://github.com/RocketChat/Rocket.Chat.Electron"
@@ -11,10 +11,12 @@ license=('MIT')
 depends=('nss' 'libxss' 'gconf' 'gtk3' 'glibc')
 makedepends=('sed' 'yarn>=0.21.3' 'nodejs>=7.0.0' 'node-gyp' 'python2')
 conflicts=('rocketchat-client-bin')
-source=(fix-icon-name_use_target_dir.patch
-        "$pkgname-$pkgver.tar.gz::https://github.com/RocketChat/Rocket.Chat.Electron/archive/$pkgver.tar.gz")
-sha512sums=('a56502c1c5604326ef98363caefb6f353375df18260aee731462caa120b49fa2334797eca9915e4d57839f194a3c2274d492734bf63576ebc4f59ebb564db309'
-            '12c94d53d04748fd7876b6ffd2552d62ae10acdc07b49b928b0587b3421a9557f922d3595b3c431dc1cae44a5d5d2ab91e4ded8f3c2b5807d6598d428191d244')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/RocketChat/Rocket.Chat.Electron/archive/$pkgver.tar.gz"
+        fix-icon-name_use_target_dir.patch
+        fix-gulp-release.patch)
+sha512sums=('96765b2e7f852448f229d7b42de98a9d31dbb6580ec6a84d3ddb22812d88c435c93bf142987b9cd8ee91e05546ffc783f7b078ad46220dcef53926eeb40ea6cc'
+            '5fab6bf05f1ee924e2a79cc133908c043d72d119a299c38badeb793bf12f1a328eac98e8ed1afabcf8cd3c06aeea7265421d6350e0094d2c55bf64cc30501a88'
+            '4494d43f2ff3eef3c6d188cd147ec04fe6894ae7518aee3a5a4d5e23e081402051e7d1a2bdfd1da35e9c3336b3b8d5d3d4a25ab9bb96ed75b7d54a180d954d56')
 if [[ $CARCH == "i686" ]]; then
     _releasename="release:linux-ia32"
     _distname="linux-ia32-unpacked"
@@ -24,10 +26,8 @@ else
 fi
 
 prepare() {
-    # NOTE(matthias.lisin): "tar.gz" was re-added in a newer commit:
-    # https://github.com/RocketChat/Rocket.Chat.Electron/commit/5c8cb8b61b1f2f4f7221533ae6b003ace3df9b4a
-    # Adjust the patch on next update!
-    patch -p1 -d "$_srcname"  < fix-icon-name_use_target_dir.patch
+    patch -p1 -d "$_srcname" < fix-icon-name_use_target_dir.patch
+    patch -p1 -d "$_srcname" < fix-gulp-release.patch
 }
 
 build() {
diff --git a/fix-gulp-release.patch b/fix-gulp-release.patch
new file mode 100644
index 000000000000..134bf3236e88
--- /dev/null
+++ b/fix-gulp-release.patch
@@ -0,0 +1,16 @@
+diff -ura package.orig/tasks/release.js package.new/tasks/release.js
+--- package.orig/tasks/release.js	2018-08-27 17:49:25.000000000 +0200
++++ package.new/tasks/release.js	2018-08-27 21:39:14.241592905 +0200
+@@ -8,10 +8,7 @@
+ const publish = getEnvName() !== 'production' ? 'never' : 'onTagOrDraft';
+ gulp.task('release:darwin', () => build({ publish, x64: true, mac: [] }));
+ gulp.task('release:win32', () => build({ publish, x64: true, win: [ 'nsis', 'appx' ] }));
+-gulp.task('release:linux', (cb) => {
+-    build({ publish, x64: true, linux: [] })
+-        .then(() => build({ publish, ia32: true, linux: config.linux.target.filter(target => target !== 'snap') }))
+-        .then(() => cb(), (error) => cb(error));
+-});
++gulp.task('release:linux-x64', () => build({ x64: true, linux: [] }));
++gulp.task('release:linux-ia32', () => build({ ia32: true, linux: [] }));
+ 
+ gulp.task('release', [ 'build-app', `release:${ process.platform }` ]);
diff --git a/fix-icon-name_use_target_dir.patch b/fix-icon-name_use_target_dir.patch
index f08642a35548..cd8d99c4be7e 100644
--- a/fix-icon-name_use_target_dir.patch
+++ b/fix-icon-name_use_target_dir.patch
@@ -1,20 +1,21 @@
-diff -ura package.orig/package.json package.new/package.json
---- package.orig/package.json	2018-08-17 12:03:28.681824081 +0200
-+++ package.new/package.json	2018-08-17 12:03:46.091941868 +0200
-@@ -59,9 +59,7 @@
-       },
-       "category": "GNOME;GTK;Network;InstantMessaging",
-       "target": [
--        "deb",
--        "rpm",
--        "snap"
-+        "dir"
-       ]
+diff -ura package.orig/electron-builder.json package.new/electron-builder.json
+--- package.orig/electron-builder.json	2018-08-27 21:06:57.486299055 +0200
++++ package.new/electron-builder.json	2018-08-27 21:10:40.483612838 +0200
+@@ -46,10 +46,7 @@
      },
-     "publish": [
+     "category": "GNOME;GTK;Network;InstantMessaging",
+     "target": [
+-      "tar.gz",
+-      "deb",
+-      "rpm",
+-      "snap"
++      "dir"
+     ]
+   },
+   "publish": [
 diff -ura package.orig/snap/gui/rocketchat-desktop.desktop package.new/snap/gui/rocketchat-desktop.desktop
---- package.orig/snap/gui/rocketchat-desktop.desktop	2018-08-17 12:03:28.748491198 +0200
-+++ package.new/snap/gui/rocketchat-desktop.desktop	2018-08-17 12:04:03.495393068 +0200
+--- package.orig/snap/gui/rocketchat-desktop.desktop	2018-08-27 21:06:57.506299438 +0200
++++ package.new/snap/gui/rocketchat-desktop.desktop	2018-08-27 21:07:38.663744205 +0200
 @@ -4,6 +4,6 @@
  Exec=rocketchat-desktop
  Terminal=false
@@ -22,4 +23,4 @@ diff -ura package.orig/snap/gui/rocketchat-desktop.desktop package.new/snap/gui/
 -Icon=${SNAP}/meta/gui/icon.png
 +Icon=rocketchat-desktop
  Categories=GNOME;GTK;Network;InstantMessaging
- StartupWMClass=Rocket.Chat+
+ StartupWMClass=Rocket.Chat