summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Lisin2018-11-08 14:42:14 +0100
committerMatthias Lisin2018-11-08 14:45:16 +0100
commit8f10ae37daeeaa23094c0edf6c66b6440b2a43f2 (patch)
tree9d91275f8f1508dbd79ddce029c9103adfe605cd
parent0f703e3b4f0ad7421583428ecf3dc245bbe5b6a8 (diff)
downloadaur-8f10ae37daeeaa23094c0edf6c66b6440b2a43f2.tar.gz
upgpkg: rocketchat-desktop-2.14.0-2
Node 11 patch!
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD5
-rw-r--r--fix-node-11-build.patch15
3 files changed, 22 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1cd91b27ae89..8045682a12f3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = rocketchat-desktop
pkgdesc = Rocket.Chat Native Cross-Platform Desktop Application via Electron.
pkgver = 2.14.0
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/RocketChat/Rocket.Chat.Electron
arch = i686
arch = x86_64
@@ -19,10 +19,12 @@ pkgbase = rocketchat-desktop
source = rocketchat-desktop-2.14.0.tar.gz::https://github.com/RocketChat/Rocket.Chat.Electron/archive/2.14.0.tar.gz
source = fix-linux-target.patch
source = fix-gulp-release.patch
+ source = fix-node-11-build.patch
source = rocketchat-desktop.desktop
sha512sums = 3b90120d7fed1af17d244d4e546170beabbc59602ef1733860f8123d4460d23dcf719ec686f022597a6928489bea804f70b2ed665f55447ecb4f3b792cea4dec
sha512sums = 31e0b1d7d9a5fefa4ad4d186df2b3eb8849d7dee9dd3fa14fff6741006ef31191575a23ba62a86f53cf9fc692d138db6a380e2ad860077bc3d854c5a9083b716
sha512sums = 796a2a56a1facc2519d65955bb39d78733c13b5993c4b03cd2af11b83aa9c6132c0fbf9e7160146c6c87bc91cb04c4e66932fe891449d031c787284b5ce9d72a
+ sha512sums = e6a4523e0d983dfe01100cf84879ee358642e9158ee247d405f3010fcd91db62cec1667927891703d67b50bfdecfe476f9f42bb3018b6e7da2f469d0b0339555
sha512sums = d87664b9bdf30eac3011393d094962e0d568a94b5eaf4c8e5f17529442dcba905cea7341527066102a97a07a981acd6ce045b8737eb78a7d81a2a2d05023fe26
pkgname = rocketchat-desktop
diff --git a/PKGBUILD b/PKGBUILD
index 8a4d8ead49e5..6424ae4805c0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=rocketchat-desktop
pkgver=2.14.0
_srcname="Rocket.Chat.Electron-$pkgver"
-pkgrel=1
+pkgrel=2
pkgdesc='Rocket.Chat Native Cross-Platform Desktop Application via Electron.'
arch=('i686' 'x86_64')
url="https://github.com/RocketChat/Rocket.Chat.Electron"
@@ -14,10 +14,12 @@ conflicts=('rocketchat-client-bin')
source=("$pkgname-$pkgver.tar.gz::https://github.com/RocketChat/Rocket.Chat.Electron/archive/$pkgver.tar.gz"
fix-linux-target.patch
fix-gulp-release.patch
+ fix-node-11-build.patch
rocketchat-desktop.desktop)
sha512sums=('3b90120d7fed1af17d244d4e546170beabbc59602ef1733860f8123d4460d23dcf719ec686f022597a6928489bea804f70b2ed665f55447ecb4f3b792cea4dec'
'31e0b1d7d9a5fefa4ad4d186df2b3eb8849d7dee9dd3fa14fff6741006ef31191575a23ba62a86f53cf9fc692d138db6a380e2ad860077bc3d854c5a9083b716'
'796a2a56a1facc2519d65955bb39d78733c13b5993c4b03cd2af11b83aa9c6132c0fbf9e7160146c6c87bc91cb04c4e66932fe891449d031c787284b5ce9d72a'
+ 'e6a4523e0d983dfe01100cf84879ee358642e9158ee247d405f3010fcd91db62cec1667927891703d67b50bfdecfe476f9f42bb3018b6e7da2f469d0b0339555'
'd87664b9bdf30eac3011393d094962e0d568a94b5eaf4c8e5f17529442dcba905cea7341527066102a97a07a981acd6ce045b8737eb78a7d81a2a2d05023fe26')
if [[ $CARCH == "i686" ]]; then
_releasename="release:linux-ia32"
@@ -30,6 +32,7 @@ fi
prepare() {
patch -p1 -d "$_srcname" < fix-linux-target.patch
patch -p1 -d "$_srcname" < fix-gulp-release.patch
+ patch -p1 -d "$_srcname" < fix-node-11-build.patch
}
build() {
diff --git a/fix-node-11-build.patch b/fix-node-11-build.patch
new file mode 100644
index 000000000000..4176ab6c64c5
--- /dev/null
+++ b/fix-node-11-build.patch
@@ -0,0 +1,15 @@
+diff -ura package.orig/yarn.lock package.new/yarn.lock
+--- package.orig/yarn.lock 2018-11-08 14:16:00.578698688 +0100
++++ package.new/yarn.lock 2018-11-08 14:16:26.575549530 +0100
+@@ -4300,8 +4300,9 @@
+ to-regex "^3.0.1"
+
+ natives@^1.1.0:
+- version "1.1.5"
+- resolved "https://registry.yarnpkg.com/natives/-/natives-1.1.5.tgz#3bdbdb4104023e5dd239b56fc7ef3d9a17acc6aa"
++ version "1.1.6"
++ resolved "https://registry.yarnpkg.com/natives/-/natives-1.1.6.tgz#a603b4a498ab77173612b9ea1acdec4d980f00bb"
++ integrity sha512-6+TDFewD4yxY14ptjKaS63GVdtKiES1pTPyxn9Jb0rBqPMZ7VcCiooEhPNsr+mqHtMGxa/5c/HhcC4uPEUw/nA==
+
+ natural-compare@^1.4.0:
+ version "1.4.0"