Date: Wednesday, October 3, 2018 @ 06:45:38 Author: eschwartz Revision: 389110
upgpkg: keybase 2.7.0-1 upstream release Modified: keybase/trunk/0001-Don-t-use-electron-to-build.patch keybase/trunk/PKGBUILD ----------------------------------------+ 0001-Don-t-use-electron-to-build.patch | 42 +++++++++++++++---------------- PKGBUILD | 6 ++-- 2 files changed, 24 insertions(+), 24 deletions(-) Modified: 0001-Don-t-use-electron-to-build.patch =================================================================== --- 0001-Don-t-use-electron-to-build.patch 2018-10-03 06:37:05 UTC (rev 389109) +++ 0001-Don-t-use-electron-to-build.patch 2018-10-03 06:45:38 UTC (rev 389110) @@ -1,4 +1,4 @@ -From 48678e2d18b80b238f94c0d6e01ae535dd010a81 Mon Sep 17 00:00:00 2001 +From a9759f6e1921fc5504368ceeeb9fab05e929e317 Mon Sep 17 00:00:00 2001 From: Eli Schwartz <[email protected]> Date: Thu, 21 Jun 2018 05:00:37 -0400 Subject: [PATCH] Don't use electron to build @@ -10,10 +10,10 @@ 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/shared/desktop/package.desktop.js b/shared/desktop/package.desktop.js -index 827b087fc..109f9048c 100644 +index f5c3d92501..6dde208258 100644 --- a/shared/desktop/package.desktop.js +++ b/shared/desktop/package.desktop.js -@@ -87,7 +87,7 @@ function main() { +@@ -88,7 +88,7 @@ function main() { // use the same version as the currently-installed electron console.log('Finding electron version') try { @@ -22,17 +22,17 @@ console.log('Found electron version:', packagerOpts.electronVersion) } catch (err) { console.log("Couldn't parse yarn list to find electron:", err) -@@ -140,7 +140,7 @@ function startPack() { - pack(os.platform(), shouldBuildAnArch) - .then(postPack(os.platform(), shouldBuildAnArch)) - .catch(postPackError) +@@ -136,7 +136,7 @@ function startPack() { + .catch(postPackError) + }) + }) - } else { + } else if (false) { - // build for current platform only - pack(os.platform(), os.arch()) - .then(postPack(os.platform(), os.arch())) + pack(platform, arch) + .then(postPack(platform, arch)) + .catch(postPackError) diff --git a/shared/desktop/yarn-helper/index.js b/shared/desktop/yarn-helper/index.js -index 3a5851cb0..d71b7f31e 100644 +index 6c94069848..a5f857a2f6 100644 --- a/shared/desktop/yarn-helper/index.js +++ b/shared/desktop/yarn-helper/index.js @@ -1,7 +1,6 @@ @@ -41,9 +41,9 @@ import buildCommands from './build' -import electronComands from './electron' import fontCommands from './font' - import fs from 'fs' - import path from 'path' -@@ -12,7 +11,6 @@ const [, , command, ...rest] = process.argv + import {execSync} from 'child_process' + +@@ -10,7 +9,6 @@ const [, , command, ...rest] = process.argv const commands = { ...buildCommands, ...fontCommands, @@ -52,17 +52,17 @@ code: () => { console.log( diff --git a/shared/package.json b/shared/package.json -index c25555962..9da4a33ce 100644 +index b902d54927..f27a203ce7 100644 --- a/shared/package.json +++ b/shared/package.json -@@ -207,7 +207,6 @@ - "css-loader": "0.28.11", +@@ -213,7 +213,6 @@ + "css-loader": "1.0.0", "del": "3.0.0", "devtron": "1.4.0", -- "electron": "2.0.8", - "electron-packager": "12.1.1", - "eslint": "5.3.0", - "eslint-config-standard": "12.0.0-alpha.0", +- "electron": "2.0.9", + "electron-packager": "12.1.2", + "eslint": "5.6.0", + "eslint-config-standard": "12.0.0", -- 2.19.0 Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-10-03 06:37:05 UTC (rev 389109) +++ PKGBUILD 2018-10-03 06:45:38 UTC (rev 389110) @@ -5,7 +5,7 @@ pkgbase=keybase pkgname=('keybase' 'keybase-gui') pkgdesc='CLI tool for GPG with keybase.io' -pkgver=2.6.2 +pkgver=2.7.0 pkgrel=1 arch=('x86_64') url='https://keybase.io/' @@ -15,9 +15,9 @@ source=("${pkgname}-${pkgver}.tar.gz::https://github.com/keybase/client/archive/v${pkgver}.tar.gz"; "keybase-gui" "0001-Don-t-use-electron-to-build.patch") -sha512sums=('e6efccc8cf4d0238ee98297ade565c8df1f00f184c7ebf9252f5bf3057ffac3939b8084bb81581b58c34bc0a80e6a98b4f1d96e20c8b49af53fb28893b04faf2' +sha512sums=('648fee700a5f325a8c5e20fee845639d7bccff175e92581679393aa1266b6b9f8c75dffbda11b333355843b6c462b7f77a3411ed1e89600af6099febacc2f27a' 'b3086ea6c60950284eecc331a8a648ea557f89f686f2adecb82b22d0ac65381683fbcc84875a48cf6ba9e3c63d4f06c73b84175621dca5e8f03b2a6a88cdcad4' - '364c532bdef069d9684f1fe8fc1c448855e9b8d86c1da171afc22d19e77966071bc90f8cc6657667626b43bea7420ce4f1adadf871cae09f79438c444247c4d6') + '42a2574c7618a45cc15eacfce9bde8012ade96ea46e600a478dc68abf01c1b5cd7fb3b361d1dc5f123f4ad4e64f8f1ba91d1e29ca211a763f0282683802806aa') prepare() { cd client-${pkgver}
