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

[Eli Schwartz]

    Date: Thursday, October 10, 2019 @ 17:40:05
  Author: eschwartz
Revision: 514490

upgpkg: keybase 4.6.0-1

upstream release
golang 1.13.1 staticlibs/security rebuild

Modified:
  keybase/trunk/0001-Don-t-use-electron-to-build.patch
  keybase/trunk/PKGBUILD

----------------------------------------+
 0001-Don-t-use-electron-to-build.patch |   28 ++++++++++++++--------------
 PKGBUILD                               |   10 +++++-----
 2 files changed, 19 insertions(+), 19 deletions(-)

Modified: 0001-Don-t-use-electron-to-build.patch
===================================================================
--- 0001-Don-t-use-electron-to-build.patch	2019-10-10 17:31:58 UTC (rev 514489)
+++ 0001-Don-t-use-electron-to-build.patch	2019-10-10 17:40:05 UTC (rev 514490)
@@ -1,4 +1,4 @@
-From 9a2bbdb8c571bf09fcc5143a8ec7f50e8a30819a Mon Sep 17 00:00:00 2001
+From e8458e1231753f7853d9db150c6d021c93d81f01 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.tsx b/shared/desktop/package.desktop.tsx
-index d6e3297c63..343424dbac 100644
+index d921e3e7c9..8fec7e6834 100644
 --- a/shared/desktop/package.desktop.tsx
 +++ b/shared/desktop/package.desktop.tsx
-@@ -89,7 +89,7 @@ function main() {
+@@ -97,7 +97,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)
-@@ -137,7 +137,7 @@ function startPack() {
+@@ -145,7 +145,7 @@ function startPack() {
                  .catch(postPackError)
              })
            })
@@ -32,7 +32,7 @@
              .then(postPack(platform, arch))
              .catch(postPackError)
 diff --git a/shared/desktop/yarn-helper/index.tsx b/shared/desktop/yarn-helper/index.tsx
-index 50b2cdc4f7..3cea627bff 100644
+index b80018f9f9..30f26606b4 100644
 --- a/shared/desktop/yarn-helper/index.tsx
 +++ b/shared/desktop/yarn-helper/index.tsx
 @@ -1,6 +1,5 @@
@@ -42,7 +42,7 @@
  import fontCommands from './font'
  import prettierCommands from './prettier'
  import {execSync} from 'child_process'
-@@ -12,7 +11,6 @@ const [, , command, ...rest] = process.argv
+@@ -14,7 +13,6 @@ const [, , command, ...rest] = process.argv
  const commands = {
    ...buildCommands,
    ...fontCommands,
@@ -51,17 +51,17 @@
    help: {
      code: () => {
 diff --git a/shared/package.json b/shared/package.json
-index 82228ec398..d9a502f57d 100644
+index 5d51df0986..ad2944b63c 100644
 --- a/shared/package.json
 +++ b/shared/package.json
-@@ -243,7 +243,6 @@
+@@ -255,7 +255,6 @@
      "cross-env": "5.2.0",
-     "css-loader": "2.1.0",
+     "css-loader": "3.1.0",
      "del": "3.0.0",
--    "electron": "5.0.7",
-     "electron-packager": "13.0.1",
-     "eslint": "6.0.1",
-     "eslint-config-standard": "12.0.0",
+-    "electron": "6.0.9",
+     "electron-packager": "14.0.6",
+     "eslint": "6.2.1",
+     "eslint-plugin-filenames": "1.3.2",
 -- 
-2.22.1
+2.23.0
 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-10-10 17:31:58 UTC (rev 514489)
+++ PKGBUILD	2019-10-10 17:40:05 UTC (rev 514490)
@@ -5,7 +5,7 @@
 pkgbase=keybase
 pkgname=('keybase' 'kbfs' 'keybase-gui')
 pkgdesc='CLI tool for GPG with keybase.io'
-pkgver=4.5.0
+pkgver=4.6.0
 pkgrel=1
 arch=('x86_64')
 url='https://keybase.io/'
@@ -15,14 +15,14 @@
 source=("https://github.com/keybase/client/releases/download/v${pkgver}/${pkgbase}-v${pkgver}.tar.xz"{,.sig}
         "keybase-gui"
         "0001-Don-t-use-electron-to-build.patch")
-sha512sums=('06569f5bf9e4c02b40c6e3a5aaa0812baf8854492ff9fa7bdf168dbd0e6d4b6180ca1b55aed1829398c33b10b2b9693600cf4ca33344eaf34988e950202ac47b'
+sha512sums=('cfc0cefd80ced597e099fd6755280e2f77837cbf0cbc83df78b4f7ccb5360740c7563408652afb77f9c400d8e0c1e40975fc021a3b1959b1f2b326c9b460e4be'
             'SKIP'
             '4dcb3f4119959e2b203528a9ed637bf8b07b85964c632a8b2456aa1e2f29fada383a9bc2af8abbb05fcf6b22c43723ce6d08bea8187d61fa6581d15fefae850b'
-            '747f87b6a399375331acb86d6a1beddf83496cab8a598aaa54e4fe7a096a8964b3cbd757bb6924b286a16cd68b9f081f917233c9ff2b984a1f92ef85aa9dd0bd')
-b2sums=('af2ec8a7dbcf8a88b6f77b8e30349e17fa6aa3a00d2042cfa106c78b02887f24e66aab7c544a686bb815edd123f102d69c41541ce8cce67580f782163d7aedd4'
+            '32256b4cc3d2dd1ed645f58981db086af09cfe8d8f8e9d913c1d3731e249282dff699e545bf822e67abd4c36abc04130137e2b6f72877c898d75d602abd99fe7')
+b2sums=('76fd8fcb7ebf28f9e311c9cd18d152a5d5b4e7f546817a91be42f51a05a0bb13e01567a32b9d2160b0cb9cd6cf909dca4d9d45ff61f964628bf5a53606d424a4'
         'SKIP'
         '90aab71ef3b5db0c8ec81967604f43e3532be5f66ce7d9af1bd5204c1fde2062ef356909c03d237a63de93fa3cb045b9c31c3956cbecbea711602804e9d26efd'
-        'b20b444b58cc78c2960cc31cd070afae6b73d59e77afa76ab83167befd07b6ca91bdb1465d2d898ac61127c77fdbb708f48c591d053830883fbbaba660328de4')
+        'ffc92d422586ffaa4f1133889140e1ddf5ada0f05d77423c39b5d70bc98538bbe070e71bcfdf205959f929788f8971e60dc918aa3cdb74817b6a5ec21375b1d9')
 validpgpkeys=('222B85B0F90BE2D24CFEB93F47484E50656D16C7') # Keybase.io Code Signing (v1) <code at keybase.io>
 
 prepare() {