[arch-commits] Commit in bitwarden/repos (6 files)

Alexander Epaneshnikov alex19ep at gemini.archlinux.org
Sat Sep 4 16:54:21 UTC 2021


    Date: Saturday, September 4, 2021 @ 16:54:21
  Author: alex19ep
Revision: 1011362

archrelease: copy trunk to community-x86_64

Added:
  bitwarden/repos/community-x86_64/
  bitwarden/repos/community-x86_64/PKGBUILD
    (from rev 1011361, bitwarden/trunk/PKGBUILD)
  bitwarden/repos/community-x86_64/bitwarden.desktop
    (from rev 1011361, bitwarden/trunk/bitwarden.desktop)
  bitwarden/repos/community-x86_64/bitwarden.sh
    (from rev 1011361, bitwarden/trunk/bitwarden.sh)
  bitwarden/repos/community-x86_64/messaging.main.ts.patch
    (from rev 1011361, bitwarden/trunk/messaging.main.ts.patch)
  bitwarden/repos/community-x86_64/package.json.patch
    (from rev 1011361, bitwarden/trunk/package.json.patch)

-------------------------+
 PKGBUILD                |   73 ++++++++++++++++++++++++++++++++++++++++++++++
 bitwarden.desktop       |   10 ++++++
 bitwarden.sh            |    3 +
 messaging.main.ts.patch |   11 ++++++
 package.json.patch      |   13 ++++++++
 5 files changed, 110 insertions(+)

Copied: bitwarden/repos/community-x86_64/PKGBUILD (from rev 1011361, bitwarden/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2021-09-04 16:54:21 UTC (rev 1011362)
@@ -0,0 +1,73 @@
+# Maintainer: Alexander Epaneshnikov <alex19ep at archlinux.org>
+# Contributor: libertylocked <libertylocked at disroot.org>
+
+pkgname=bitwarden
+pkgver=1.28.2
+pkgrel=2
+_jslibcommit='5ab045499f8a6a26ee10115f458136546a54bc22'
+pkgdesc='A secure and free password manager for all of your devices'
+arch=('x86_64')
+url='https://github.com/bitwarden/desktop'
+license=('GPL3')
+depends=('electron11' 'libnotify' 'libsecret' 'libxtst' 'libxss' 'libnss_nis')
+makedepends=('git' 'npm' 'python' 'node-gyp' 'nodejs-lts-fermium' 'jq')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/bitwarden/desktop/archive/v${pkgver}.tar.gz
+        jslib-${_jslibcommit}.tar.gz::https://github.com/bitwarden/jslib/archive/${_jslibcommit}.tar.gz
+        package.json.patch
+        messaging.main.ts.patch
+        ${pkgname}.sh
+        ${pkgname}.desktop)
+sha512sums=('e950423968043480dcf9c93dafe0acad042baa93d04261292ce2e7d223c78f444d59d8f382e1a390ac942431c5b67f6950de4c6bba7e7deed685b3d9b11748c5'
+            'c3705b257c080b72f15c62462bf8713cfc24a044395415d8884b31e7bdf5f4d7d04f56cdb1ac4ec3a7b92dc4eb2373f6135203925882357c886a4359908f210f'
+            'd884221c615db95d6fd0da2d3470fb7514b6a5d2a2b3b20c8353ebb4a938dc39f93783fe7ef2b9f69f034db8f26abfa479616f9fd1c1b241af605da837fba20e'
+            '822d97be407c2ac2a6926f5c925b0fd188c541014a623dd3815fdbf5ef67c0542f43aaf8d11535571a83a265f620e330f5326244f42c3902fddab442128fda95'
+            '32c29a7baed80351acf5753d35df404a818d5c88cc85f3bbed2daa5351aaf0dba20fd03cbedbcb407324f305d4556adb476ecc9ccd07bac0511ca4a943020ea4'
+            '05b771e72f1925f61b710fb67e5709dbfd63855425d2ef146ca3770b050e78cb3933cffc7afb1ad43a1d87867b2c2486660c79fdfc95b3891befdff26c8520fd')
+
+prepare() {
+	cd desktop-${pkgver}
+	# Link jslib
+	rmdir -v jslib
+	ln -vs ../jslib-${_jslibcommit} jslib
+
+	# Remove pre and postinstall routines from package.json.
+	patch --strip=1 package.json ../package.json.patch
+	# This patch is required to make "Start automatically on login" work
+	patch --strip=1 src/main/messaging.main.ts ../messaging.main.ts.patch
+
+	# Patch build to make it work with system electron
+	SYSTEM_ELECTRON_VERSION=$(electron11 -v | sed 's/v//g')
+	jq < package.json --arg ver $SYSTEM_ELECTRON_VERSION \
+	   '.build["electronVersion"]=$ver | .build["electronDist"]="/usr/lib/electron11"' \
+	   > package.json.patched
+	mv package.json.patched package.json
+}
+
+build() {
+	cd desktop-${pkgver}
+	export npm_config_cache="$srcdir/npm_cache"
+	export ELECTRON_SKIP_BINARY_DOWNLOAD=1
+	electronDist=$(dirname $(realpath $(which electron11)))
+	electronVer=$(electron11 --version | tail -c +2)
+	pushd jslib
+	npm install
+	popd
+	npm install
+	npm run build
+	npm run clean:dist
+	npm exec -c "electron-builder --linux --x64 --dir -c.electronDist=$electronDist \
+	             -c.electronVersion=$electronVer"
+}
+
+package(){
+	cd desktop-${pkgver}
+	install -vDm755 dist/linux-unpacked/resources/app.asar -t "${pkgdir}/usr/lib/${pkgname%-git}/resources"
+
+	for i in 16 32 48 64 128 256 512; do
+		install -vDm644 resources/icons/${i}x${i}.png "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps/${pkgname%-git}.png"
+	done
+	install -vDm644 resources/icon.png "${pkgdir}/usr/share/icons/hicolor/1024x1024/apps/${pkgname%-git}.png"
+
+	install -vDm755 "${srcdir}/${pkgname%-git}.sh" "${pkgdir}/usr/bin/bitwarden-desktop"
+	install -vDm644 "${srcdir}"/${pkgname%-git}.desktop -t "${pkgdir}"/usr/share/applications
+}

Copied: bitwarden/repos/community-x86_64/bitwarden.desktop (from rev 1011361, bitwarden/trunk/bitwarden.desktop)
===================================================================
--- community-x86_64/bitwarden.desktop	                        (rev 0)
+++ community-x86_64/bitwarden.desktop	2021-09-04 16:54:21 UTC (rev 1011362)
@@ -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

Copied: bitwarden/repos/community-x86_64/bitwarden.sh (from rev 1011361, bitwarden/trunk/bitwarden.sh)
===================================================================
--- community-x86_64/bitwarden.sh	                        (rev 0)
+++ community-x86_64/bitwarden.sh	2021-09-04 16:54:21 UTC (rev 1011362)
@@ -0,0 +1,3 @@
+#!/bin/sh
+export ELECTRON_IS_DEV=0
+exec electron11 /usr/lib/bitwarden/resources/app.asar $@
\ No newline at end of file

Copied: bitwarden/repos/community-x86_64/messaging.main.ts.patch (from rev 1011361, bitwarden/trunk/messaging.main.ts.patch)
===================================================================
--- community-x86_64/messaging.main.ts.patch	                        (rev 0)
+++ community-x86_64/messaging.main.ts.patch	2021-09-04 16:54:21 UTC (rev 1011362)
@@ -0,0 +1,11 @@
+--- messaging.main.ts.orig	2021-08-27 23:56:00.283768564 -0700
++++ messaging.main.ts	2021-08-27 23:56:04.442513446 -0700
+@@ -110,7 +110,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/package.json.patch (from rev 1011361, bitwarden/trunk/package.json.patch)
===================================================================
--- community-x86_64/package.json.patch	                        (rev 0)
+++ community-x86_64/package.json.patch	2021-09-04 16:54:21 UTC (rev 1011362)
@@ -0,0 +1,13 @@
+--- package.json.orig	2021-07-26 05:47:04.787356255 -0700
++++ package.json	2021-07-26 05:47:20.505211209 -0700
+@@ -22,8 +22,8 @@
+     "sub:update": "git submodule update --remote",
+     "sub:pull": "git submodule foreach git pull origin master",
+     "sub:commit": "npm run sub:pull && git commit -am \"update submodule\"",
+-    "preinstall": "npm run sub:init",
+-    "postinstall": "patch-package && electron-rebuild",
++    "preinstall": "",
++    "postinstall": "patch-package",
+     "symlink:win": "rm -rf ./jslib && cmd /c mklink /J .\\jslib ..\\jslib",
+     "symlink:mac": "npm run symlink:lin",
+     "symlink:lin": "rm -rf ./jslib && ln -s ../jslib ./jslib",



More information about the arch-commits mailing list