upgpkg: keeweb 1.17.0

2 files changed, 15 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c2656c71945c..ad521b9968d5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,17 @@
 pkgbase = keeweb-git
 	pkgdesc = Desktop password manager compatible with KeePass databases. (develop branch)
-	pkgver = 1.15.7+53+gd0fdada9
+	pkgver = 1.17.0+3+gf8ec47bf
 	pkgrel = 1
 	url = https://keeweb.info
 	arch = any
 	license = MIT
 	makedepends = asar
 	makedepends = git
-	makedepends = libsass>=3.5.5
-	makedepends = nodejs>=8.15.0
+	makedepends = libsass
 	makedepends = npm
-	makedepends = python2
 	depends = electron
 	depends = org.freedesktop.secrets
-	optdepends = xdotool: for auto-type
+	depends = libusb
 	provides = keeweb
 	provides = keeweb-desktop
 	conflicts = keeweb
diff --git a/PKGBUILD b/PKGBUILD
index d61aa2ba5072..5c5a96127cc0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor wenLiangcan <boxeed at gmail dot com>
 
 pkgname=keeweb-git
-pkgver=1.15.7+53+gd0fdada9
+pkgver=1.17.0+3+gf8ec47bf
 _electron=electron
 pkgrel=1
 pkgdesc="Desktop password manager compatible with KeePass databases. (develop branch)"
@@ -12,16 +12,14 @@ license=('MIT')
 depends=(
 	$_electron
 	'org.freedesktop.secrets'
+	'libusb'
 )
 makedepends=(
 	'asar'
 	'git'
-	'libsass>=3.5.5'
-	'nodejs>=8.15.0'
+	'libsass'
 	'npm'
-	'python2'
 )
-optdepends=('xdotool: for auto-type')
 conflicts=('keeweb' 'keeweb-desktop')
 provides=('keeweb' 'keeweb-desktop')
 source=(
@@ -77,7 +75,6 @@ build() {
 	export LIBSASS_EXT=auto
 
 	npm install --nodedir=/usr
-	npm install css-loader
 
 	npx grunt build-web-app build-desktop-app-content
 
@@ -90,18 +87,11 @@ build() {
 
 	cd "${srcdir}/keeweb-native-modules"
 
-	local electron_build_opts=(
-		production
-		arch=$_arch
-		runtime=electron
-		disturl=https://electronjs.org/headers
-		target=$(</usr/lib/${_electron}/version)
-		target_arch=$_arch
-		use_system_libusb=true
-	)
-
-	HOME="${srcdir}/.electron-gyp" npm install "${electron_build_opts[@]/#/--}"
+	npm install --ignore-scripts
 
+	HOME="${srcdir}/.electron-gyp" \
+	npm_config_use_system_libusb=true \
+	npx electron-rebuild --arch="${_arch}" --version="$(</usr/lib/${_electron}/version)" --only=argon2,keytar,usb,yubikey-chalresp,keyboard-auto-type
 }
 
 package() {
@@ -118,12 +108,11 @@ package() {
 	local _src_mdir="${srcdir}/keeweb-native-modules/node_modules"
 	local _pkg_mdir="${pkgdir}/usr/lib/keeweb/node_modules/@keeweb/keeweb-native-modules"
 
-	install -Dm0644 "${_src_mdir}/argon2/build-tmp-napi-v3/Release/argon2.node" \
-		"${_pkg_mdir}/argon2-linux-${_arch}.node"
-	install -Dm0644 "${_src_mdir}/keytar/build/Release/keytar.node" \
-		"${_pkg_mdir}/keytar-linux-${_arch}.node"
 	install -Dm0644 "${_src_mdir}/usb/build/Release/usb_bindings.node" \
 		"${_pkg_mdir}/usb-linux-${_arch}.node"
-	install -Dm0644 "${_src_mdir}/yubikey-chalresp/build/Release/yubikey-chalresp.node" \
-		"${_pkg_mdir}/yubikey-chalresp-linux-${_arch}.node"
+
+	for _mod in argon2 keyboard-auto-type keytar yubikey-chalresp; do
+		install -Dm0644 "${_src_mdir}/${_mod}/build/Release/${_mod}.node" \
+			"${_pkg_mdir}/${_mod}-linux-${_arch}.node"
+	done
 }