upgpkg: rocketchat-desktop 2.13.2-1

Drag along own desktop file since it was removed upstream.
Remove icon name fix since no longer required.
Link to new name of executable

6 files changed, 52 insertions, 54 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bb052f2fef28..3f443dcf20d3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = rocketchat-desktop
 	pkgdesc = Rocket.Chat Native Cross-Platform Desktop Application via Electron.
-	pkgver = 2.13.1
+	pkgver = 2.13.2
 	pkgrel = 1
 	url = https://github.com/RocketChat/Rocket.Chat.Electron
 	arch = i686
@@ -18,11 +18,13 @@ pkgbase = rocketchat-desktop
 	depends = glibc
 	conflicts = rocketchat-client-bin
 	source = rocketchat-desktop-2.13.0.tar.gz::https://github.com/RocketChat/Rocket.Chat.Electron/archive/2.13.0.tar.gz
-	source = fix-icon-name_use_target_dir.patch
+	source = fix-linux-target.patch
 	source = fix-gulp-release.patch
-	sha512sums = 7493c0c71e5e854f5b6385c465277f7dde3b208d4b40a12cf978f4c893d808a4a0134c6dbc1fa8a7958a922a657247582b7d9e5529bd3ad372629247e30fd87a
-	sha512sums = 5fab6bf05f1ee924e2a79cc133908c043d72d119a299c38badeb793bf12f1a328eac98e8ed1afabcf8cd3c06aeea7265421d6350e0094d2c55bf64cc30501a88
-    sha512sums = e6b1a943d755abf5b4bfbf7602af21d09ff4960d28356834c38b9ba62c583b05a608726442b28c4e79e6eb73c777e6423ed754308f6b70fc8b9bfddf980cba1d
+	source = rocketchat-desktop.desktop
+	sha512sums = a3428bb6abe83ad5db6d549734e75efc354b8725423ba0ba92f309406233e29f5f3f92d5e8dbcd8f4e73901e3f4e8db0443476b1fa68315b6cbb406cf968fbce
+	sha512sums = 8a2753f6cffa7779cc9c008c872d24c8c6c20307886ec62f124a26249c1e96d0dcf1fd2529c6a335b2f1eea533cf24c9a2ca486794452b0190e14b5d47c8c0b5
+	sha512sums = 043a9b4ed2eddbb93404eab70cc2238bde5930d97c1bf88c1e49eddf61e960db19b996e5ffd9fd65062041fc0726d8ca5f9a4d5436e753260fda482a9544bbf3
+	sha512sums = d87664b9bdf30eac3011393d094962e0d568a94b5eaf4c8e5f17529442dcba905cea7341527066102a97a07a981acd6ce045b8737eb78a7d81a2a2d05023fe26
 
 pkgname = rocketchat-desktop
 
diff --git a/PKGBUILD b/PKGBUILD
index 3b8531b3c9eb..cf3f2773a895 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Matthias Lisin <ml@visu.li>
 # Contributor: sum01 <sum01@protonmail.com>
 pkgname=rocketchat-desktop
-pkgver=2.13.1
+pkgver=2.13.2
 _srcname="Rocket.Chat.Electron-$pkgver"
 pkgrel=1
 pkgdesc='Rocket.Chat Native Cross-Platform Desktop Application via Electron.'
@@ -12,11 +12,13 @@ depends=('nss' 'libxss' 'gconf' 'gtk3' 'glibc')
 makedepends=('sed' 'yarn>=0.21.3' 'nodejs>=7.0.0' 'node-gyp' 'python2')
 conflicts=('rocketchat-client-bin')
 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=('7493c0c71e5e854f5b6385c465277f7dde3b208d4b40a12cf978f4c893d808a4a0134c6dbc1fa8a7958a922a657247582b7d9e5529bd3ad372629247e30fd87a'
-            '5fab6bf05f1ee924e2a79cc133908c043d72d119a299c38badeb793bf12f1a328eac98e8ed1afabcf8cd3c06aeea7265421d6350e0094d2c55bf64cc30501a88'
-            'e6b1a943d755abf5b4bfbf7602af21d09ff4960d28356834c38b9ba62c583b05a608726442b28c4e79e6eb73c777e6423ed754308f6b70fc8b9bfddf980cba1d')
+        fix-linux-target.patch
+        fix-gulp-release.patch
+        rocketchat-desktop.desktop)
+sha512sums=('a3428bb6abe83ad5db6d549734e75efc354b8725423ba0ba92f309406233e29f5f3f92d5e8dbcd8f4e73901e3f4e8db0443476b1fa68315b6cbb406cf968fbce'
+            '8a2753f6cffa7779cc9c008c872d24c8c6c20307886ec62f124a26249c1e96d0dcf1fd2529c6a335b2f1eea533cf24c9a2ca486794452b0190e14b5d47c8c0b5'
+            '043a9b4ed2eddbb93404eab70cc2238bde5930d97c1bf88c1e49eddf61e960db19b996e5ffd9fd65062041fc0726d8ca5f9a4d5436e753260fda482a9544bbf3'
+            'd87664b9bdf30eac3011393d094962e0d568a94b5eaf4c8e5f17529442dcba905cea7341527066102a97a07a981acd6ce045b8737eb78a7d81a2a2d05023fe26')
 if [[ $CARCH == "i686" ]]; then
     _releasename="release:linux-ia32"
     _distname="linux-ia32-unpacked"
@@ -26,7 +28,7 @@ else
 fi
 
 prepare() {
-    patch -p1 -d "$_srcname" < fix-icon-name_use_target_dir.patch
+    patch -p1 -d "$_srcname" < fix-linux-target.patch
     patch -p1 -d "$_srcname" < fix-gulp-release.patch
 }
 
@@ -38,9 +40,9 @@ build() {
 
 package() {
     install -d "$pkgdir"/{usr/bin,opt}
-    install -Dm644 "$srcdir/$_srcname/snap/gui/icon.png" "$pkgdir/usr/share/icons/hicolor/512x512/apps/$pkgname.png"
-    install -Dm644 "$srcdir/$_srcname/snap/gui/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
+    install -Dm644 "$srcdir/$_srcname/build/icons/512x512.png" "$pkgdir/usr/share/icons/hicolor/512x512/apps/$pkgname.png"
+    install -Dm644 "$srcdir/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
     install -Dm644 "$srcdir/$_srcname/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
     cp -r "$srcdir/$_srcname/dist/$_distname" "$pkgdir/opt/$pkgname"
-    ln -sf /opt/$pkgname/rocketchat "$pkgdir/usr/bin/$pkgname"
+    ln -sf "/opt/$pkgname/$pkgname" "$pkgdir/usr/bin/$pkgname"
 }
diff --git a/fix-gulp-release.patch b/fix-gulp-release.patch
index 82d1ccd5dd6f..f716c27978a2 100644
--- a/fix-gulp-release.patch
+++ b/fix-gulp-release.patch
@@ -1,16 +1,12 @@
-diff -ura package.orig/tasks/release.js package.new/tasks/release.js
---- package.orig/tasks/release.js	2018-08-30 22:05:26.266071116 +0200
-+++ package.new/tasks/release.js	2018-08-30 22:06:25.729735080 +0200
-@@ -9,10 +9,7 @@
+diff -ura '--exclude=electron-builder.json' package.orig/tasks/release.js package.new/tasks/release.js
+--- package.orig/tasks/release.js	2018-09-10 09:55:15.444036168 +0200
++++ package.new/tasks/release.js	2018-09-10 10:01:28.053423434 +0200
+@@ -9,6 +9,8 @@
  const publish = getEnvName() !== 'production' ? 'never' : 'onTagOrDraft';
  gulp.task('release:darwin', () => build({ publish, x64: true, mac: [] }));
  gulp.task('release:win32', () => build({ publish, x64: true, ia32: 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', (cb) => runSequence('build-app', `release:${ process.platform }`, cb));
++gulp.task('release:linux-x64', () => build({ x64: true, linux: [], c: { productName: 'rocketchat' } })); 
++gulp.task('release:linux-ia32', () => build({ ia32: true, linux: [], c: { productName: 'rocketchat' } })); 
+ gulp.task('release:linux', (cb) => {
+     build({ publish, x64: true, linux: [], c: { productName: 'rocketchat' } })
+         .then(() => build({
diff --git a/fix-icon-name_use_target_dir.patch b/fix-icon-name_use_target_dir.patch
deleted file mode 100644
index cd8d99c4be7e..000000000000
--- a/fix-icon-name_use_target_dir.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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 @@
-     },
-     "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-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
- Type=Application
--Icon=${SNAP}/meta/gui/icon.png
-+Icon=rocketchat-desktop
- Categories=GNOME;GTK;Network;InstantMessaging
- StartupWMClass=Rocket.Chat
diff --git a/fix-linux-target.patch b/fix-linux-target.patch
new file mode 100644
index 000000000000..3cd152fb744e
--- /dev/null
+++ b/fix-linux-target.patch
@@ -0,0 +1,15 @@
+diff -ura package.orig/electron-builder.json package.new/electron-builder.json
+--- package.orig/electron-builder.json	2018-09-10 09:55:15.434036072 +0200
++++ package.new/electron-builder.json	2018-09-10 09:55:34.767553057 +0200
+@@ -63,10 +63,7 @@
+   },
+   "linux": {
+     "target": [
+-      "tar.gz",
+-      "deb",
+-      "rpm",
+-      "snap"
++      "dir"
+     ],
+     "executableName": "rocketchat-desktop",
+     "category": "GNOME;GTK;Network;InstantMessaging",
diff --git a/rocketchat-desktop.desktop b/rocketchat-desktop.desktop
new file mode 100644
index 000000000000..479b46903229
--- /dev/null
+++ b/rocketchat-desktop.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Rocket.Chat
+Comment=Rocket.Chat Native Cross-Platform Desktop Application via Electron.
+Exec=rocketchat-desktop
+Terminal=false
+Type=Application
+Icon=rocketchat-desktop
+Categories=GNOME;GTK;Network;InstantMessaging
+StartupWMClass=Rocket.Chat