summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD14
-rw-r--r--fix-gulp-release.patch32
-rw-r--r--fix-spellchecking.patch (renamed from fix-dictionaries.patch)6
4 files changed, 34 insertions, 32 deletions
diff --git a/.SRCINFO b/.SRCINFO
index fba73987d8b3..5a72110b2e9a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = rocketchat-desktop
pkgdesc = Rocket.Chat Native Cross-Platform Desktop Application via Electron.
- pkgver = 2.15.0
- pkgrel = 4
+ pkgver = 2.15.1
+ pkgrel = 1
url = https://github.com/RocketChat/Rocket.Chat.Electron
arch = i686
arch = x86_64
@@ -13,17 +13,17 @@ pkgbase = rocketchat-desktop
depends = electron
optdepends = hunspell-en_US: spell checking
conflicts = rocketchat-client-bin
- source = rocketchat-desktop-2.15.0.tar.gz::https://github.com/RocketChat/Rocket.Chat.Electron/archive/2.15.0.tar.gz
+ source = rocketchat-desktop-2.15.1.tar.gz::https://github.com/RocketChat/Rocket.Chat.Electron/archive/2.15.1.tar.gz
source = rocketchat-desktop
source = fix-electron-builder.patch
source = fix-gulp-release.patch
- source = fix-dictionaries.patch
+ source = fix-spellchecking.patch
source = rocketchat-desktop.desktop
- sha512sums = 91e342d7a50108894cc7fab6c362eaed32ee6bf47e5930622a319679e6904cdd84d86117f8799a0582b6ee4dd89e34133c988e1bd835c423d36f7afa94fe464e
+ sha512sums = e81f26a56465d860bfc365bbaee7c204214af6f13a505e9b7935a8c7c0051ff0d5a7a56fa81106e1b56e1e23b161d5663010ec7ab2b789019861394ea2be793b
sha512sums = 1f0f7197012421ff42d2936f73e697e35eef8c57fb9fed59ee022f9d170d6496407f89e426526fba8451fe304b3a8de1724d1cd14bd85d781bbf6aa9ca078d7d
sha512sums = f4c16d380156ebe32a226ebe639dc30d7a7fbcdaf1ee89e36eb5b8c736b207e16c3eff90b351d757d85f3612dacefe1cd0100371720d9d58ec229daa3ca654fb
- sha512sums = f8b32ae188366a1cfb7bdb7b1859f545dbf583a7ab3b2d793500688c85aae27b3df1ec926dd91795e47669535fa68ed762fdf0600384304ced16f6370dc0a67c
- sha512sums = 60bd46cc0a708f83462f076b09e6afa9eb1caabcaf54f171d224e7059871dc960dbe6be8246a4b7eec889af7230a3534c3ba78e0b1be2b0705f00eb36550452b
+ sha512sums = cc3298c9e9d1f45e7f1a7288ffda0ec6c352249a542e9ca96659034b8cc0a366cff373c00799179a06d304f5bc8dce39edc4a0cc0ac403f2a0b51b0152d3986d
+ sha512sums = 030f7088dcff15cfe6f7f16814f800d92a833f2ac53eb373554587b64979f77081013c93dd7559b8198aa8aa2bf871e422c6c86d579936c7378670dac52944e8
sha512sums = d87664b9bdf30eac3011393d094962e0d568a94b5eaf4c8e5f17529442dcba905cea7341527066102a97a07a981acd6ce045b8737eb78a7d81a2a2d05023fe26
pkgname = rocketchat-desktop
diff --git a/PKGBUILD b/PKGBUILD
index f351c3fd53b3..aba57af6af09 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.15.0
+pkgver=2.15.1
_srcname="Rocket.Chat.Electron-$pkgver"
-pkgrel=4
+pkgrel=1
pkgdesc='Rocket.Chat Native Cross-Platform Desktop Application via Electron.'
arch=('i686' 'x86_64')
url="https://github.com/RocketChat/Rocket.Chat.Electron"
@@ -16,13 +16,13 @@ source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz"
rocketchat-desktop
fix-electron-builder.patch
fix-gulp-release.patch
- fix-dictionaries.patch
+ fix-spellchecking.patch
rocketchat-desktop.desktop)
-sha512sums=('91e342d7a50108894cc7fab6c362eaed32ee6bf47e5930622a319679e6904cdd84d86117f8799a0582b6ee4dd89e34133c988e1bd835c423d36f7afa94fe464e'
+sha512sums=('e81f26a56465d860bfc365bbaee7c204214af6f13a505e9b7935a8c7c0051ff0d5a7a56fa81106e1b56e1e23b161d5663010ec7ab2b789019861394ea2be793b'
'1f0f7197012421ff42d2936f73e697e35eef8c57fb9fed59ee022f9d170d6496407f89e426526fba8451fe304b3a8de1724d1cd14bd85d781bbf6aa9ca078d7d'
'f4c16d380156ebe32a226ebe639dc30d7a7fbcdaf1ee89e36eb5b8c736b207e16c3eff90b351d757d85f3612dacefe1cd0100371720d9d58ec229daa3ca654fb'
- 'f8b32ae188366a1cfb7bdb7b1859f545dbf583a7ab3b2d793500688c85aae27b3df1ec926dd91795e47669535fa68ed762fdf0600384304ced16f6370dc0a67c'
- '60bd46cc0a708f83462f076b09e6afa9eb1caabcaf54f171d224e7059871dc960dbe6be8246a4b7eec889af7230a3534c3ba78e0b1be2b0705f00eb36550452b'
+ 'cc3298c9e9d1f45e7f1a7288ffda0ec6c352249a542e9ca96659034b8cc0a366cff373c00799179a06d304f5bc8dce39edc4a0cc0ac403f2a0b51b0152d3986d'
+ '030f7088dcff15cfe6f7f16814f800d92a833f2ac53eb373554587b64979f77081013c93dd7559b8198aa8aa2bf871e422c6c86d579936c7378670dac52944e8'
'd87664b9bdf30eac3011393d094962e0d568a94b5eaf4c8e5f17529442dcba905cea7341527066102a97a07a981acd6ce045b8737eb78a7d81a2a2d05023fe26')
if [[ $CARCH == "i686" ]]; then
_releasename="release:linux-ia32"
@@ -41,7 +41,7 @@ prepare() {
build() {
cd "$_srcname"
yarn upgrade "electron@$(sed 's/^v//' </usr/lib/electron/version)" --non-interactive --cache-folder "$srcdir/yarn-cache"
- yarn build --env=production "$_releasename"
+ yarn gulp build --env=production "$_releasename"
}
package() {
diff --git a/fix-gulp-release.patch b/fix-gulp-release.patch
index d3065bae393e..97a54f3775e4 100644
--- a/fix-gulp-release.patch
+++ b/fix-gulp-release.patch
@@ -1,16 +1,18 @@
diff -ura package.orig/tasks/release.js package.new/tasks/release.js
---- package.orig/tasks/release.js 2019-02-24 19:19:17.230601550 +0100
-+++ package.new/tasks/release.js 2019-02-24 19:22:03.772035574 +0100
-@@ -8,10 +8,5 @@
- const publish = env !== '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', async() => {
-- const allLinuxTargetsButSnap = config.linux.target.filter((target) => target !== 'snap');
-- await build({ publish, x64: true, linux: [], c: { productName: 'rocketchat' } });
-- await build({ publish, ia32: true, linux: allLinuxTargetsButSnap, c: { productName: 'rocketchat' } });
--});
--
--gulp.task('release', gulp.series('build-app', `release:${ process.platform }`));
-+gulp.task('release:linux-x64', () => build({ publish, x64: true, linux: [], c: { productName: 'rocketchat' } }));
-+gulp.task('release:linux-ia32', () => build({ publish, ia32: true, linux: [], c: { productName: 'rocketchat' } }));
+--- package.orig/tasks/release.js 2019-03-13 20:47:32.334253693 +0100
++++ package.new/tasks/release.js 2019-03-13 20:57:20.456395083 +0100
+@@ -11,6 +11,14 @@
+ await build({ publish, x64, mac: [] });
+ });
+
++gulp.task('release:linux-x64', async() => {
++ await build({ publish: 'never', x64, linux: [], c: { productName: 'rocketchat' } });
++});
++
++gulp.task('release:linux-ia32', async() => {
++ await build({ publish: 'never', ia32, linux: [], c: { productName: 'rocketchat' } });
++});
++
+ gulp.task('release:linux', async() => {
+ const { linux: { target } } = require('../electron-builder.json');
+ const publish = getEnv() === 'production' ? 'onTagOrDraft' : 'never';
diff --git a/fix-dictionaries.patch b/fix-spellchecking.patch
index 7eb148dbaca4..9c5eb4174423 100644
--- a/fix-dictionaries.patch
+++ b/fix-spellchecking.patch
@@ -1,7 +1,7 @@
diff -ura package.orig/src/preload/spellchecking.js package.new/src/preload/spellchecking.js
---- package.orig/src/preload/spellchecking.js 2019-02-24 19:52:13.168606313 +0100
-+++ package.new/src/preload/spellchecking.js 2019-02-24 19:52:55.662351780 +0100
-@@ -21,7 +21,7 @@
+--- package.orig/src/preload/spellchecking.js 2019-03-13 20:47:32.327586968 +0100
++++ package.new/src/preload/spellchecking.js 2019-03-13 20:59:36.190988478 +0100
+@@ -22,7 +22,7 @@
async loadDictionaries() {
const embeddedDictionaries = spellchecker.getAvailableDictionaries();