[arch-commits] Commit in keybase/trunk (PKGBUILD keybase-gui)
Date: Thursday, October 8, 2020 @ 21:20:32 Author: eschwartz Revision: 722012 upgpkg: keybase 5.5.1-2: electron 10 rebuild: not ready, use 9.x Modified: keybase/trunk/PKGBUILD keybase/trunk/keybase-gui -+ PKGBUILD| 10 +- keybase-gui |2 +- 2 files changed, 6 insertions(+), 6 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-10-08 21:18:24 UTC (rev 722011) +++ PKGBUILD2020-10-08 21:20:32 UTC (rev 722012) @@ -6,7 +6,7 @@ pkgname=('keybase' 'kbfs' 'keybase-gui') pkgdesc='CLI tool for GPG with keybase.io' pkgver=5.5.1 -pkgrel=1 +pkgrel=2 arch=('x86_64') url='https://keybase.io/' license=('BSD') @@ -17,11 +17,11 @@ "0001-Don-t-use-electron-to-build.patch") sha512sums=('c203788c672168f506290ed02cee09e825103de047c02ce35515e7f509b2ca3a1e1bb1d2c895c8bfe484b9d0f175136cb4949a03f9d472181be8c33b388e7260' 'SKIP' - 'dc52d7c3d5798d9b83a4e42ba70a071b1cd5cb95c8b695a4b7a33d85744762ae644feef58cf4d582c8d8c169be68d57f392c33ff0796490e88f01f09b4c207d2' + '2cd6d153a39300a3a03de7aa62be832a1410de335df9e832794a483a76ec5f7856e9633b33137280679fb3624cf2b41bc9552261708e4aff6eaf4085f92bbc90' '1485e41432218b88aff71bbe68d265baad18c8b91b3d51cacdb4ac9b09abfb6cde91b9b87cb861cffeff92830159552307a89462c8697bb066416bd897e7b68b') b2sums=('b98738e47c300ba34de9b32ea97551607d6a311969d2b33dc5917dc11013b5e8666260bdbd90d969d92f1883f576dcf1bcb6d9b2a5c5e2983728040a3cda2f3a' 'SKIP' - 'ac27d14a9625a3bca6a4ac87adbe5bb2f0aee0c4a88bf39ac8b3d235801743b2e40e6cd7db26089398f016a25046a674f521b890ddf73c3c6637d0d6bf6e1397' + '3a2e97e83555d63ec29c5e72fff3adf36ced7502ce1bf650833927f2810eb0eec240b881bcc25791ff571bb3c92030d9cdef229631c9866b53465b25abd38190' '164dd6f37fe38d3c840b2b92d41553e0be67985d7c8471833a9ff381c05b0c35f295bfc630aa3ce6e31afb70b805d071e8c0a438a504064d24f99720c1571b9a') validpgpkeys=('222B85B0F90BE2D24CFEB93F47484E50656D16C7') # Keybase.io Code Signing (v1) @@ -34,7 +34,7 @@ # 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@' \ +sed -i 's@/opt/keybase/Keybase@/usr/bin/electron9 /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 @@ -99,7 +99,7 @@ package_keybase-gui() { pkgdesc="GUI frontend for GPG with keybase.io" -depends=('electron' 'keybase' 'kbfs') +depends=('electron9' 'keybase' 'kbfs') cd client-v${pkgver}/ Modified: keybase-gui === --- keybase-gui 2020-10-08 21:18:24 UTC (rev 722011) +++ keybase-gui 2020-10-08 21:20:32 UTC (rev 722012) @@ -11,7 +11,7 @@ fi if [ $# -gt 0 ] || systemctl --user is-active --quiet keybase.gui; then -exec electron /usr/share/keybase-app "$@" +exec electron9 /usr/share/keybase-app "$@" else systemctl --user import-environment KEYBASE_AUTOSTART exec systemctl start --user --wait keybase.gui
[arch-commits] Commit in keybase/trunk (PKGBUILD keybase-gui)
Date: Thursday, May 28, 2020 @ 03:59:49 Author: eschwartz Revision: 636132 upgpkg: keybase 5.5.1-1: upstream release adapt to deprecation of go-pie make use of new `keybase version` option to check for needed service restarts Modified: keybase/trunk/PKGBUILD keybase/trunk/keybase-gui -+ PKGBUILD| 25 ++--- keybase-gui |9 - 2 files changed, 26 insertions(+), 8 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-05-28 00:31:54 UTC (rev 636131) +++ PKGBUILD2020-05-28 03:59:49 UTC (rev 636132) @@ -5,23 +5,23 @@ pkgbase=keybase pkgname=('keybase' 'kbfs' 'keybase-gui') pkgdesc='CLI tool for GPG with keybase.io' -pkgver=5.4.2 +pkgver=5.5.1 pkgrel=1 arch=('x86_64') url='https://keybase.io/' license=('BSD') # git is needed for yarn... -makedepends=('git' 'go-pie' 'yarn') +makedepends=('git' 'go' '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=('81c90a924dd27eeb0f9f264e729a0d047f9057949eebb42aec85f97fbb34627e07e23a3737fb419041de891126ccba2f0de55e5a37994ab96c46a7120ca25c21' +sha512sums=('c203788c672168f506290ed02cee09e825103de047c02ce35515e7f509b2ca3a1e1bb1d2c895c8bfe484b9d0f175136cb4949a03f9d472181be8c33b388e7260' 'SKIP' - 'd672bdd308b2ab6f7b1248300f85f11b480e08149e1e4da5e01dac6c551b44dbfceb5c89d0fd17ce7a64c8b83cd4c7df14e24c31c2f37ae532abbb9099320290' + 'dc52d7c3d5798d9b83a4e42ba70a071b1cd5cb95c8b695a4b7a33d85744762ae644feef58cf4d582c8d8c169be68d57f392c33ff0796490e88f01f09b4c207d2' '1485e41432218b88aff71bbe68d265baad18c8b91b3d51cacdb4ac9b09abfb6cde91b9b87cb861cffeff92830159552307a89462c8697bb066416bd897e7b68b') -b2sums=('f3d9850c0dcc70e4111d131561df6f89188da261f0cb0ca78f36d9a3277c61c001e2ddcf73f25c44fcdb866a0060a6f8f4325b2fd5dd5fcc0dc4202194ea5f8f' +b2sums=('b98738e47c300ba34de9b32ea97551607d6a311969d2b33dc5917dc11013b5e8666260bdbd90d969d92f1883f576dcf1bcb6d9b2a5c5e2983728040a3cda2f3a' 'SKIP' - 'db6d63df77aa73c230128b5c6cd278215e0dfac2b42db861127571a6c867d8a305c18a5ea12a616669c77bd072ab8b26aa52379cbd8167c34bc043bfdcefec1d' + 'ac27d14a9625a3bca6a4ac87adbe5bb2f0aee0c4a88bf39ac8b3d235801743b2e40e6cd7db26089398f016a25046a674f521b890ddf73c3c6637d0d6bf6e1397' '164dd6f37fe38d3c840b2b92d41553e0be67985d7c8471833a9ff381c05b0c35f295bfc630aa3ce6e31afb70b805d071e8c0a438a504064d24f99720c1571b9a') validpgpkeys=('222B85B0F90BE2D24CFEB93F47484E50656D16C7') # Keybase.io Code Signing (v1) @@ -45,8 +45,19 @@ build() { cd client-v${pkgver}/go/keybase +# None of this should be necessary, but we duplicate the work of +# makepkg.conf here since golang CGO can't be bothered to respect +# standardized CFLAGS and we don't have native packaging integration for +# either this or the go-specific flags. Must be done here to make sure +# we're using debug or !buildflags. + +export CGO_CPPFLAGS="${CPPFLAGS}" +export CGO_CFLAGS="${CFLAGS}" +export CGO_CXXFLAGS="${CXXFLAGS}" +export CGO_LDFLAGS="${LDFLAGS}" +export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw" + 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 Modified: keybase-gui === --- keybase-gui 2020-05-28 00:31:54 UTC (rev 636131) +++ keybase-gui 2020-05-28 03:59:49 UTC (rev 636132) @@ -1,8 +1,15 @@ #!/bin/sh keybase ctl init -systemctl start --user keybase kbfs +if ! keybase version --assert-matching >/dev/null 2>&1; then +echo "restarting outdated services..." +systemctl --user daemon-reload +systemctl --user restart keybase kbfs +else +systemctl --user start keybase kbfs +fi + if [ $# -gt 0 ] || systemctl --user is-active --quiet keybase.gui; then exec electron /usr/share/keybase-app "$@" else
[arch-commits] Commit in keybase/trunk (PKGBUILD keybase-gui)
Date: Wednesday, March 11, 2020 @ 02:36:29 Author: eschwartz Revision: 594070 keybase: check if service is running in keybase-gui ... and don't just activate the service in this case. This ensures repeated calls to keybase-gui will cause the app to foreground. This is of greater importance now, since electron 8 dropped support for XEmbed tray icons, which means some desktops might not see a Keybase tray icon, which in turn means that foregrounding the application is hard to do with just a service. Now, frantic clicking on the Keybase desktop file while trying to figure out where the application went to, will actually have a visible effect and cause it to come out from where it was "hiding". Modified: keybase/trunk/PKGBUILD keybase/trunk/keybase-gui -+ PKGBUILD|4 ++-- keybase-gui |2 +- 2 files changed, 3 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-03-11 02:22:37 UTC (rev 594069) +++ PKGBUILD2020-03-11 02:36:29 UTC (rev 594070) @@ -17,11 +17,11 @@ "0001-Don-t-use-electron-to-build.patch") sha512sums=('fb41428f49376e3b6471a2235dc7a904fd08ef4e9cbbdfe3e33cbc02db8770f833f6be55c77c63fcb954468cd2ce8f4f08d47e1c453050e7e366f3288c2e37e4' 'SKIP' - '4dcb3f4119959e2b203528a9ed637bf8b07b85964c632a8b2456aa1e2f29fada383a9bc2af8abbb05fcf6b22c43723ce6d08bea8187d61fa6581d15fefae850b' + 'd672bdd308b2ab6f7b1248300f85f11b480e08149e1e4da5e01dac6c551b44dbfceb5c89d0fd17ce7a64c8b83cd4c7df14e24c31c2f37ae532abbb9099320290' 'bfc0919eba93d0367bfbd1a51c5600a1a39bdd1c01e626c7dcbd624c34c9e850006d127455746530598c6660d6ac8a3862fb23897a9fca1dac76ad231fbfdeb5') b2sums=('2835729da5590072aa16f6c24ca5083c783ed40984b0be4bca539b3c9ef265e4f5c97267bd6202d0b0c93165d8d63a105feff9e2a65a241b2776f70af2f36da0' 'SKIP' - '90aab71ef3b5db0c8ec81967604f43e3532be5f66ce7d9af1bd5204c1fde2062ef356909c03d237a63de93fa3cb045b9c31c3956cbecbea711602804e9d26efd' + 'db6d63df77aa73c230128b5c6cd278215e0dfac2b42db861127571a6c867d8a305c18a5ea12a616669c77bd072ab8b26aa52379cbd8167c34bc043bfdcefec1d' 'e1a42f150f322c560887143a7878df224acafe2391bff6f9f755f7d155303a4c263b9ed3b2ca1d718487bc55f2c39b49f207a7fe06977b2a60b5f99df4122b58') validpgpkeys=('222B85B0F90BE2D24CFEB93F47484E50656D16C7') # Keybase.io Code Signing (v1) Modified: keybase-gui === --- keybase-gui 2020-03-11 02:22:37 UTC (rev 594069) +++ keybase-gui 2020-03-11 02:36:29 UTC (rev 594070) @@ -3,7 +3,7 @@ keybase ctl init systemctl start --user keybase kbfs -if [ $# -gt 0 ]; then +if [ $# -gt 0 ] || systemctl --user is-active --quiet keybase.gui; then exec electron /usr/share/keybase-app "$@" else systemctl --user import-environment KEYBASE_AUTOSTART
[arch-commits] Commit in keybase/trunk (PKGBUILD keybase-gui)
Date: Wednesday, July 10, 2019 @ 21:12:00 Author: eschwartz Revision: 488598 upgpkg: keybase 4.2.0-1 upstream release rework keybase-gui to forward options to the app -- it now handles urls Modified: keybase/trunk/PKGBUILD keybase/trunk/keybase-gui -+ PKGBUILD| 10 +- keybase-gui | 11 +-- 2 files changed, 14 insertions(+), 7 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-07-10 20:14:28 UTC (rev 488597) +++ PKGBUILD2019-07-10 21:12:00 UTC (rev 488598) @@ -5,7 +5,7 @@ pkgbase=keybase pkgname=('keybase' 'kbfs' 'keybase-gui') pkgdesc='CLI tool for GPG with keybase.io' -pkgver=4.1.0 +pkgver=4.2.0 pkgrel=1 arch=('x86_64') url='https://keybase.io/' @@ -15,11 +15,11 @@ 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=('da018ca7c2c01ddcb86e0cb6bd34ab252e4495605519cadd6a521a52fed4931cf2bbafd83cb3b009239eab4de917b8c6f9a06a230e85f2d44cf47b265e0d5afe' - '673bfd68c708a905f1a69835804166945ef1be46de367f35b841015be1cc9b0cb188367055f147028ca12b3f464d877e0d502d24a4e6a6d94423f6f1cfc4b26a' +sha512sums=('132196b786f7c523d1c6892b4d330e5f7f166d959873b52420371f77d9499b7e3fe98af5ea141b98c1cf753f84d9c290e8b8b29ab032eb93772f93a25a070820' + '4dcb3f4119959e2b203528a9ed637bf8b07b85964c632a8b2456aa1e2f29fada383a9bc2af8abbb05fcf6b22c43723ce6d08bea8187d61fa6581d15fefae850b' 'f552e40479fd7240ce671cf1b36a92df89ad93c1505322ad53a7d2c2f1e961e22bc5f6147f09a7ccf4f50594bff6ea400d32152c67dd8223d6c2b73be5efdbb2') -b2sums=('8e14a94f80ea9a3b3e98d0e53ee1a213277747287772579364e24306d6163fe5302e407e4fd1f9363409173d4c65a338251596ce9e502f3bebe781ef5e711d83' - 'd2392b0d61279358a4063b4df872e96545672d70b8b99c23f29ec26ab7d96467dbf25c4066319e0ff214d069418a745e370400f6a3923b458d89b37883995db5' +b2sums=('0b1e5a39e90e97c3b76a0913a6ff1458a1b6f7211f54e842ed06b2f3bc4bde1bd9213ad8217872775cf1855341c58f46646bfa96e1f3f142c6d5e28e149db88b' + '90aab71ef3b5db0c8ec81967604f43e3532be5f66ce7d9af1bd5204c1fde2062ef356909c03d237a63de93fa3cb045b9c31c3956cbecbea711602804e9d26efd' 'cb04645501fb475b6c3d1ec4b6ca43b7e8fa929a774093b50f3dc6c6e57866d6064e648854bfea0d04719dae62045da8a260b0ca4c2a15e82898e07dfe7cad95') prepare() { Modified: keybase-gui === --- keybase-gui 2019-07-10 20:14:28 UTC (rev 488597) +++ keybase-gui 2019-07-10 21:12:00 UTC (rev 488598) @@ -1,4 +1,11 @@ #!/bin/sh -systemctl --user import-environment KEYBASE_AUTOSTART -keybase ctl init && exec systemctl start --user --wait keybase kbfs keybase.gui +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
[arch-commits] Commit in keybase/trunk (PKGBUILD keybase-gui)
Date: Wednesday, February 6, 2019 @ 01:05:05 Author: eschwartz Revision: 429698 upgpkg: keybase 3.0.0-1 upstream release simplified handling upstream of hideWindow means we can remove several hacks Modified: keybase/trunk/PKGBUILD keybase/trunk/keybase-gui -+ PKGBUILD| 16 +++- keybase-gui |8 +--- 2 files changed, 8 insertions(+), 16 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-02-06 00:36:57 UTC (rev 429697) +++ PKGBUILD2019-02-06 01:05:05 UTC (rev 429698) @@ -5,8 +5,8 @@ pkgbase=keybase pkgname=('keybase' 'kbfs' 'keybase-gui') pkgdesc='CLI tool for GPG with keybase.io' -pkgver=2.13.1 -pkgrel=2 +pkgver=3.0.0 +pkgrel=1 arch=('x86_64') url='https://keybase.io/' license=('BSD') @@ -15,8 +15,8 @@ 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=('c0cad522f14cf39f08c841ff90f96662f3f5d9fe3c8e8156755a8805757c5d206991410a2511315b8c00dcafcc5e23e5449d37d13f399e6692e0c6d4fb1c0b61' - '4ab159d8e764de7ef92b3c9b99559e0a499de607914521b7c5f89396d810c6360b87a785c43be90c54d1dee7e93ec1fda31e8377080d9bbbeb6230166d856f39' +sha512sums=('40ddbd6fc5201bbca087490022b021e6abc201dc428327e8974953d0e5cd403324cebf1ace29a22126eee0d1e36f84e85d443a236a7271ccdd79605abfe6fa72' + 'd9aa6a9f9cfcb951cb4ab5da8a8daadd0b1ff34dff6f23891b75c01b600b6fd98656ec5db4154ec0db9e62469b1b8f865e8b4515e190b510258233e20dba9de2' 'b721dc0c40cf23602424d2ca024524a0eef5210a7cdca0209b89eab5c17c3fcb3cc48d91940a4c88d2416d0a19a7fb3deba92e90244251c4338b0fd640befdcd') prepare() { @@ -28,11 +28,9 @@ # 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 \ --e 's@/opt/keybase/Keybase@/usr/bin/electron /usr/share/keybase-app@' \ --e '/EnvironmentFile/a\Environment=KEYBASE_START_UI=hideWindow' \ +sed -i 's@/opt/keybase/Keybase@/usr/bin/electron /usr/share/keybase-app@' \ packaging/linux/systemd/keybase.gui.service -sed -i 's/KEYBASE_AUTOSTART=1/KEYBASE_START_UI=hideWindow/;s/run_keybase/keybase-gui/g' \ +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 @@ -78,7 +76,7 @@ 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 go/kbfs/packaging/linux/systemd/kbfs.service "$pkgdir"/usr/lib/systemd/user/kbfs.service +install -Dm644 packaging/linux/systemd/kbfs.service "$pkgdir"/usr/lib/systemd/user/kbfs.service } package_keybase-gui() { Modified: keybase-gui === --- keybase-gui 2019-02-06 00:36:57 UTC (rev 429697) +++ keybase-gui 2019-02-06 01:05:05 UTC (rev 429698) @@ -1,10 +1,4 @@ #!/bin/sh -systemctl start --user keybase.service kbfs.service +systemctl --user import-environment KEYBASE_AUTOSTART systemctl start --user keybase.gui.service - -# executing the application when it is already running will bring it to the -# foreground -if [ "$KEYBASE_START_UI" != 'hideWindow' ]; then -exec electron /usr/share/keybase-app/ "$@" -fi