diff options
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | PKGBUILD | 34 | ||||
| -rw-r--r-- | linux-target-dir.patch | 15 | ||||
| -rw-r--r-- | no-multiarch-build.patch (renamed from fix-build.patch) | 18 |
4 files changed, 42 insertions, 37 deletions
@@ -1,29 +1,29 @@ pkgbase = rocketchat-desktop pkgdesc = Rocket.Chat Native Cross-Platform Desktop Application via Electron. pkgver = 2.17.7 - pkgrel = 2 + pkgrel = 3 url = https://github.com/RocketChat/Rocket.Chat.Electron arch = i686 arch = x86_64 license = MIT - makedepends = gulp - makedepends = nodejs + makedepends = nodejs-lts-erbium makedepends = node-gyp makedepends = python makedepends = yarn - depends = electron optdepends = hunspell-en_US: spell checking conflicts = rocketchat-client-bin source = rocketchat-desktop-2.17.7.tar.gz::https://github.com/RocketChat/Rocket.Chat.Electron/archive/2.17.7.tar.gz source = rocketchat-desktop source = rocketchat-desktop.desktop - source = fix-build.patch + source = no-multiarch-build.patch source = use-system-dictionaries.patch + source = linux-target-dir.patch sha512sums = 49514e0cce8e19f2dee6bfc44777065ae5d557d1cb4c3034988d5e1b13dd6a6b3e444eaec4d52ea647b7d04cbd7b1422eb31b0b8113d2f98ec32c7d5b62ad142 sha512sums = 1f0f7197012421ff42d2936f73e697e35eef8c57fb9fed59ee022f9d170d6496407f89e426526fba8451fe304b3a8de1724d1cd14bd85d781bbf6aa9ca078d7d sha512sums = d87664b9bdf30eac3011393d094962e0d568a94b5eaf4c8e5f17529442dcba905cea7341527066102a97a07a981acd6ce045b8737eb78a7d81a2a2d05023fe26 - sha512sums = ae924a722734962432c795f051dc35771c0347b655845fcb614c3424674e23aca071708ae0b84b19794b6f532af7a409ca078ff0f60db0ee88a8bcb09f78c1ab + sha512sums = 0fdce645784b9b0ccbe203ecc61f10840514e79748dc10adc98924e34682ce8d8f024aeb03fed318f915ed52cd2abf97da3cae21f4bf45354e08194638a7e34e sha512sums = 88361c770163c4c1d692128a4c8848d2f9700382394dbbe1391b2d0c22268dee1be850d391eece22ee51d9c119971337884dfd7a4c58c29e384b652592c4df9b + sha512sums = 07a54cc257a1d231b42339f9f1389ad7948e621e11d695498fb6e04f4f1aa07972faf6b34e83aaca94515252c7645d16d7f7da9e59c3d836426222c9e2c2c1fd pkgname = rocketchat-desktop @@ -3,25 +3,27 @@ pkgname=rocketchat-desktop pkgver=2.17.7 _srcname="Rocket.Chat.Electron-$pkgver" -pkgrel=2 +pkgrel=3 pkgdesc='Rocket.Chat Native Cross-Platform Desktop Application via Electron.' arch=('i686' 'x86_64') url="https://github.com/RocketChat/Rocket.Chat.Electron" license=('MIT') -depends=('electron') -makedepends=('gulp' 'nodejs' 'node-gyp' 'python' 'yarn') +#depends=('electron') +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" rocketchat-desktop rocketchat-desktop.desktop - fix-build.patch - use-system-dictionaries.patch) + no-multiarch-build.patch + use-system-dictionaries.patch + linux-target-dir.patch) sha512sums=('49514e0cce8e19f2dee6bfc44777065ae5d557d1cb4c3034988d5e1b13dd6a6b3e444eaec4d52ea647b7d04cbd7b1422eb31b0b8113d2f98ec32c7d5b62ad142' '1f0f7197012421ff42d2936f73e697e35eef8c57fb9fed59ee022f9d170d6496407f89e426526fba8451fe304b3a8de1724d1cd14bd85d781bbf6aa9ca078d7d' 'd87664b9bdf30eac3011393d094962e0d568a94b5eaf4c8e5f17529442dcba905cea7341527066102a97a07a981acd6ce045b8737eb78a7d81a2a2d05023fe26' - 'ae924a722734962432c795f051dc35771c0347b655845fcb614c3424674e23aca071708ae0b84b19794b6f532af7a409ca078ff0f60db0ee88a8bcb09f78c1ab' - '88361c770163c4c1d692128a4c8848d2f9700382394dbbe1391b2d0c22268dee1be850d391eece22ee51d9c119971337884dfd7a4c58c29e384b652592c4df9b') + '0fdce645784b9b0ccbe203ecc61f10840514e79748dc10adc98924e34682ce8d8f024aeb03fed318f915ed52cd2abf97da3cae21f4bf45354e08194638a7e34e' + '88361c770163c4c1d692128a4c8848d2f9700382394dbbe1391b2d0c22268dee1be850d391eece22ee51d9c119971337884dfd7a4c58c29e384b652592c4df9b' + '07a54cc257a1d231b42339f9f1389ad7948e621e11d695498fb6e04f4f1aa07972faf6b34e83aaca94515252c7645d16d7f7da9e59c3d836426222c9e2c2c1fd') if [[ $CARCH == "i686" ]]; then _releasename="release:linux-ia32" _distname="linux-ia32-unpacked" @@ -31,26 +33,32 @@ else fi prepare() { - for patch in fix-build.patch use-system-dictionaries.patch; do + 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 upgrade "electron@$(sed '/^v/ d' /usr/lib/electron/version)" --non-interactive --cache-folder "$srcdir/yarn-cache" + yarn install --non-interactive + #yarn upgrade "electron@$(sed '/^v/ d' /usr/lib/electron/version)" --non-interactive } build() { cd "$_srcname" - NODE_ENV=production yarn --cache-folder="$srcdir/yarn-cache" gulp build - NODE_ENV=production yarn --cache-folder="$srcdir/yarn-cache" gulp "$_releasename" + NODE_ENV=production yarn gulp build + NODE_ENV=production yarn gulp "$_releasename" } package() { install -Dm644 "$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop" - install -Dm755 "$pkgname" "$pkgdir/usr/bin/$pkgname" + #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" - install -Dm644 "dist/$_distname/resources/app.asar" "$pkgdir/usr/lib/$pkgname.asar" + + 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" } diff --git a/linux-target-dir.patch b/linux-target-dir.patch new file mode 100644 index 000000000000..48d31b1af052 --- /dev/null +++ b/linux-target-dir.patch @@ -0,0 +1,15 @@ +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/fix-build.patch b/no-multiarch-build.patch index 12f42f138501..6f7c6a02930b 100644 --- a/fix-build.patch +++ b/no-multiarch-build.patch @@ -1,21 +1,3 @@ -diff -ura package.orig/electron-builder.json package.new/electron-builder.json ---- package.orig/electron-builder.json 2020-02-11 13:55:00.000000000 +0100 -+++ package.new/electron-builder.json 2020-02-11 15:44:30.577329034 +0100 -@@ -83,12 +83,10 @@ - ], - "artifactName": "rocketchat-${version}-${arch}.${ext}" - }, -+ "electronDist": "/usr/lib/electron", - "linux": { - "target": [ -- "tar.gz", -- "deb", -- "rpm", -- "snap" -+ "dir" - ], - "executableName": "rocketchat-desktop", - "category": "GNOME;GTK;Network;InstantMessaging", 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 |