[arch-commits] Commit in keybase/trunk (2 files)

[Eli Schwartz]

    Date: Tuesday, October 23, 2018 @ 21:46:53
  Author: eschwartz
Revision: 398732

upgpkg: keybase 2.8.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 |   28 ++++++++++++++--------------
 PKGBUILD                               |    6 +++---
 2 files changed, 17 insertions(+), 17 deletions(-)

Modified: 0001-Don-t-use-electron-to-build.patch
===================================================================
--- 0001-Don-t-use-electron-to-build.patch	2018-10-23 21:36:41 UTC (rev 398731)
+++ 0001-Don-t-use-electron-to-build.patch	2018-10-23 21:46:53 UTC (rev 398732)
@@ -1,4 +1,4 @@
-From a9759f6e1921fc5504368ceeeb9fab05e929e317 Mon Sep 17 00:00:00 2001
+From 0f80a61934a2f0491be62aff3bcb3555f0a04017 Mon Sep 17 00:00:00 2001
 From: Eli Schwartz <eschwartz93 at gmail.com>
 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 f5c3d92501..6dde208258 100644
+index aae8b32be5..974597ed76 100644
 --- a/shared/desktop/package.desktop.js
 +++ b/shared/desktop/package.desktop.js
-@@ -88,7 +88,7 @@ function main() {
+@@ -89,7 +89,7 @@ function main() {
    // use the same version as the currently-installed electron
    console.log('Finding electron version')
    try {
@@ -22,7 +22,7 @@
      console.log('Found electron version:', packagerOpts.electronVersion)
    } catch (err) {
      console.log("Couldn't parse yarn list to find electron:", err)
-@@ -136,7 +136,7 @@ function startPack() {
+@@ -137,7 +137,7 @@ function startPack() {
                  .catch(postPackError)
              })
            })
@@ -32,7 +32,7 @@
              .then(postPack(platform, arch))
              .catch(postPackError)
 diff --git a/shared/desktop/yarn-helper/index.js b/shared/desktop/yarn-helper/index.js
-index 6c94069848..a5f857a2f6 100644
+index a0a28b3fda..7ed3c84e2f 100644
 --- a/shared/desktop/yarn-helper/index.js
 +++ b/shared/desktop/yarn-helper/index.js
 @@ -1,7 +1,6 @@
@@ -41,28 +41,28 @@
  import buildCommands from './build'
 -import electronComands from './electron'
  import fontCommands from './font'
+ import prettierCommands from './prettier'
  import {execSync} from 'child_process'
- 
-@@ -10,7 +9,6 @@ const [, , command, ...rest] = process.argv
+@@ -11,7 +10,6 @@ const [, , command, ...rest] = process.argv
  const commands = {
    ...buildCommands,
    ...fontCommands,
 -  ...electronComands,
+   ...prettierCommands,
    help: {
      code: () => {
-       console.log(
 diff --git a/shared/package.json b/shared/package.json
-index b902d54927..f27a203ce7 100644
+index f59bb9dd00..b170bbd5aa 100644
 --- a/shared/package.json
 +++ b/shared/package.json
-@@ -213,7 +213,6 @@
+@@ -207,7 +207,6 @@
      "css-loader": "1.0.0",
      "del": "3.0.0",
      "devtron": "1.4.0",
--    "electron": "2.0.9",
-     "electron-packager": "12.1.2",
-     "eslint": "5.6.0",
+-    "electron": "3.0.5",
+     "electron-packager": "12.2.0",
+     "eslint": "5.7.0",
      "eslint-config-standard": "12.0.0",
 -- 
-2.19.0
+2.19.1
 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-10-23 21:36:41 UTC (rev 398731)
+++ PKGBUILD	2018-10-23 21:46:53 UTC (rev 398732)
@@ -5,7 +5,7 @@
 pkgbase=keybase
 pkgname=('keybase' 'keybase-gui')
 pkgdesc='CLI tool for GPG with keybase.io'
-pkgver=2.7.0
+pkgver=2.8.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=('648fee700a5f325a8c5e20fee845639d7bccff175e92581679393aa1266b6b9f8c75dffbda11b333355843b6c462b7f77a3411ed1e89600af6099febacc2f27a'
+sha512sums=('01319ee36d50d928e195d854a3c332d7f327cabd8cdf930f643f3d373a6bd644634a56137f5f02477c15fc261cee3c01cb87efbb80333b7c7299a2048d9f1be1'
             'b3086ea6c60950284eecc331a8a648ea557f89f686f2adecb82b22d0ac65381683fbcc84875a48cf6ba9e3c63d4f06c73b84175621dca5e8f03b2a6a88cdcad4'
-            '42a2574c7618a45cc15eacfce9bde8012ade96ea46e600a478dc68abf01c1b5cd7fb3b361d1dc5f123f4ad4e64f8f1ba91d1e29ca211a763f0282683802806aa')
+            '076cbb73495f6df5b4c54f77c62ee2ccd9b485f837bf5c2206063b79f76814b1bc65910e031ac252b14e88531e50506acffe7608b00e01c7ae724de7f510a574')
 
 prepare() {
     cd client-${pkgver}