[arch-commits] Commit in keybase/repos/community-x86_64 (6 files)
Eli Schwartz
eschwartz at archlinux.org
Thu Aug 9 06:50:42 UTC 2018
Date: Thursday, August 9, 2018 @ 06:50:41
Author: eschwartz
Revision: 370469
archrelease: copy trunk to community-x86_64
Added:
keybase/repos/community-x86_64/0001-Don-t-use-electron-to-build.patch
(from rev 370468, keybase/trunk/0001-Don-t-use-electron-to-build.patch)
keybase/repos/community-x86_64/PKGBUILD
(from rev 370468, keybase/trunk/PKGBUILD)
keybase/repos/community-x86_64/keybase-gui
(from rev 370468, 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 | 196 +++++++++++++++----------------
keybase-gui | 8 -
3 files changed, 170 insertions(+), 170 deletions(-)
Deleted: 0001-Don-t-use-electron-to-build.patch
===================================================================
--- 0001-Don-t-use-electron-to-build.patch 2018-08-09 06:50:20 UTC (rev 370468)
+++ 0001-Don-t-use-electron-to-build.patch 2018-08-09 06:50:41 UTC (rev 370469)
@@ -1,68 +0,0 @@
-From 14cbf306fb4b1572a006680a3e8c30b011294da4 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 827b087fc..109f9048c 100644
---- a/shared/desktop/package.desktop.js
-+++ b/shared/desktop/package.desktop.js
-@@ -87,7 +87,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)
-@@ -140,7 +140,7 @@ function startPack() {
- pack(os.platform(), shouldBuildAnArch)
- .then(postPack(os.platform(), shouldBuildAnArch))
- .catch(postPackError)
-- } else {
-+ } else if (false) {
- // build for current platform only
- pack(os.platform(), os.arch())
- .then(postPack(os.platform(), os.arch()))
-diff --git a/shared/desktop/yarn-helper/index.js b/shared/desktop/yarn-helper/index.js
-index 3a5851cb0..d71b7f31e 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 fs from 'fs'
- import path from 'path'
-@@ -12,7 +11,6 @@ const [, , command, ...rest] = process.argv
- const commands = {
- ...buildCommands,
- ...fontCommands,
-- ...electronComands,
- help: {
- code: () => {
- console.log(
-diff --git a/shared/package.json b/shared/package.json
-index ea530d9f9..62a1a6379 100644
---- a/shared/package.json
-+++ b/shared/package.json
-@@ -200,7 +200,6 @@
- "css-loader": "0.28.11",
- "del": "3.0.0",
- "devtron": "1.4.0",
-- "electron": "2.0.2",
- "electron-download": "git://github.com/keybase/electron-download#keybase-fixes-off-410",
- "electron-packager": "12.1.0",
- "eslint": "4.19.1",
---
-2.17.1
-
Copied: keybase/repos/community-x86_64/0001-Don-t-use-electron-to-build.patch (from rev 370468, 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 2018-08-09 06:50:41 UTC (rev 370469)
@@ -0,0 +1,68 @@
+From 39839e7aa3f299008b53f345f27bc7f4a6793596 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 827b087fc..109f9048c 100644
+--- a/shared/desktop/package.desktop.js
++++ b/shared/desktop/package.desktop.js
+@@ -87,7 +87,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)
+@@ -140,7 +140,7 @@ function startPack() {
+ pack(os.platform(), shouldBuildAnArch)
+ .then(postPack(os.platform(), shouldBuildAnArch))
+ .catch(postPackError)
+- } else {
++ } else if (false) {
+ // build for current platform only
+ pack(os.platform(), os.arch())
+ .then(postPack(os.platform(), os.arch()))
+diff --git a/shared/desktop/yarn-helper/index.js b/shared/desktop/yarn-helper/index.js
+index 3a5851cb0..d71b7f31e 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 fs from 'fs'
+ import path from 'path'
+@@ -12,7 +11,6 @@ const [, , command, ...rest] = process.argv
+ const commands = {
+ ...buildCommands,
+ ...fontCommands,
+- ...electronComands,
+ help: {
+ code: () => {
+ console.log(
+diff --git a/shared/package.json b/shared/package.json
+index 2fd23f5c0..bb3846dc8 100644
+--- a/shared/package.json
++++ b/shared/package.json
+@@ -200,7 +200,6 @@
+ "css-loader": "0.28.11",
+ "del": "3.0.0",
+ "devtron": "1.4.0",
+- "electron": "2.0.5",
+ "electron-download": "git://github.com/keybase/electron-download#keybase-fixes-off-410",
+ "electron-packager": "12.1.0",
+ "eslint": "5.2.0",
+--
+2.18.0
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-08-09 06:50:20 UTC (rev 370468)
+++ PKGBUILD 2018-08-09 06:50:41 UTC (rev 370469)
@@ -1,98 +0,0 @@
-# $Id$
-# 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.3.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=('f2b92ec21fd8cfa182aac7655b836415b902c599f9e3a08a3f84d35c3f3728027a8eef8a06fb8ed4ba77b9a66888f49fd89013304f948c0f0276705f16ca4396'
- 'b3086ea6c60950284eecc331a8a648ea557f89f686f2adecb82b22d0ac65381683fbcc84875a48cf6ba9e3c63d4f06c73b84175621dca5e8f03b2a6a88cdcad4'
- 'f7d8a08dddd5a9aa06911093dfb488d45e9dcfcce16e16b5435234577e5db392e98207a9d0ed36b144e6cf2ea277e1f0347107fedf1b8db50b82a73580d5857f')
-
-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-x86_64/PKGBUILD (from rev 370468, keybase/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-08-09 06:50:41 UTC (rev 370469)
@@ -0,0 +1,98 @@
+# $Id$
+# 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.5.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=('05313c4373ffc8fc41097fabfd13fdbf4d0af789257bbbc4a9ff0500ab3ca9c9d5d50ab62bc38b7328aad3cbf631aa55fcd1a74b5dc73f3d31e76851733d7d5f'
+ 'b3086ea6c60950284eecc331a8a648ea557f89f686f2adecb82b22d0ac65381683fbcc84875a48cf6ba9e3c63d4f06c73b84175621dca5e8f03b2a6a88cdcad4'
+ '63a9030e3ac4fd5e0667a436b628f151ce6205b28154b9132b5b40a9a6bc2c4a662813d53765edd60e60c25911f655e11af0f0c2c00bddf67b1edc6db29162cd')
+
+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/
+}
Deleted: keybase-gui
===================================================================
--- keybase-gui 2018-08-09 06:50:20 UTC (rev 370468)
+++ keybase-gui 2018-08-09 06:50:41 UTC (rev 370469)
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-systemctl start --user keybase.gui.service
-exec electron /usr/share/keybase-app/ "$@"
Copied: keybase/repos/community-x86_64/keybase-gui (from rev 370468, keybase/trunk/keybase-gui)
===================================================================
--- keybase-gui (rev 0)
+++ keybase-gui 2018-08-09 06:50:41 UTC (rev 370469)
@@ -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