[arch-commits] Commit in keybase/repos/community-x86_64 (6 files)
Eli Schwartz
eschwartz at archlinux.org
Wed Apr 10 17:42:41 UTC 2019
Date: Wednesday, April 10, 2019 @ 17:42:40
Author: eschwartz
Revision: 450898
archrelease: copy trunk to community-x86_64
Added:
keybase/repos/community-x86_64/0001-Don-t-use-electron-to-build.patch
(from rev 450897, keybase/trunk/0001-Don-t-use-electron-to-build.patch)
keybase/repos/community-x86_64/PKGBUILD
(from rev 450897, keybase/trunk/PKGBUILD)
keybase/repos/community-x86_64/keybase-gui
(from rev 450897, 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/keybase-gui
----------------------------------------+
0001-Don-t-use-electron-to-build.patch | 136 +++++++++---------
PKGBUILD | 229 +++++++++++++++----------------
keybase-gui | 8 -
3 files changed, 188 insertions(+), 185 deletions(-)
Deleted: 0001-Don-t-use-electron-to-build.patch
===================================================================
--- 0001-Don-t-use-electron-to-build.patch 2019-04-10 17:42:21 UTC (rev 450897)
+++ 0001-Don-t-use-electron-to-build.patch 2019-04-10 17:42:40 UTC (rev 450898)
@@ -1,68 +0,0 @@
-From 8149b6244c6b9043b5e8fa391a453c2484582ba7 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.js | 4 ++--
- shared/desktop/yarn-helper/index.js | 2 --
- shared/package.json | 1 -
- 3 files changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/shared/desktop/package.desktop.js b/shared/desktop/package.desktop.js
-index 1ceb5e1ac4..3c6dc3961b 100644
---- a/shared/desktop/package.desktop.js
-+++ b/shared/desktop/package.desktop.js
-@@ -86,7 +86,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)
-@@ -136,7 +136,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.js b/shared/desktop/yarn-helper/index.js
-index 425346cbb7..29d1ee6b54 100644
---- a/shared/desktop/yarn-helper/index.js
-+++ b/shared/desktop/yarn-helper/index.js
-@@ -1,7 +1,6 @@
- // @flow
- // 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'
-@@ -13,7 +12,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 09e8732402..fdcc2f9c9c 100644
---- a/shared/package.json
-+++ b/shared/package.json
-@@ -204,7 +204,6 @@
- "cross-env": "5.2.0",
- "css-loader": "2.1.0",
- "del": "3.0.0",
-- "electron": "4.0.1",
- "electron-packager": "13.0.1",
- "eslint": "5.12.0",
- "eslint-config-standard": "12.0.0",
---
-2.20.1
-
Copied: keybase/repos/community-x86_64/0001-Don-t-use-electron-to-build.patch (from rev 450897, 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-04-10 17:42:40 UTC (rev 450898)
@@ -0,0 +1,68 @@
+From cadd633aeee4600dd1a9aee9a626a16a8e8afd5e 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.js | 4 ++--
+ shared/desktop/yarn-helper/index.js | 2 --
+ shared/package.json | 1 -
+ 3 files changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/shared/desktop/package.desktop.js b/shared/desktop/package.desktop.js
+index 45c11f5564..dbb6fe7516 100644
+--- a/shared/desktop/package.desktop.js
++++ b/shared/desktop/package.desktop.js
+@@ -86,7 +86,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)
+@@ -136,7 +136,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.js b/shared/desktop/yarn-helper/index.js
+index 425346cbb7..29d1ee6b54 100644
+--- a/shared/desktop/yarn-helper/index.js
++++ b/shared/desktop/yarn-helper/index.js
+@@ -1,7 +1,6 @@
+ // @flow
+ // 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'
+@@ -13,7 +12,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 128aaf68d0..9490ca5c08 100644
+--- a/shared/package.json
++++ b/shared/package.json
+@@ -212,7 +212,6 @@
+ "cross-env": "5.2.0",
+ "css-loader": "2.1.0",
+ "del": "3.0.0",
+- "electron": "4.1.0",
+ "electron-packager": "13.0.1",
+ "eslint": "5.12.0",
+ "eslint-config-standard": "12.0.0",
+--
+2.21.0
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-04-10 17:42:21 UTC (rev 450897)
+++ PKGBUILD 2019-04-10 17:42:40 UTC (rev 450898)
@@ -1,113 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Maintainer: Eli Schwartz <eschwartz 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=3.1.2
-pkgrel=1
-arch=('x86_64')
-url='https://keybase.io/'
-license=('BSD')
-# git is needed for yarn...
-makedepends=('git' 'go-pie' 'yarn')
-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=('7082a74d14d3c0b2ccf5211507a53efb1d6aa2a0b69757c3a8352c3506d6a1bf2b1b440df2f1fa4606a2f6bcb37924c34a140893c9c8e97a1bd31958ec03a0ac'
- 'd9aa6a9f9cfcb951cb4ab5da8a8daadd0b1ff34dff6f23891b75c01b600b6fd98656ec5db4154ec0db9e62469b1b8f865e8b4515e190b510258233e20dba9de2'
- 'b721dc0c40cf23602424d2ca024524a0eef5210a7cdca0209b89eab5c17c3fcb3cc48d91940a4c88d2416d0a19a7fb3deba92e90244251c4338b0fd640befdcd')
-
-prepare() {
- cd client-${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-${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
-}
-
-package_keybase() {
- depends=('gnupg')
- optdepends=('kbfs: for the fuse-based fileystem and the encryption subcommand')
-
- cd client-${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')
-
- cd client-${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-${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 450897, keybase/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-04-10 17:42:40 UTC (rev 450898)
@@ -0,0 +1,116 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Maintainer: Eli Schwartz <eschwartz 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=3.2.1
+pkgrel=1
+arch=('x86_64')
+url='https://keybase.io/'
+license=('BSD')
+# git is needed for yarn...
+makedepends=('git' 'go-pie' 'yarn')
+source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/keybase/client/archive/v${pkgver}.tar.gz"
+ "keybase-gui"
+ "0001-Don-t-use-electron-to-build.patch")
+sha512sums=('2fd9a20281373cfca125bf8e7ce6b20792f2165231848ac205f9db420da80830f3bd8291b4821ca887de0859eccd16f59cb9e9636d585485f68c6f3143729ffc'
+ '72d2a5ba25d2f5898fa7e97cee655aacfdca50933000555f6c04451235ad7f6d08a3ee2ec94cac79130064b9702fd38d24abffc48187e19912acd01d378156e3'
+ 'df19e24912a26ff0a745493d4f90839aae9d6b7efff6d95e38efb079b6f5028ceca4e9e339eaf8069d0a678505ad472869e1d1a0c02558087b40296cacf4381f')
+b2sums=('4da710bd503dde9968b31ac6d146d51bffc0bc791387a0695fca96a1db8a12ead09fa27743cdd4569a22b0032e947c220f372fab57ba078ab31fb39d69e48e43'
+ '3b1cdc95a70c9463c8ab2506cc22577ff5b9fd9665a99fcb97c287590f89cef4450fa984e58548288c7e2f2411de00577b92b78ac38829eac5d86223ceb432a0'
+ '0f3bc76093afd54a7e360873de71e6446a00878c014d6a3acb3786dc7336ddf5956785a3d14b57541e604eba1e2acd9e4771a21c0684ed7fbe1106c4492fafd8')
+
+prepare() {
+ cd client-${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-${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
+}
+
+package_keybase() {
+ depends=('gnupg')
+ optdepends=('kbfs: for the fuse-based fileystem and the encryption subcommand')
+
+ cd client-${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')
+
+ cd client-${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-${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: keybase-gui
===================================================================
--- keybase-gui 2019-04-10 17:42:21 UTC (rev 450897)
+++ keybase-gui 2019-04-10 17:42:40 UTC (rev 450898)
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-systemctl --user import-environment KEYBASE_AUTOSTART
-systemctl start --user keybase.gui.service
Copied: keybase/repos/community-x86_64/keybase-gui (from rev 450897, keybase/trunk/keybase-gui)
===================================================================
--- keybase-gui (rev 0)
+++ keybase-gui 2019-04-10 17:42:40 UTC (rev 450898)
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+systemctl --user import-environment KEYBASE_AUTOSTART
+keybase ctl init && exec systemctl start --user --wait keybase.gui.service
More information about the arch-commits
mailing list