diff options
| -rw-r--r-- | .SRCINFO | 17 | ||||
| -rw-r--r-- | PKGBUILD | 69 | ||||
| -rw-r--r-- | linux-target-dir.patch | 15 | ||||
| -rw-r--r-- | no-multiarch-build.patch | 24 | ||||
| -rwxr-xr-x | rocketchat-desktop | 3 |
5 files changed, 35 insertions, 93 deletions
@@ -1,6 +1,6 @@ pkgbase = rocketchat-desktop pkgdesc = Rocket.Chat Native Cross-Platform Desktop Application via Electron. - pkgver = 2.17.8 + pkgver = 2.17.9 pkgrel = 1 url = https://github.com/RocketChat/Rocket.Chat.Electron arch = i686 @@ -10,20 +10,17 @@ pkgbase = rocketchat-desktop makedepends = node-gyp makedepends = python makedepends = yarn + depends = electron7 optdepends = hunspell-en_US: spell checking conflicts = rocketchat-client-bin - source = rocketchat-desktop-2.17.8.tar.gz::https://github.com/RocketChat/Rocket.Chat.Electron/archive/2.17.8.tar.gz + source = rocketchat-desktop-2.17.9.tar.gz::https://github.com/RocketChat/Rocket.Chat.Electron/archive/2.17.9.tar.gz source = rocketchat-desktop source = rocketchat-desktop.desktop - source = no-multiarch-build.patch source = use-system-dictionaries.patch - source = linux-target-dir.patch - sha512sums = 5deba5b26eed89890e84f67896d24fa76c57ad5a44695352678838ecd6ab1bc48482b772e625cea2ac75057a7c0761346b56bafaf759e267e488406fb03a68d2 - sha512sums = 1f0f7197012421ff42d2936f73e697e35eef8c57fb9fed59ee022f9d170d6496407f89e426526fba8451fe304b3a8de1724d1cd14bd85d781bbf6aa9ca078d7d - sha512sums = d87664b9bdf30eac3011393d094962e0d568a94b5eaf4c8e5f17529442dcba905cea7341527066102a97a07a981acd6ce045b8737eb78a7d81a2a2d05023fe26 - sha512sums = 0fdce645784b9b0ccbe203ecc61f10840514e79748dc10adc98924e34682ce8d8f024aeb03fed318f915ed52cd2abf97da3cae21f4bf45354e08194638a7e34e - sha512sums = 88361c770163c4c1d692128a4c8848d2f9700382394dbbe1391b2d0c22268dee1be850d391eece22ee51d9c119971337884dfd7a4c58c29e384b652592c4df9b - sha512sums = 07a54cc257a1d231b42339f9f1389ad7948e621e11d695498fb6e04f4f1aa07972faf6b34e83aaca94515252c7645d16d7f7da9e59c3d836426222c9e2c2c1fd + sha256sums = ea2ee46df9c5d5ba9772fb69fcadec5d458ffac5b2cfc821b1ded70df4bca06b + sha256sums = 996bd106c0e742be0f4a342c5b3f683a28b65b2f93e98c783cb6ef03e8fcc98c + sha256sums = 31fae4f98a61a774f84030fd43d2ef92c7633740dc5aa55967a21d0e29ea621a + sha256sums = 9a18a4db55c49c8c71c84e331d519dc16509c38566f5c1602224dc4a3ca73a3e pkgname = rocketchat-desktop @@ -1,64 +1,49 @@ # Maintainer: Matthias Lisin <ml@visu.li> # Contributor: sum01 <sum01@protonmail.com> pkgname=rocketchat-desktop -pkgver=2.17.8 -_srcname="Rocket.Chat.Electron-$pkgver" +pkgver=2.17.9 pkgrel=1 pkgdesc='Rocket.Chat Native Cross-Platform Desktop Application via Electron.' arch=('i686' 'x86_64') -url="https://github.com/RocketChat/Rocket.Chat.Electron" +url='https://github.com/RocketChat/Rocket.Chat.Electron' license=('MIT') -#depends=('electron') +depends=('electron7') makedepends=('nodejs-lts-erbium' 'node-gyp' 'python' 'yarn') optdepends=('hunspell-en_US: spell checking') conflicts=('rocketchat-client-bin') -source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz" +source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz" rocketchat-desktop rocketchat-desktop.desktop - no-multiarch-build.patch - use-system-dictionaries.patch - linux-target-dir.patch) -sha512sums=('5deba5b26eed89890e84f67896d24fa76c57ad5a44695352678838ecd6ab1bc48482b772e625cea2ac75057a7c0761346b56bafaf759e267e488406fb03a68d2' - '1f0f7197012421ff42d2936f73e697e35eef8c57fb9fed59ee022f9d170d6496407f89e426526fba8451fe304b3a8de1724d1cd14bd85d781bbf6aa9ca078d7d' - 'd87664b9bdf30eac3011393d094962e0d568a94b5eaf4c8e5f17529442dcba905cea7341527066102a97a07a981acd6ce045b8737eb78a7d81a2a2d05023fe26' - '0fdce645784b9b0ccbe203ecc61f10840514e79748dc10adc98924e34682ce8d8f024aeb03fed318f915ed52cd2abf97da3cae21f4bf45354e08194638a7e34e' - '88361c770163c4c1d692128a4c8848d2f9700382394dbbe1391b2d0c22268dee1be850d391eece22ee51d9c119971337884dfd7a4c58c29e384b652592c4df9b' - '07a54cc257a1d231b42339f9f1389ad7948e621e11d695498fb6e04f4f1aa07972faf6b34e83aaca94515252c7645d16d7f7da9e59c3d836426222c9e2c2c1fd') -if [[ $CARCH == "i686" ]]; then - _releasename="release:linux-ia32" - _distname="linux-ia32-unpacked" -else - _releasename="release:linux-x64" - _distname="linux-unpacked" -fi + use-system-dictionaries.patch) +sha256sums=('ea2ee46df9c5d5ba9772fb69fcadec5d458ffac5b2cfc821b1ded70df4bca06b' + '996bd106c0e742be0f4a342c5b3f683a28b65b2f93e98c783cb6ef03e8fcc98c' + '31fae4f98a61a774f84030fd43d2ef92c7633740dc5aa55967a21d0e29ea621a' + '9a18a4db55c49c8c71c84e331d519dc16509c38566f5c1602224dc4a3ca73a3e') +_dir="Rocket.Chat.Electron-${pkgver}" prepare() { - for patch in no-multiarch-build.patch use-system-dictionaries.patch linux-target-dir.patch; do - patch -N -p1 -d "$_srcname" -i "$srcdir/$patch" - done - - cd "$_srcname" - yarn install --non-interactive - #yarn upgrade "electron@$(sed '/^v/ d' /usr/lib/electron/version)" --non-interactive + cd "$_dir" + patch -Np1 <../use-system-dictionaries.patch + yarn upgrade electron@"$(</usr/lib/electron7/version)" --non-interactive } build() { - cd "$_srcname" - NODE_ENV=production yarn gulp build - NODE_ENV=production yarn gulp "$_releasename" + cd "$_dir" + local i686=ia32 x86_64=x64 + export NODE_ENV=production + yarn gulp build + yarn run electron-builder --linux --"${!CARCH}" --dir \ + -c.electronDist=/usr/lib/electron7 \ + -c.electronVersion="$(</usr/lib/electron7/version)" } package() { - install -Dm644 "$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop" - #install -Dm755 "$pkgname" "$pkgdir/usr/bin/$pkgname" - - cd "$_srcname" - install -Dm644 "build/icons/512x512.png" "$pkgdir/usr/share/icons/hicolor/512x512/apps/$pkgname.png" - install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + local i686=linux-ia32-unpacked x86_64=linux-unpacked + install -Dm644 -t "${pkgdir}/usr/share/applications" "${pkgname}.desktop" + install -Dm755 -t "${pkgdir}/usr/bin" "$pkgname" - rm -r dist/linux-unpacked/resources/{dictionaries,build} - mkdir -m755 "$pkgdir"/{opt,usr/bin} - cp -a "dist/linux-unpacked" "$pkgdir/opt/rocketchat-desktop" - ln -s /opt/rocketchat-desktop/rocketchat-desktop "$pkgdir/usr/bin/rocketchat-desktop" - #install -Dm644 "dist/$_distname/resources/app.asar" "$pkgdir/usr/lib/$pkgname.asar" + cd "$_dir" + install -Dm644 "build/icons/512x512.png" "$pkgdir/usr/share/icons/hicolor/512x512/apps/$pkgname.png" + install -Dm644 -t "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE + install -Dm644 "dist/${!CARCH}/resources/app.asar" "${pkgdir}/usr/lib/${pkgname}.asar" } diff --git a/linux-target-dir.patch b/linux-target-dir.patch deleted file mode 100644 index 48d31b1af052..000000000000 --- a/linux-target-dir.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -ura package.orig/electron-builder.json package.new/electron-builder.json ---- package.orig/electron-builder.json 2020-03-07 01:41:08.526127735 +0100 -+++ package.new/electron-builder.json 2020-03-07 01:41:32.459330396 +0100 -@@ -85,10 +85,7 @@ - }, - "linux": { - "target": [ -- "tar.gz", -- "deb", -- "rpm", -- "snap" -+ "dir" - ], - "executableName": "rocketchat-desktop", - "category": "GNOME;GTK;Network;InstantMessaging", diff --git a/no-multiarch-build.patch b/no-multiarch-build.patch deleted file mode 100644 index 6f7c6a02930b..000000000000 --- a/no-multiarch-build.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ura package.orig/gulpfile.js package.new/gulpfile.js ---- package.orig/gulpfile.js 2020-02-11 13:55:00.000000000 +0100 -+++ package.new/gulpfile.js 2020-02-11 15:43:14.856730664 +0100 -@@ -62,6 +62,20 @@ - c: { productName: 'rocketchat' }, - })); - -+task('release:linux-x64', () => build({ -+ publish: 'never', -+ x64: true, -+ linux: [], -+ c: { productName: 'rocketchat' }, -+})); -+ -+task('release:linux-ia32', () => build({ -+ publish: 'never', -+ ia32: true, -+ linux: [], -+ c: { productName: 'rocketchat' }, -+})); -+ - task('release:win32', () => build({ - publish: NODE_ENV === 'production' ? 'onTagOrDraft' : 'never', - x64: true, diff --git a/rocketchat-desktop b/rocketchat-desktop index b4beaf01fb31..99e2ad4b10a6 100755 --- a/rocketchat-desktop +++ b/rocketchat-desktop @@ -1,3 +1,2 @@ #!/bin/sh - -exec electron /usr/lib/rocketchat-desktop.asar "$@" +exec electron7 /usr/lib/rocketchat-desktop.asar "$@" |