[arch-commits] Commit in keybase/repos/community-x86_64 (8 files)
Eli Schwartz
eschwartz at archlinux.org
Fri Dec 13 17:00:52 UTC 2019
Date: Friday, December 13, 2019 @ 17:00:52
Author: eschwartz
Revision: 537558
archrelease: copy trunk to community-x86_64
Added:
keybase/repos/community-x86_64/0001-Don-t-use-electron-to-build.patch
(from rev 537557, keybase/trunk/0001-Don-t-use-electron-to-build.patch)
keybase/repos/community-x86_64/PKGBUILD
(from rev 537557, keybase/trunk/PKGBUILD)
keybase/repos/community-x86_64/kbfs.install
(from rev 537557, keybase/trunk/kbfs.install)
keybase/repos/community-x86_64/keybase-gui
(from rev 537557, keybase/trunk/keybase-gui)
Deleted:
keybase/repos/community-x86_64/0001-Don-t-use-electron-to-build.patch
keybase/repos/community-x86_64/PKGBUILD
keybase/repos/community-x86_64/kbfs.install
keybase/repos/community-x86_64/keybase-gui
----------------------------------------+
0001-Don-t-use-electron-to-build.patch | 134 ++++++++---------
PKGBUILD | 240 +++++++++++++++----------------
kbfs.install | 30 +--
keybase-gui | 22 +-
4 files changed, 213 insertions(+), 213 deletions(-)
Deleted: 0001-Don-t-use-electron-to-build.patch
===================================================================
--- 0001-Don-t-use-electron-to-build.patch 2019-12-13 17:00:27 UTC (rev 537557)
+++ 0001-Don-t-use-electron-to-build.patch 2019-12-13 17:00:52 UTC (rev 537558)
@@ -1,67 +0,0 @@
-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
-
----
- shared/desktop/package.desktop.tsx | 4 ++--
- shared/desktop/yarn-helper/index.tsx | 2 --
- shared/package.json | 1 -
- 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
---- a/shared/desktop/package.desktop.tsx
-+++ b/shared/desktop/package.desktop.tsx
-@@ -97,7 +97,7 @@ function main() {
- // use the same version as the currently-installed electron
- console.log('Finding electron version')
- try {
-- packagerOpts.electronVersion = require('../package.json').devDependencies.electron
-+ packagerOpts.electronVersion = 'unused string'
- 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() {
- .catch(postPackError)
- })
- })
-- } else {
-+ } else if (false) {
- pack(platform, arch)
- .then(postPack(platform, arch))
- .catch(postPackError)
-diff --git a/shared/desktop/yarn-helper/index.tsx b/shared/desktop/yarn-helper/index.tsx
-index b80018f9f9..30f26606b4 100644
---- a/shared/desktop/yarn-helper/index.tsx
-+++ b/shared/desktop/yarn-helper/index.tsx
-@@ -1,6 +1,5 @@
- // Helper for cross platform yarn run script commands
- import buildCommands from './build'
--import electronComands from './electron'
- import fontCommands from './font'
- import prettierCommands from './prettier'
- import {execSync} from 'child_process'
-@@ -14,7 +13,6 @@ const [, , command, ...rest] = process.argv
- const commands = {
- ...buildCommands,
- ...fontCommands,
-- ...electronComands,
- ...prettierCommands,
- help: {
- code: () => {
-diff --git a/shared/package.json b/shared/package.json
-index 5d51df0986..ad2944b63c 100644
---- a/shared/package.json
-+++ b/shared/package.json
-@@ -255,7 +255,6 @@
- "cross-env": "5.2.0",
- "css-loader": "3.1.0",
- "del": "3.0.0",
-- "electron": "6.0.9",
- "electron-packager": "14.0.6",
- "eslint": "6.2.1",
- "eslint-plugin-filenames": "1.3.2",
---
-2.23.0
-
Copied: keybase/repos/community-x86_64/0001-Don-t-use-electron-to-build.patch (from rev 537557, keybase/trunk/0001-Don-t-use-electron-to-build.patch)
===================================================================
--- 0001-Don-t-use-electron-to-build.patch (rev 0)
+++ 0001-Don-t-use-electron-to-build.patch 2019-12-13 17:00:52 UTC (rev 537558)
@@ -0,0 +1,67 @@
+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
+
+---
+ shared/desktop/package.desktop.tsx | 4 ++--
+ shared/desktop/yarn-helper/index.tsx | 2 --
+ shared/package.json | 1 -
+ 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
+--- a/shared/desktop/package.desktop.tsx
++++ b/shared/desktop/package.desktop.tsx
+@@ -97,7 +97,7 @@ function main() {
+ // use the same version as the currently-installed electron
+ console.log('Finding electron version')
+ try {
+- packagerOpts.electronVersion = require('../package.json').devDependencies.electron
++ packagerOpts.electronVersion = 'unused string'
+ 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() {
+ .catch(postPackError)
+ })
+ })
+- } else {
++ } else if (false) {
+ pack(platform, arch)
+ .then(postPack(platform, arch))
+ .catch(postPackError)
+diff --git a/shared/desktop/yarn-helper/index.tsx b/shared/desktop/yarn-helper/index.tsx
+index b80018f9f9..30f26606b4 100644
+--- a/shared/desktop/yarn-helper/index.tsx
++++ b/shared/desktop/yarn-helper/index.tsx
+@@ -1,6 +1,5 @@
+ // Helper for cross platform yarn run script commands
+ import buildCommands from './build'
+-import electronComands from './electron'
+ import fontCommands from './font'
+ import prettierCommands from './prettier'
+ import {execSync} from 'child_process'
+@@ -14,7 +13,6 @@ const [, , command, ...rest] = process.argv
+ const commands = {
+ ...buildCommands,
+ ...fontCommands,
+- ...electronComands,
+ ...prettierCommands,
+ help: {
+ code: () => {
+diff --git a/shared/package.json b/shared/package.json
+index 5d51df0986..ad2944b63c 100644
+--- a/shared/package.json
++++ b/shared/package.json
+@@ -255,7 +255,6 @@
+ "cross-env": "5.2.0",
+ "css-loader": "3.1.0",
+ "del": "3.0.0",
+- "electron": "6.0.9",
+ "electron-packager": "14.0.6",
+ "eslint": "6.2.1",
+ "eslint-plugin-filenames": "1.3.2",
+--
+2.23.0
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-12-13 17:00:27 UTC (rev 537557)
+++ PKGBUILD 2019-12-13 17:00:52 UTC (rev 537558)
@@ -1,120 +0,0 @@
-# Maintainer: Eli Schwartz <eschwartz at archlinux.org>
-# Contributor: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Michael Hansen <zrax0111 gmail com>
-
-pkgbase=keybase
-pkgname=('keybase' 'kbfs' 'keybase-gui')
-pkgdesc='CLI tool for GPG with keybase.io'
-pkgver=5.0.0
-pkgrel=1
-arch=('x86_64')
-url='https://keybase.io/'
-license=('BSD')
-# git is needed for yarn...
-makedepends=('git' 'go-pie' 'yarn')
-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=('547cee20e7a65c6a30f57108ffc936fbab53134effe730fa41995cc19f3acf74b15fa224981a3d426576097351499c090735f9b723120edc21410c02e4e25380'
- 'SKIP'
- '4dcb3f4119959e2b203528a9ed637bf8b07b85964c632a8b2456aa1e2f29fada383a9bc2af8abbb05fcf6b22c43723ce6d08bea8187d61fa6581d15fefae850b'
- '32256b4cc3d2dd1ed645f58981db086af09cfe8d8f8e9d913c1d3731e249282dff699e545bf822e67abd4c36abc04130137e2b6f72877c898d75d602abd99fe7')
-b2sums=('2c80183fb94bcbef134e8bd1b9bf7c6136488eabdbbca2552495e6b547f4627ff39088428b8e00b6824debf76ef64c2567455b74f12b82072665e4f30d2ef4eb'
- 'SKIP'
- '90aab71ef3b5db0c8ec81967604f43e3532be5f66ce7d9af1bd5204c1fde2062ef356909c03d237a63de93fa3cb045b9c31c3956cbecbea711602804e9d26efd'
- 'ffc92d422586ffaa4f1133889140e1ddf5ada0f05d77423c39b5d70bc98538bbe070e71bcfdf205959f929788f8971e60dc918aa3cdb74817b6a5ec21375b1d9')
-validpgpkeys=('222B85B0F90BE2D24CFEB93F47484E50656D16C7') # Keybase.io Code Signing (v1) <code at keybase.io>
-
-prepare() {
- cd client-v${pkgver}
-
- export GOPATH="${srcdir}/.gopath"
- mkdir -p "${GOPATH}"/src/github.com/keybase
- ln -sf "${PWD}" "${GOPATH}"/src/github.com/keybase/client
-
- # 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@' \
- packaging/linux/systemd/keybase.gui.service
- sed -i 's/run_keybase/keybase-gui/g' \
- packaging/linux/keybase.desktop go/install/install_unix.go
-
- patch -p1 -i ../0001-Don-t-use-electron-to-build.patch
-}
-
-build() {
- cd client-v${pkgver}/go/keybase
-
- export GOPATH="${srcdir}/.gopath"
- # go build -a -tags production -gccgoflags "$CFLAGS $LDFLAGS" github.com/keybase/client/go/keybase
- 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
- go build -a -tags production -o ../bin/kbfsfuse github.com/keybase/client/go/kbfs/kbfsfuse
- go build -a -tags production -o ../bin/git-remote-keybase github.com/keybase/client/go/kbfs/kbfsgit/git-remote-keybase
-
- cd ../../shared
- yarn install
- yarn run package --appVersion $pkgver
-}
-
-package_keybase() {
- depends=('gnupg')
- optdepends=('kbfs: for the fuse-based fileystem and the encryption subcommand')
-
- cd client-v${pkgver}
-
- install -Dm755 -t "${pkgdir}"/usr/bin/ go/bin/{keybase,kbnm}
-
- # native messaging whitelists
- KBNM_INSTALL_ROOT=1 KBNM_INSTALL_OVERLAY="${pkgdir}" "${pkgdir}/usr/bin/kbnm" install
- # systemd activation
- install -Dm644 packaging/linux/systemd/keybase.service "${pkgdir}"/usr/lib/systemd/user/keybase.service
- install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
-
-package_kbfs() {
- pkgdesc="The Keybase filesystem"
- url="https://keybase.io/docs/kbfs"
- depends=('fuse' 'keybase')
- install=kbfs.install
-
- cd client-v${pkgver}
-
- install -Dm755 -t "${pkgdir}"/usr/bin/ go/bin/{kbfsfuse,git-remote-keybase}
- install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
- # more systemd activation
- install -Dm644 packaging/linux/systemd/kbfs.service "$pkgdir"/usr/lib/systemd/user/kbfs.service
-}
-
-package_keybase-gui() {
- pkgdesc="GUI frontend for GPG with keybase.io"
- depends=('electron' 'keybase' 'kbfs')
-
- cd client-v${pkgver}/
-
- install -Dm644 packaging/linux/keybase.desktop \
- "${pkgdir}"/usr/share/applications/keybase.desktop
- # more systemd activation
- install -Dm644 packaging/linux/systemd/keybase.gui.service \
- "${pkgdir}"/usr/lib/systemd/user/keybase.gui.service
- # wrapper for electron
- install -Dm755 "${srcdir}"/keybase-gui "${pkgdir}"/usr/bin/keybase-gui
-
- install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-
- 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
- done
- # ???
- install -Dm644 media/icons/Keybase.iconset/icon_32x32 at 2x.png \
- "${pkgdir}"/usr/share/icons/hicolor/64x64/apps/keybase.png
- install -Dm644 media/icons/Keybase.iconset/icon_512x512 at 2x.png \
- "${pkgdir}"/usr/share/icons/hicolor/1024x1024/apps/keybase.png
-
- # the app itself
- cd shared/desktop/build
- rm -rf desktop/sourcemaps/
- mkdir -p "${pkgdir}"/usr/share/keybase-app
- cp -r * "${pkgdir}"/usr/share/keybase-app/
-}
Copied: keybase/repos/community-x86_64/PKGBUILD (from rev 537557, keybase/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-12-13 17:00:52 UTC (rev 537558)
@@ -0,0 +1,120 @@
+# Maintainer: Eli Schwartz <eschwartz at archlinux.org>
+# Contributor: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Michael Hansen <zrax0111 gmail com>
+
+pkgbase=keybase
+pkgname=('keybase' 'kbfs' 'keybase-gui')
+pkgdesc='CLI tool for GPG with keybase.io'
+pkgver=5.1.1
+pkgrel=1
+arch=('x86_64')
+url='https://keybase.io/'
+license=('BSD')
+# git is needed for yarn...
+makedepends=('git' 'go-pie' 'yarn')
+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=('ae3c8b3ca8d0049995e906197ca98ad70b5e4f52799d8b5d5ddf40e0a37e19a583df4af6fb9238bf6e9ded961570937a04cef6b65d2e00b4af2e31ccc8517672'
+ 'SKIP'
+ '4dcb3f4119959e2b203528a9ed637bf8b07b85964c632a8b2456aa1e2f29fada383a9bc2af8abbb05fcf6b22c43723ce6d08bea8187d61fa6581d15fefae850b'
+ '32256b4cc3d2dd1ed645f58981db086af09cfe8d8f8e9d913c1d3731e249282dff699e545bf822e67abd4c36abc04130137e2b6f72877c898d75d602abd99fe7')
+b2sums=('9bca3811af39bb403bf56d4b9b4f22b073efb117e4087737dfb6ce025757032371e85ba198bf9babb90e9ffa770e91f831c9cdec9687748627a530453dd872c2'
+ 'SKIP'
+ '90aab71ef3b5db0c8ec81967604f43e3532be5f66ce7d9af1bd5204c1fde2062ef356909c03d237a63de93fa3cb045b9c31c3956cbecbea711602804e9d26efd'
+ 'ffc92d422586ffaa4f1133889140e1ddf5ada0f05d77423c39b5d70bc98538bbe070e71bcfdf205959f929788f8971e60dc918aa3cdb74817b6a5ec21375b1d9')
+validpgpkeys=('222B85B0F90BE2D24CFEB93F47484E50656D16C7') # Keybase.io Code Signing (v1) <code at keybase.io>
+
+prepare() {
+ cd client-v${pkgver}
+
+ export GOPATH="${srcdir}/.gopath"
+ mkdir -p "${GOPATH}"/src/github.com/keybase
+ ln -sf "${PWD}" "${GOPATH}"/src/github.com/keybase/client
+
+ # 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@' \
+ packaging/linux/systemd/keybase.gui.service
+ sed -i 's/run_keybase/keybase-gui/g' \
+ packaging/linux/keybase.desktop go/install/install_unix.go
+
+ patch -p1 -i ../0001-Don-t-use-electron-to-build.patch
+}
+
+build() {
+ cd client-v${pkgver}/go/keybase
+
+ export GOPATH="${srcdir}/.gopath"
+ # go build -a -tags production -gccgoflags "$CFLAGS $LDFLAGS" github.com/keybase/client/go/keybase
+ 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
+ go build -a -tags production -o ../bin/kbfsfuse github.com/keybase/client/go/kbfs/kbfsfuse
+ go build -a -tags production -o ../bin/git-remote-keybase github.com/keybase/client/go/kbfs/kbfsgit/git-remote-keybase
+
+ cd ../../shared
+ yarn install
+ yarn run package --appVersion $pkgver
+}
+
+package_keybase() {
+ depends=('gnupg')
+ optdepends=('kbfs: for the fuse-based fileystem and the encryption subcommand')
+
+ cd client-v${pkgver}
+
+ install -Dm755 -t "${pkgdir}"/usr/bin/ go/bin/{keybase,kbnm}
+
+ # native messaging whitelists
+ KBNM_INSTALL_ROOT=1 KBNM_INSTALL_OVERLAY="${pkgdir}" "${pkgdir}/usr/bin/kbnm" install
+ # systemd activation
+ install -Dm644 packaging/linux/systemd/keybase.service "${pkgdir}"/usr/lib/systemd/user/keybase.service
+ install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}
+
+package_kbfs() {
+ pkgdesc="The Keybase filesystem"
+ url="https://keybase.io/docs/kbfs"
+ depends=('fuse' 'keybase')
+ install=kbfs.install
+
+ cd client-v${pkgver}
+
+ install -Dm755 -t "${pkgdir}"/usr/bin/ go/bin/{kbfsfuse,git-remote-keybase}
+ install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+ # more systemd activation
+ install -Dm644 packaging/linux/systemd/kbfs.service "$pkgdir"/usr/lib/systemd/user/kbfs.service
+}
+
+package_keybase-gui() {
+ pkgdesc="GUI frontend for GPG with keybase.io"
+ depends=('electron' 'keybase' 'kbfs')
+
+ cd client-v${pkgver}/
+
+ install -Dm644 packaging/linux/keybase.desktop \
+ "${pkgdir}"/usr/share/applications/keybase.desktop
+ # more systemd activation
+ install -Dm644 packaging/linux/systemd/keybase.gui.service \
+ "${pkgdir}"/usr/lib/systemd/user/keybase.gui.service
+ # wrapper for electron
+ install -Dm755 "${srcdir}"/keybase-gui "${pkgdir}"/usr/bin/keybase-gui
+
+ install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+
+ 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
+ done
+ # ???
+ install -Dm644 media/icons/Keybase.iconset/icon_32x32 at 2x.png \
+ "${pkgdir}"/usr/share/icons/hicolor/64x64/apps/keybase.png
+ install -Dm644 media/icons/Keybase.iconset/icon_512x512 at 2x.png \
+ "${pkgdir}"/usr/share/icons/hicolor/1024x1024/apps/keybase.png
+
+ # the app itself
+ cd shared/desktop/build
+ rm -rf desktop/sourcemaps/
+ mkdir -p "${pkgdir}"/usr/share/keybase-app
+ cp -r * "${pkgdir}"/usr/share/keybase-app/
+}
Deleted: kbfs.install
===================================================================
--- kbfs.install 2019-12-13 17:00:27 UTC (rev 537557)
+++ kbfs.install 2019-12-13 17:00:52 UTC (rev 537558)
@@ -1,15 +0,0 @@
-post_install() {
- cat << '__EOF__'
-warning: the keybase-redirector is not included, so you will need to define
-your `keybase config` mountdir to something you like (or install the
-redirector on your own).
-
-See: https://github.com/keybase/client/issues/19840#issuecomment-533842074
-__EOF__
-}
-
-post_upgrade() {
- if (( $(vercmp 4.7.1-1 $2) > 0 )); then
- post_install
- fi
-}
Copied: keybase/repos/community-x86_64/kbfs.install (from rev 537557, keybase/trunk/kbfs.install)
===================================================================
--- kbfs.install (rev 0)
+++ kbfs.install 2019-12-13 17:00:52 UTC (rev 537558)
@@ -0,0 +1,15 @@
+post_install() {
+ cat << '__EOF__'
+warning: the keybase-redirector is not included, so you will need to define
+your `keybase config` mountdir to something you like (or install the
+redirector on your own).
+
+See: https://github.com/keybase/client/issues/19840#issuecomment-533842074
+__EOF__
+}
+
+post_upgrade() {
+ if (( $(vercmp 4.7.1-1 $2) > 0 )); then
+ post_install
+ fi
+}
Deleted: keybase-gui
===================================================================
--- keybase-gui 2019-12-13 17:00:27 UTC (rev 537557)
+++ keybase-gui 2019-12-13 17:00:52 UTC (rev 537558)
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-keybase ctl init
-systemctl start --user keybase kbfs
-
-if [ $# -gt 0 ]; then
- exec electron /usr/share/keybase-app "$@"
-else
- systemctl --user import-environment KEYBASE_AUTOSTART
- exec systemctl start --user --wait keybase.gui
-fi
Copied: keybase/repos/community-x86_64/keybase-gui (from rev 537557, keybase/trunk/keybase-gui)
===================================================================
--- keybase-gui (rev 0)
+++ keybase-gui 2019-12-13 17:00:52 UTC (rev 537558)
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+keybase ctl init
+systemctl start --user keybase kbfs
+
+if [ $# -gt 0 ]; then
+ exec electron /usr/share/keybase-app "$@"
+else
+ systemctl --user import-environment KEYBASE_AUTOSTART
+ exec systemctl start --user --wait keybase.gui
+fi
More information about the arch-commits
mailing list