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

[Eli Schwartz]

    Date: Wednesday, March 11, 2020 @ 02:47:58
  Author: eschwartz
Revision: 594071

upgpkg: keybase 5.3.0-1: upstream release

Distribute the files for keybase-gui's new *.saltpack file opener support.

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

----------------------------------------+
 0001-Don-t-use-electron-to-build.patch |   16 ++++++++--------
 PKGBUILD                               |   16 ++++++++++------
 2 files changed, 18 insertions(+), 14 deletions(-)

Modified: 0001-Don-t-use-electron-to-build.patch
===================================================================
--- 0001-Don-t-use-electron-to-build.patch	2020-03-11 02:36:29 UTC (rev 594070)
+++ 0001-Don-t-use-electron-to-build.patch	2020-03-11 02:47:58 UTC (rev 594071)
@@ -1,4 +1,4 @@
-From e70dda7b2d2e31430ff1c032f8197170e42972dd Mon Sep 17 00:00:00 2001
+From 7b4316eda537174fb8726d02c64584fa9d2b5650 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 d921e3e7c9..8fec7e6834 100644
+index b10bb10295..f4b5fc3e6a 100644
 --- a/shared/desktop/package.desktop.tsx
 +++ b/shared/desktop/package.desktop.tsx
-@@ -97,7 +97,7 @@ function main() {
+@@ -133,7 +133,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)
-@@ -145,7 +145,7 @@ function startPack() {
+@@ -181,7 +181,7 @@ function startPack() {
                  .catch(postPackError)
              })
            })
@@ -51,17 +51,17 @@
    help: {
      code: () => {
 diff --git a/shared/package.json b/shared/package.json
-index a097b75f54..5b3a244f77 100644
+index 373f43440e..14deb7fd99 100644
 --- a/shared/package.json
 +++ b/shared/package.json
-@@ -258,7 +258,6 @@
+@@ -201,7 +201,6 @@
      "cross-env": "5.2.0",
      "css-loader": "3.2.0",
      "del": "3.0.0",
--    "electron": "7.1.9",
+-    "electron": "8.0.2",
      "electron-packager": "14.0.6",
      "eslint": "6.4.0",
      "eslint-plugin-filenames": "1.3.2",
 -- 
-2.25.0
+2.25.1
 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-11 02:36:29 UTC (rev 594070)
+++ PKGBUILD	2020-03-11 02:47:58 UTC (rev 594071)
@@ -5,8 +5,8 @@
 pkgbase=keybase
 pkgname=('keybase' 'kbfs' 'keybase-gui')
 pkgdesc='CLI tool for GPG with keybase.io'
-pkgver=5.2.0
-pkgrel=2
+pkgver=5.3.0
+pkgrel=1
 arch=('x86_64')
 url='https://keybase.io/'
 license=('BSD')
@@ -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=('fb41428f49376e3b6471a2235dc7a904fd08ef4e9cbbdfe3e33cbc02db8770f833f6be55c77c63fcb954468cd2ce8f4f08d47e1c453050e7e366f3288c2e37e4'
+sha512sums=('cf4cd22bb148900d57b435a88c6f02b38f6e65646a6b60efae5f4c992574181059989737f9fd3862359c83349780f2cc41b039c2f5b8f36789eb72e0a2bfba63'
             'SKIP'
             'd672bdd308b2ab6f7b1248300f85f11b480e08149e1e4da5e01dac6c551b44dbfceb5c89d0fd17ce7a64c8b83cd4c7df14e24c31c2f37ae532abbb9099320290'
-            'bfc0919eba93d0367bfbd1a51c5600a1a39bdd1c01e626c7dcbd624c34c9e850006d127455746530598c6660d6ac8a3862fb23897a9fca1dac76ad231fbfdeb5')
-b2sums=('2835729da5590072aa16f6c24ca5083c783ed40984b0be4bca539b3c9ef265e4f5c97267bd6202d0b0c93165d8d63a105feff9e2a65a241b2776f70af2f36da0'
+            '1485e41432218b88aff71bbe68d265baad18c8b91b3d51cacdb4ac9b09abfb6cde91b9b87cb861cffeff92830159552307a89462c8697bb066416bd897e7b68b')
+b2sums=('aaf0d5adb49a01cde03da1893bec9938360bedbb36cd9e0951b21188834c31d1309f1e1f07956cdb0670df4c9b0b9cf203de2326a0704d6482d56df26a807afd'
         'SKIP'
         'db6d63df77aa73c230128b5c6cd278215e0dfac2b42db861127571a6c867d8a305c18a5ea12a616669c77bd072ab8b26aa52379cbd8167c34bc043bfdcefec1d'
-        'e1a42f150f322c560887143a7878df224acafe2391bff6f9f755f7d155303a4c263b9ed3b2ca1d718487bc55f2c39b49f207a7fe06977b2a60b5f99df4122b58')
+        '164dd6f37fe38d3c840b2b92d41553e0be67985d7c8471833a9ff381c05b0c35f295bfc630aa3ce6e31afb70b805d071e8c0a438a504064d24f99720c1571b9a')
 validpgpkeys=('222B85B0F90BE2D24CFEB93F47484E50656D16C7') # Keybase.io Code Signing (v1) <code at keybase.io>
 
 prepare() {
@@ -92,6 +92,8 @@
 
     cd client-v${pkgver}/
 
+    install -Dm644 packaging/linux/x-saltpack.xml \
+        "${pkgdir}"/usr/share/mime/packages/x-saltpack.xml
     install -Dm644 packaging/linux/keybase.desktop \
         "${pkgdir}"/usr/share/applications/keybase.desktop
     # more systemd activation
@@ -105,6 +107,8 @@
     for i in 16 32 128 256 512 ; do
         install -Dm644 media/icons/Keybase.iconset/icon_${i}x${i}.png \
             "${pkgdir}"/usr/share/icons/hicolor/${i}x${i}/apps/keybase.png
+        install -Dm644 media/icons/Saltpack.iconset/icon_${i}x${i}.png \
+            "${pkgdir}"/usr/share/icons/hicolor/${i}x${i}/mimetypes/application-x-saltpack.png
     done
     # ???
     install -Dm644 media/icons/Keybase.iconset/icon_32x32 at 2x.png \