[arch-commits] Commit in keybase/repos (4 files)
Eli Schwartz
eschwartz at archlinux.org
Sun Nov 18 08:15:01 UTC 2018
Date: Sunday, November 18, 2018 @ 08:15:01
Author: eschwartz
Revision: 408658
archrelease: copy trunk to community-staging-x86_64
Added:
keybase/repos/community-staging-x86_64/
keybase/repos/community-staging-x86_64/0001-Don-t-use-electron-to-build.patch
(from rev 408657, keybase/trunk/0001-Don-t-use-electron-to-build.patch)
keybase/repos/community-staging-x86_64/PKGBUILD
(from rev 408657, keybase/trunk/PKGBUILD)
keybase/repos/community-staging-x86_64/keybase-gui
(from rev 408657, keybase/trunk/keybase-gui)
----------------------------------------+
0001-Don-t-use-electron-to-build.patch | 68 +++++++++++++++++++++
PKGBUILD | 97 +++++++++++++++++++++++++++++++
keybase-gui | 4 +
3 files changed, 169 insertions(+)
Copied: keybase/repos/community-staging-x86_64/0001-Don-t-use-electron-to-build.patch (from rev 408657, keybase/trunk/0001-Don-t-use-electron-to-build.patch)
===================================================================
--- community-staging-x86_64/0001-Don-t-use-electron-to-build.patch (rev 0)
+++ community-staging-x86_64/0001-Don-t-use-electron-to-build.patch 2018-11-18 08:15:01 UTC (rev 408658)
@@ -0,0 +1,68 @@
+From 8392a847a6f899893c71828e3c8bca74e297e6cd 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 1c33daaf56..578688c8f3 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)
+@@ -134,7 +134,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 a0a28b3fda..7ed3c84e2f 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'
+@@ -11,7 +10,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 f3175199b4..5bf0bd2fdd 100644
+--- a/shared/package.json
++++ b/shared/package.json
+@@ -200,7 +200,6 @@
+ "cross-env": "5.2.0",
+ "css-loader": "1.0.0",
+ "del": "3.0.0",
+- "electron": "3.0.5",
+ "electron-packager": "12.2.0",
+ "eslint": "5.7.0",
+ "eslint-config-standard": "12.0.0",
+--
+2.19.1
+
Copied: keybase/repos/community-staging-x86_64/PKGBUILD (from rev 408657, keybase/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2018-11-18 08:15:01 UTC (rev 408658)
@@ -0,0 +1,97 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Maintainer: Eli Schwartz <eschwartz at archlinux.org>
+# Contributor: Michael Hansen <zrax0111 gmail com>
+
+pkgbase=keybase
+pkgname=('keybase' 'keybase-gui')
+pkgdesc='CLI tool for GPG with keybase.io'
+pkgver=2.9.0
+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=('01938d83806260e6c7a1065b73ae4d8f82f776d3a81d70d9c8b2e8df9fd4f05dcbf45e23a78ca34573cca8a11b0592dae6c4aa1b20e4777c9ba69af0af5f3e41'
+ 'b3086ea6c60950284eecc331a8a648ea557f89f686f2adecb82b22d0ac65381683fbcc84875a48cf6ba9e3c63d4f06c73b84175621dca5e8f03b2a6a88cdcad4'
+ 'c2a92157d5384579490221738bb0fbfbf34c94ea10fb411c355727f39e4def66cd799adc7abd90dbb2a08105eabe1b7c6715f6951dab8f1bf6deabf76a598d1c')
+
+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)
+ 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
+
+ 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/*
+
+ # 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_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-staging-x86_64/keybase-gui (from rev 408657, keybase/trunk/keybase-gui)
===================================================================
--- community-staging-x86_64/keybase-gui (rev 0)
+++ community-staging-x86_64/keybase-gui 2018-11-18 08:15:01 UTC (rev 408658)
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+systemctl start --user keybase.gui.service
+exec electron /usr/share/keybase-app/ "$@"
More information about the arch-commits
mailing list