[arch-commits] Commit in keybase/repos/community-x86_64 (6 files)
Felix Yan
felixonmars at archlinux.org
Fri Aug 16 06:52:02 UTC 2019
Date: Friday, August 16, 2019 @ 06:52:02
Author: felixonmars
Revision: 499783
archrelease: copy trunk to community-x86_64
Added:
keybase/repos/community-x86_64/0001-Don-t-use-electron-to-build.patch
(from rev 499782, keybase/trunk/0001-Don-t-use-electron-to-build.patch)
keybase/repos/community-x86_64/PKGBUILD
(from rev 499782, keybase/trunk/PKGBUILD)
keybase/repos/community-x86_64/keybase-gui
(from rev 499782, 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 | 134 ++++++++--------
PKGBUILD | 246 +++++++++++++++----------------
keybase-gui | 22 +-
3 files changed, 201 insertions(+), 201 deletions(-)
Deleted: 0001-Don-t-use-electron-to-build.patch
===================================================================
--- 0001-Don-t-use-electron-to-build.patch 2019-08-16 06:51:48 UTC (rev 499782)
+++ 0001-Don-t-use-electron-to-build.patch 2019-08-16 06:52:02 UTC (rev 499783)
@@ -1,67 +0,0 @@
-From 9a2bbdb8c571bf09fcc5143a8ec7f50e8a30819a 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 d6e3297c63..343424dbac 100644
---- a/shared/desktop/package.desktop.tsx
-+++ b/shared/desktop/package.desktop.tsx
-@@ -89,7 +89,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)
-@@ -137,7 +137,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 50b2cdc4f7..3cea627bff 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'
-@@ -12,7 +11,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 82228ec398..d9a502f57d 100644
---- a/shared/package.json
-+++ b/shared/package.json
-@@ -243,7 +243,6 @@
- "cross-env": "5.2.0",
- "css-loader": "2.1.0",
- "del": "3.0.0",
-- "electron": "5.0.7",
- "electron-packager": "13.0.1",
- "eslint": "6.0.1",
- "eslint-config-standard": "12.0.0",
---
-2.22.1
-
Copied: keybase/repos/community-x86_64/0001-Don-t-use-electron-to-build.patch (from rev 499782, 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-08-16 06:52:02 UTC (rev 499783)
@@ -0,0 +1,67 @@
+From 9a2bbdb8c571bf09fcc5143a8ec7f50e8a30819a 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 d6e3297c63..343424dbac 100644
+--- a/shared/desktop/package.desktop.tsx
++++ b/shared/desktop/package.desktop.tsx
+@@ -89,7 +89,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)
+@@ -137,7 +137,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 50b2cdc4f7..3cea627bff 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'
+@@ -12,7 +11,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 82228ec398..d9a502f57d 100644
+--- a/shared/package.json
++++ b/shared/package.json
+@@ -243,7 +243,6 @@
+ "cross-env": "5.2.0",
+ "css-loader": "2.1.0",
+ "del": "3.0.0",
+- "electron": "5.0.7",
+ "electron-packager": "13.0.1",
+ "eslint": "6.0.1",
+ "eslint-config-standard": "12.0.0",
+--
+2.22.1
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-08-16 06:51:48 UTC (rev 499782)
+++ PKGBUILD 2019-08-16 06:52:02 UTC (rev 499783)
@@ -1,123 +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=4.3.1
-pkgrel=2
-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"
- "https://github.com/keybase/client/commit/753d4ac4033f457bb43bb107014b2e9c76090015.patch"
- "keybase-gui"
- "0001-Don-t-use-electron-to-build.patch")
-sha512sums=('6d5f303e42ee99377c59e322c61d61126ba09964ce690289a93939d6e85b9051f3e5367d96d2145aa716cd3ef329ede68f2aa6f7e2c8d19f85b55a92306a24bf'
- '2fb645efb208191cec3d4754119c59504980e703750051a38a1e4ba99a862a2626cca14be02959457f5d50ba752191c6d6466fd06babd661c104ecbe852c193e'
- '4dcb3f4119959e2b203528a9ed637bf8b07b85964c632a8b2456aa1e2f29fada383a9bc2af8abbb05fcf6b22c43723ce6d08bea8187d61fa6581d15fefae850b'
- '747f87b6a399375331acb86d6a1beddf83496cab8a598aaa54e4fe7a096a8964b3cbd757bb6924b286a16cd68b9f081f917233c9ff2b984a1f92ef85aa9dd0bd')
-b2sums=('42a1d55d223a3c52d2aaced1c756814646cdb493447ba99d0b9a8267c83b67949d969e18a61bfdeb68e790561430a214bb284a93ac7d146d59ed1b2e97336bf2'
- '86871257c22f77158ce4644ad7f81ae3db1645df003b41bd5847dd34035a39d3e16ffbc64a67a6d1cf0eaa8fbf6d9047dee8846120587e9b4c6fb373242d131d'
- '90aab71ef3b5db0c8ec81967604f43e3532be5f66ce7d9af1bd5204c1fde2062ef356909c03d237a63de93fa3cb045b9c31c3956cbecbea711602804e9d26efd'
- 'b20b444b58cc78c2960cc31cd070afae6b73d59e77afa76ab83167befd07b6ca91bdb1465d2d898ac61127c77fdbb708f48c591d053830883fbbaba660328de4')
-
-prepare() {
- cd client-${pkgver}
-
- # support keybase:// links in argv2 with debundled electron
- # https://github.com/keybase/client/issues/18925
- patch -p1 -i ../753d4ac4033f457bb43bb107014b2e9c76090015.patch
-
- 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 --appVersion $pkgver
-}
-
-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 499782, keybase/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-08-16 06:52:02 UTC (rev 499783)
@@ -0,0 +1,123 @@
+# 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=4.3.1
+pkgrel=3
+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"
+ "https://github.com/keybase/client/commit/753d4ac4033f457bb43bb107014b2e9c76090015.patch"
+ "keybase-gui"
+ "0001-Don-t-use-electron-to-build.patch")
+sha512sums=('6d5f303e42ee99377c59e322c61d61126ba09964ce690289a93939d6e85b9051f3e5367d96d2145aa716cd3ef329ede68f2aa6f7e2c8d19f85b55a92306a24bf'
+ '2fb645efb208191cec3d4754119c59504980e703750051a38a1e4ba99a862a2626cca14be02959457f5d50ba752191c6d6466fd06babd661c104ecbe852c193e'
+ '4dcb3f4119959e2b203528a9ed637bf8b07b85964c632a8b2456aa1e2f29fada383a9bc2af8abbb05fcf6b22c43723ce6d08bea8187d61fa6581d15fefae850b'
+ '747f87b6a399375331acb86d6a1beddf83496cab8a598aaa54e4fe7a096a8964b3cbd757bb6924b286a16cd68b9f081f917233c9ff2b984a1f92ef85aa9dd0bd')
+b2sums=('42a1d55d223a3c52d2aaced1c756814646cdb493447ba99d0b9a8267c83b67949d969e18a61bfdeb68e790561430a214bb284a93ac7d146d59ed1b2e97336bf2'
+ '86871257c22f77158ce4644ad7f81ae3db1645df003b41bd5847dd34035a39d3e16ffbc64a67a6d1cf0eaa8fbf6d9047dee8846120587e9b4c6fb373242d131d'
+ '90aab71ef3b5db0c8ec81967604f43e3532be5f66ce7d9af1bd5204c1fde2062ef356909c03d237a63de93fa3cb045b9c31c3956cbecbea711602804e9d26efd'
+ 'b20b444b58cc78c2960cc31cd070afae6b73d59e77afa76ab83167befd07b6ca91bdb1465d2d898ac61127c77fdbb708f48c591d053830883fbbaba660328de4')
+
+prepare() {
+ cd client-${pkgver}
+
+ # support keybase:// links in argv2 with debundled electron
+ # https://github.com/keybase/client/issues/18925
+ patch -p1 -i ../753d4ac4033f457bb43bb107014b2e9c76090015.patch
+
+ 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 --appVersion $pkgver
+}
+
+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-08-16 06:51:48 UTC (rev 499782)
+++ keybase-gui 2019-08-16 06:52:02 UTC (rev 499783)
@@ -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 499782, keybase/trunk/keybase-gui)
===================================================================
--- keybase-gui (rev 0)
+++ keybase-gui 2019-08-16 06:52:02 UTC (rev 499783)
@@ -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