Date: Thursday, December 15, 2022 @ 17:21:09
Author: alex19ep
Revision: 1359367
archrelease: copy trunk to community-x86_64
Added:
bitwarden/repos/community-x86_64/PKGBUILD
(from rev 1359366, bitwarden/trunk/PKGBUILD)
bitwarden/repos/community-x86_64/bitwarden.desktop
(from rev 1359366, bitwarden/trunk/bitwarden.desktop)
bitwarden/repos/community-x86_64/bitwarden.sh
(from rev 1359366, bitwarden/trunk/bitwarden.sh)
bitwarden/repos/community-x86_64/messaging.main.ts.patch
(from rev 1359366, bitwarden/trunk/messaging.main.ts.patch)
bitwarden/repos/community-x86_64/nativelib.patch
(from rev 1359366, bitwarden/trunk/nativelib.patch)
Deleted:
bitwarden/repos/community-x86_64/PKGBUILD
bitwarden/repos/community-x86_64/bitwarden.desktop
bitwarden/repos/community-x86_64/bitwarden.sh
bitwarden/repos/community-x86_64/messaging.main.ts.patch
bitwarden/repos/community-x86_64/nativelib.patch
-------------------------+
PKGBUILD | 154 +++++++++++++++++++++++-----------------------
bitwarden.desktop | 20 ++---
bitwarden.sh | 8 +-
messaging.main.ts.patch | 22 +++---
nativelib.patch | 42 ++++++------
5 files changed, 123 insertions(+), 123 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-12-15 17:21:03 UTC (rev 1359366)
+++ PKGBUILD 2022-12-15 17:21:09 UTC (rev 1359367)
@@ -1,77 +0,0 @@
-# Maintainer: Alexander Epaneshnikov <[email protected]>
-# Contributor: libertylocked <[email protected]>
-
-pkgname=bitwarden
-pkgver=2022.11.0
-pkgrel=1
-_electronversion=19
-pkgdesc='A secure and free password manager for all of your devices'
-arch=('x86_64')
-url='https://github.com/bitwarden/clients/tree/master/apps/desktop'
-license=('GPL3')
-depends=("electron$_electronversion" 'libnotify' 'libsecret' 'libxtst'
'libxss' 'libnss_nis')
-makedepends=('git' 'npm' 'python' 'node-gyp' 'nodejs-lts-gallium' 'jq' 'rust')
-source=(bitwarden::git+https://github.com/bitwarden/clients.git#tag=desktop-v$pkgver
- messaging.main.ts.patch
- nativelib.patch
- ${pkgname}.sh
- ${pkgname}.desktop)
-sha512sums=('SKIP'
-
'babcae0dba4d036e5d2cd04d8932b63253bc7b27b14d090932066e9d39383f7565c06d72dae9f96e741b494ef7e50a1fe7ec33905aa3124b427a8bf404df5762'
-
'88610cba9dea99aefdfea51139f5770f04f1e877d75e86f2eea3470c99880282c5ff91060cb08d92cdf00d0a1b3bd40c5f3ee887cee11946dd31ca06da978272'
-
'98d2860bef2283fd09710fbbc5362d7ef2cd8eca26f35805ea258f2dacba78bd6aab14c834388a5089a8150eb0f32a82577aab10f8ad68e1a6371959b2802ad4'
-
'05b771e72f1925f61b710fb67e5709dbfd63855425d2ef146ca3770b050e78cb3933cffc7afb1ad43a1d87867b2c2486660c79fdfc95b3891befdff26c8520fd')
-
-prepare() {
- cd bitwarden/apps/desktop
-
- export npm_config_build_from_source=true
- export npm_config_cache="$srcdir/npm_cache"
- export ELECTRON_SKIP_BINARY_DOWNLOAD=1
-
- # This patch is required to make "Start automatically on login" work
- patch --strip=1 src/main/messaging.main.ts
"$srcdir/messaging.main.ts.patch"
-
- # Patch build to make it work with system electron
- export SYSTEM_ELECTRON_VERSION=$(electron$_electronversion -v | sed
's/v//g')
- export ELECTRONVERSION=$_electronversion
- sed -i "s|@electronversion@|${ELECTRONVERSION}|" "$srcdir/bitwarden.sh"
- # jq < package.json \
- # '.build["electronVersion"]=$ENV.SYSTEM_ELECTRON_VERSION |
.build["electronDist"]="/usr/lib/electron\(env.ELECTRONVERSION)"' \
- # > package.json.patched
- # mv package.json.patched package.json
- cd ../../
- patch --strip=1 apps/desktop/desktop_native/index.js
"$srcdir/nativelib.patch"
- npm ci
-}
-
-build() {
- cd bitwarden/apps/desktop
- electronDist=/usr/lib/electron$_electronversion
- electronVer=$(electron$_electronversion --version | tail -c +2)
- export npm_config_build_from_source=true
- export npm_config_cache="$srcdir/npm_cache"
- export ELECTRON_SKIP_BINARY_DOWNLOAD=1
- pushd desktop_native/
- npm run build
- popd
- npm run build
- npm run clean:dist
- npm exec -c "electron-builder --linux --x64 --dir
-c.electronDist=$electronDist \
- -c.electronVersion=$electronVer"
-}
-
-package(){
- cd bitwarden/apps/desktop
- install -vDm644 dist/linux-unpacked/resources/app.asar -t
"${pkgdir}/usr/lib/${pkgname}"
- install -vDm644 build/package.json -t "${pkgdir}/usr/lib/${pkgname}"
- cp -vr dist/linux-unpacked/resources/app.asar.unpacked -t
"${pkgdir}/usr/lib/${pkgname}"
-
- for i in 16 32 64 128 256 512 1024; do
- install -vDm644 resources/icons/${i}x${i}.png
"${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps/${pkgname}.png"
- done
- install -vDm644 resources/icon.png
"${pkgdir}/usr/share/icons/hicolor/1024x1024/apps/${pkgname}.png"
-
- install -vDm755 "${srcdir}/${pkgname}.sh"
"${pkgdir}/usr/bin/bitwarden-desktop"
- install -vDm644 "${srcdir}"/${pkgname}.desktop -t
"${pkgdir}"/usr/share/applications
-}
Copied: bitwarden/repos/community-x86_64/PKGBUILD (from rev 1359366,
bitwarden/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-12-15 17:21:09 UTC (rev 1359367)
@@ -0,0 +1,77 @@
+# Maintainer: Alexander Epaneshnikov <[email protected]>
+# Contributor: libertylocked <[email protected]>
+
+pkgname=bitwarden
+pkgver=2022.12.0
+pkgrel=1
+_electronversion=19
+pkgdesc='A secure and free password manager for all of your devices'
+arch=('x86_64')
+url='https://github.com/bitwarden/clients/tree/master/apps/desktop'
+license=('GPL3')
+depends=("electron$_electronversion" 'libnotify' 'libsecret' 'libxtst'
'libxss' 'libnss_nis')
+makedepends=('git' 'npm' 'python' 'node-gyp' 'nodejs-lts-gallium' 'jq' 'rust')
+source=(bitwarden::git+https://github.com/bitwarden/clients.git#tag=desktop-v$pkgver
+ messaging.main.ts.patch
+ nativelib.patch
+ ${pkgname}.sh
+ ${pkgname}.desktop)
+sha512sums=('SKIP'
+
'babcae0dba4d036e5d2cd04d8932b63253bc7b27b14d090932066e9d39383f7565c06d72dae9f96e741b494ef7e50a1fe7ec33905aa3124b427a8bf404df5762'
+
'88610cba9dea99aefdfea51139f5770f04f1e877d75e86f2eea3470c99880282c5ff91060cb08d92cdf00d0a1b3bd40c5f3ee887cee11946dd31ca06da978272'
+
'98d2860bef2283fd09710fbbc5362d7ef2cd8eca26f35805ea258f2dacba78bd6aab14c834388a5089a8150eb0f32a82577aab10f8ad68e1a6371959b2802ad4'
+
'05b771e72f1925f61b710fb67e5709dbfd63855425d2ef146ca3770b050e78cb3933cffc7afb1ad43a1d87867b2c2486660c79fdfc95b3891befdff26c8520fd')
+
+prepare() {
+ cd bitwarden/apps/desktop
+
+ export npm_config_build_from_source=true
+ export npm_config_cache="$srcdir/npm_cache"
+ export ELECTRON_SKIP_BINARY_DOWNLOAD=1
+
+ # This patch is required to make "Start automatically on login" work
+ patch --strip=1 src/main/messaging.main.ts
"$srcdir/messaging.main.ts.patch"
+
+ # Patch build to make it work with system electron
+ export SYSTEM_ELECTRON_VERSION=$(electron$_electronversion -v | sed
's/v//g')
+ export ELECTRONVERSION=$_electronversion
+ sed -i "s|@electronversion@|${ELECTRONVERSION}|" "$srcdir/bitwarden.sh"
+ # jq < package.json \
+ # '.build["electronVersion"]=$ENV.SYSTEM_ELECTRON_VERSION |
.build["electronDist"]="/usr/lib/electron\(env.ELECTRONVERSION)"' \
+ # > package.json.patched
+ # mv package.json.patched package.json
+ cd ../../
+ patch --strip=1 apps/desktop/desktop_native/index.js
"$srcdir/nativelib.patch"
+ npm ci
+}
+
+build() {
+ cd bitwarden/apps/desktop
+ electronDist=/usr/lib/electron$_electronversion
+ electronVer=$(electron$_electronversion --version | tail -c +2)
+ export npm_config_build_from_source=true
+ export npm_config_cache="$srcdir/npm_cache"
+ export ELECTRON_SKIP_BINARY_DOWNLOAD=1
+ pushd desktop_native/
+ npm run build
+ popd
+ npm run build
+ npm run clean:dist
+ npm exec -c "electron-builder --linux --x64 --dir
-c.electronDist=$electronDist \
+ -c.electronVersion=$electronVer"
+}
+
+package(){
+ cd bitwarden/apps/desktop
+ install -vDm644 dist/linux-unpacked/resources/app.asar -t
"${pkgdir}/usr/lib/${pkgname}"
+ install -vDm644 build/package.json -t "${pkgdir}/usr/lib/${pkgname}"
+ cp -vr dist/linux-unpacked/resources/app.asar.unpacked -t
"${pkgdir}/usr/lib/${pkgname}"
+
+ for i in 16 32 64 128 256 512 1024; do
+ install -vDm644 resources/icons/${i}x${i}.png
"${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps/${pkgname}.png"
+ done
+ install -vDm644 resources/icon.png
"${pkgdir}/usr/share/icons/hicolor/1024x1024/apps/${pkgname}.png"
+
+ install -vDm755 "${srcdir}/${pkgname}.sh"
"${pkgdir}/usr/bin/bitwarden-desktop"
+ install -vDm644 "${srcdir}"/${pkgname}.desktop -t
"${pkgdir}"/usr/share/applications
+}
Deleted: bitwarden.desktop
===================================================================
--- bitwarden.desktop 2022-12-15 17:21:03 UTC (rev 1359366)
+++ bitwarden.desktop 2022-12-15 17:21:09 UTC (rev 1359367)
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Bitwarden
-GenericName=Password Manager
-Comment=A secure and free password manager for all of your devices.
-Exec=bitwarden-desktop
-Terminal=false
-Type=Application
-Icon=bitwarden
-Categories=Utility;
-StartupWMClass=Bitwarden
Copied: bitwarden/repos/community-x86_64/bitwarden.desktop (from rev 1359366,
bitwarden/trunk/bitwarden.desktop)
===================================================================
--- bitwarden.desktop (rev 0)
+++ bitwarden.desktop 2022-12-15 17:21:09 UTC (rev 1359367)
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Bitwarden
+GenericName=Password Manager
+Comment=A secure and free password manager for all of your devices.
+Exec=bitwarden-desktop
+Terminal=false
+Type=Application
+Icon=bitwarden
+Categories=Utility;
+StartupWMClass=Bitwarden
Deleted: bitwarden.sh
===================================================================
--- bitwarden.sh 2022-12-15 17:21:03 UTC (rev 1359366)
+++ bitwarden.sh 2022-12-15 17:21:09 UTC (rev 1359367)
@@ -1,4 +0,0 @@
-#!/bin/sh
-export ELECTRON_IS_DEV=0
-cd /usr/lib/bitwarden
-exec electron@electronversion@ /usr/lib/bitwarden/app.asar $@
Copied: bitwarden/repos/community-x86_64/bitwarden.sh (from rev 1359366,
bitwarden/trunk/bitwarden.sh)
===================================================================
--- bitwarden.sh (rev 0)
+++ bitwarden.sh 2022-12-15 17:21:09 UTC (rev 1359367)
@@ -0,0 +1,4 @@
+#!/bin/sh
+export ELECTRON_IS_DEV=0
+cd /usr/lib/bitwarden
+exec electron@electronversion@ /usr/lib/bitwarden/app.asar $@
Deleted: messaging.main.ts.patch
===================================================================
--- messaging.main.ts.patch 2022-12-15 17:21:03 UTC (rev 1359366)
+++ messaging.main.ts.patch 2022-12-15 17:21:09 UTC (rev 1359367)
@@ -1,11 +0,0 @@
---- messaging.main.ts.orig 2022-02-11 15:39:49.768671680 +0300
-+++ messaging.main.ts 2022-02-11 15:42:22.326127915 +0300
-@@ -114,7 +114,7 @@
- Version=${app.getVersion()}
- Name=Bitwarden
- Comment=Bitwarden startup script
--Exec=${app.getPath("exe")}
-+Exec=bitwarden-desktop
- StartupNotify=false
- Terminal=false`;
-
Copied: bitwarden/repos/community-x86_64/messaging.main.ts.patch (from rev
1359366, bitwarden/trunk/messaging.main.ts.patch)
===================================================================
--- messaging.main.ts.patch (rev 0)
+++ messaging.main.ts.patch 2022-12-15 17:21:09 UTC (rev 1359367)
@@ -0,0 +1,11 @@
+--- messaging.main.ts.orig 2022-02-11 15:39:49.768671680 +0300
++++ messaging.main.ts 2022-02-11 15:42:22.326127915 +0300
+@@ -114,7 +114,7 @@
+ Version=${app.getVersion()}
+ Name=Bitwarden
+ Comment=Bitwarden startup script
+-Exec=${app.getPath("exe")}
++Exec=bitwarden-desktop
+ StartupNotify=false
+ Terminal=false`;
+
Deleted: nativelib.patch
===================================================================
--- nativelib.patch 2022-12-15 17:21:03 UTC (rev 1359366)
+++ nativelib.patch 2022-12-15 17:21:09 UTC (rev 1359367)
@@ -1,21 +0,0 @@
-diff --git i/apps/desktop/desktop_native/index.js
w/apps/desktop/desktop_native/index.js
-index 8b48ac994..db9e13eb8 100644
---- i/apps/desktop/desktop_native/index.js
-+++ w/apps/desktop/desktop_native/index.js
-@@ -151,13 +151,13 @@ switch (platform) {
- switch (arch) {
- case 'x64':
- localFileExisted = existsSync(
-- join(__dirname, 'desktop_native.linux-x64-musl.node')
-+ join(__dirname, 'desktop_native.linux-x64-gnu.node')
- )
- try {
- if (localFileExisted) {
-- nativeBinding = require('./desktop_native.linux-x64-musl.node')
-+ nativeBinding = require('./desktop_native.linux-x64-gnu.node')
- } else {
-- nativeBinding =
require('@bitwarden/desktop-native-linux-x64-musl')
-+ nativeBinding = require('@bitwarden/desktop-native-linux-x64-gnu')
- }
- } catch (e) {
- loadError = e
Copied: bitwarden/repos/community-x86_64/nativelib.patch (from rev 1359366,
bitwarden/trunk/nativelib.patch)
===================================================================
--- nativelib.patch (rev 0)
+++ nativelib.patch 2022-12-15 17:21:09 UTC (rev 1359367)
@@ -0,0 +1,21 @@
+diff --git i/apps/desktop/desktop_native/index.js
w/apps/desktop/desktop_native/index.js
+index 8b48ac994..db9e13eb8 100644
+--- i/apps/desktop/desktop_native/index.js
++++ w/apps/desktop/desktop_native/index.js
+@@ -151,13 +151,13 @@ switch (platform) {
+ switch (arch) {
+ case 'x64':
+ localFileExisted = existsSync(
+- join(__dirname, 'desktop_native.linux-x64-musl.node')
++ join(__dirname, 'desktop_native.linux-x64-gnu.node')
+ )
+ try {
+ if (localFileExisted) {
+- nativeBinding = require('./desktop_native.linux-x64-musl.node')
++ nativeBinding = require('./desktop_native.linux-x64-gnu.node')
+ } else {
+- nativeBinding =
require('@bitwarden/desktop-native-linux-x64-musl')
++ nativeBinding = require('@bitwarden/desktop-native-linux-x64-gnu')
+ }
+ } catch (e) {
+ loadError = e
