summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuke Arms2021-12-30 04:21:59 +1100
committerLuke Arms2021-12-30 04:22:16 +1100
commit78106bf928ee7495cf7e3077c944639c9e71d127 (patch)
tree7cf1b283def8f19d73bb7aa6d447ef97aa801f58
parent271b7a39d14dacac7f45d0223da07a469b5da46b (diff)
downloadaur-78106bf928ee7495cf7e3077c944639c9e71d127.tar.gz
Update dependencies and improve robustness of build
-rw-r--r--.SRCINFO18
-rw-r--r--PKGBUILD12
2 files changed, 14 insertions, 16 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e19461fe68e9..b4436d76c7d5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,19 +9,15 @@ pkgbase = stretchly-git
makedepends = nvm
makedepends = jq
makedepends = python
- depends = c-ares
- depends = ffmpeg
depends = gtk3
- depends = http-parser
- depends = libevent
- depends = libvpx
- depends = libxslt
- depends = libxss
- depends = minizip
- depends = nss
- depends = re2
- depends = snappy
depends = libnotify
+ depends = nss
+ depends = libxss
+ depends = libxtst
+ depends = xdg-utils
+ depends = at-spi2-atk
+ depends = util-linux-libs
+ depends = libsecret
depends = libappindicator-gtk3
depends = electron
provides = stretchly
diff --git a/PKGBUILD b/PKGBUILD
index 6682856236fc..2bc38c324fdb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ pkgdesc="The break time reminder app"
arch=('any')
url="https://github.com/hovancik/stretchly/"
license=('BSD')
-depends=('c-ares' 'ffmpeg' 'gtk3' 'http-parser' 'libevent' 'libvpx' 'libxslt' 'libxss' 'minizip' 'nss' 're2' 'snappy' 'libnotify' 'libappindicator-gtk3' 'electron')
+depends=('gtk3' 'libnotify' 'nss' 'libxss' 'libxtst' 'xdg-utils' 'at-spi2-atk' 'util-linux-libs' 'libsecret' 'libappindicator-gtk3' 'electron')
makedepends=('git' 'nvm' 'jq' 'python')
provides=("$_pkgname")
conflicts=("$_pkgname" "${_pkgname}-bin")
@@ -40,8 +40,8 @@ prepare() {
nvm ls "$_node_version" &>/dev/null ||
nvm install "$_node_version" || false
nvm use "$_node_version"
- npm install \
- electron@"$(cat /usr/lib/electron/version)"
+ npm install --no-audit --no-progress --no-fund \
+ electron@"$(</usr/lib/electron/version)"
}
build() {
@@ -57,10 +57,12 @@ build() {
_electron=${_unpackdir}/opt/${_appname}/${_pkgname}
rm -Rf "${_unpackdir}"
mkdir -p "${_unpackdir}"
+ local i686=ia32 x86_64=x64
./node_modules/.bin/electron-builder build \
+ --linux pacman \
+ --"${!CARCH}" \
-c.electronDist=/usr/lib/electron \
- -c.electronVersion="$(cat /usr/lib/electron/version)" \
- --linux pacman
+ -c.electronVersion="$(</usr/lib/electron/version)"
tar -C "${_unpackdir}" -Jxf "${_outfile}"
echo "Deleting Electron ($(du -h "$_electron" | awk '{print $1}'))..." >&2
rm -v "$_electron"