[arch-commits] Commit in keybase/trunk (PKGBUILD keybase-gui)

[Nicola Squartini]

    Date: Thursday, April 1, 2021 @ 14:48:05
  Author: tensor5
Revision: 910833

upgpkg: keybase 5.6.1-2

Use electron11.

Modified:
  keybase/trunk/PKGBUILD
  keybase/trunk/keybase-gui

-------------+
 PKGBUILD    |   12 +++++++-----
 keybase-gui |    2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-04-01 14:42:04 UTC (rev 910832)
+++ PKGBUILD	2021-04-01 14:48:05 UTC (rev 910833)
@@ -6,7 +6,7 @@
 pkgname=('keybase' 'kbfs' 'keybase-gui')
 pkgdesc='CLI tool for GPG with keybase.io'
 pkgver=5.6.1
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url='https://keybase.io/'
 license=('BSD')
@@ -17,11 +17,11 @@
         "0001-Don-t-use-electron-to-build.patch")
 sha512sums=('1c975bf5381593e650d3fb7fc1c7345e66f04a8730f38d8f2d6f1985d41b34e349506e269ab6736dee6e50c4d5563f25465dbf01061b33ea385015a2856d1eee'
             'SKIP'
-            'dc52d7c3d5798d9b83a4e42ba70a071b1cd5cb95c8b695a4b7a33d85744762ae644feef58cf4d582c8d8c169be68d57f392c33ff0796490e88f01f09b4c207d2'
+            'a0b306e2ade02a218d11f5220e140011e225d888deb8194aa2642531dde0c390fdf95aad5873b805208142ef47da9ef35f07311af84f1d1b08aed4a3d616fd39'
             'f759f69b774200261687842c66902a3c45638bb012ced9bd83d27491c8a0bbc0bc744dbb83ad7672d443f32d7303c15aeb0ded7a1a0d7ab56e7b1c1b64e263c3')
 b2sums=('95558b9fb9f9a887945180bcff8932ca80ed1052a99c9c338a4e11ca17ff50fbdd56718784ad0d25c3255f95b0b2d674765858d7b517369ba580b56779d44669'
         'SKIP'
-        'ac27d14a9625a3bca6a4ac87adbe5bb2f0aee0c4a88bf39ac8b3d235801743b2e40e6cd7db26089398f016a25046a674f521b890ddf73c3c6637d0d6bf6e1397'
+        'f98564298ff59de51e9c07172fc680e25ebab1280d06a9d2d8fef842b8bda3566ff8cfd210aee188bc7c55a18230a49e3060f38642dd12c9e57d8c5496bdfb5c'
         '02d7876fb0d68b05e9ee262925a063049bfa2e5e063789008c4c74e406084d4441d2c860ecb2b08596f9d9a8c9a6e9136a2cdbd8312bcbf376d9d6e6c811bcfc')
 validpgpkeys=('222B85B0F90BE2D24CFEB93F47484E50656D16C7') # Keybase.io Code Signing (v1) <code at keybase.io>
 
@@ -34,7 +34,7 @@
 
     # Fix paths to run electron /path/to/app (or our minimal wrapper script).
     # Also wire up "hideWindow" when running as a service or via XDG autostart.
-    sed -i 's@/opt/keybase/Keybase@/usr/bin/electron /usr/share/keybase-app@' \
+    sed -i 's@/opt/keybase/Keybase@/usr/bin/electron11 /usr/share/keybase-app@' \
         packaging/linux/systemd/keybase.gui.service
     sed -i 's/run_keybase/keybase-gui/g' \
         packaging/linux/keybase.desktop go/install/install_unix.go
@@ -57,6 +57,8 @@
     export CGO_LDFLAGS="${LDFLAGS}"
     export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw"
 
+    export GO111MODULE=off
+
     export GOPATH="${srcdir}/.gopath"
     go build -a -tags production -o ../bin/keybase github.com/keybase/client/go/keybase
     go build -a -tags production -o ../bin/kbnm github.com/keybase/client/go/kbnm
@@ -99,7 +101,7 @@
 
 package_keybase-gui() {
     pkgdesc="GUI frontend for GPG with keybase.io"
-    depends=('electron' 'keybase' 'kbfs')
+    depends=('electron11' 'keybase' 'kbfs')
 
     cd client-v${pkgver}/
 

Modified: keybase-gui
===================================================================
--- keybase-gui	2021-04-01 14:42:04 UTC (rev 910832)
+++ keybase-gui	2021-04-01 14:48:05 UTC (rev 910833)
@@ -11,7 +11,7 @@
 fi
 
 if [ $# -gt 0 ] || systemctl --user is-active --quiet keybase.gui; then
-    exec electron /usr/share/keybase-app "$@"
+    exec electron11 /usr/share/keybase-app "$@"
 else
     systemctl --user import-environment KEYBASE_AUTOSTART
     exec systemctl start --user --wait keybase.gui