summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorzxp198210052024-04-29 13:27:01 +0800
committerzxp198210052024-04-29 13:27:01 +0800
commit806984b3f6cfdc401d991463dfae7a3c1335615d (patch)
tree831208325c6f61a8b6c430895e240b041aa014ce
parenta1ebba7390b33a22f3037ae4c2b84abdf7a5678b (diff)
downloadaur-806984b3f6cfdc401d991463dfae7a3c1335615d.tar.gz
update to 2.4.1.r17.g7e60288f2
Diffstat
-rw-r--r--.SRCINFO11
-rw-r--r--PKGBUILD28
-rw-r--r--thorium-reader.sh9
3 files changed, 27 insertions, 21 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 57fb47750eef..df4721f9638e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = thorium-reader-git
pkgdesc = Cross-platform desktop reading app based on the Readium Desktop toolkit
- pkgver = 2.3.0.r128.gad41fc04a
+ pkgver = 2.4.1.r17.g7e60288f2
pkgrel = 1
url = https://github.com/edrlab/thorium-reader
arch = any
@@ -9,13 +9,14 @@ pkgbase = thorium-reader-git
makedepends = git
makedepends = nvm
makedepends = npm
- depends = electron29
- depends = hicolor-icon-theme
- provides = thorium-reader
+ makedepends = python>=3.8.10
+ makedepends = python-setuptools
+ depends = electron30
+ provides = thorium-reader=2.4.1
conflicts = thorium-reader
source = thorium-reader.git::git+https://github.com/edrlab/thorium-reader.git
source = thorium-reader.sh
sha256sums = SKIP
- sha256sums = dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8
+ sha256sums = 61d56055897e9d71d68e185ac2de7c4cb2fbca16eb3fb0091703612c113441f3
pkgname = thorium-reader-git
diff --git a/PKGBUILD b/PKGBUILD
index 6ea5f6b8c83c..e94e1c765c14 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
# Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
pkgname=thorium-reader-git
_pkgname="Thorium Reader"
-pkgver=2.3.0.r128.gad41fc04a
-_electronversion=29
+pkgver=2.4.1.r17.g7e60288f2
+_electronversion=30
_nodeversion=20
pkgrel=1
pkgdesc="Cross-platform desktop reading app based on the Readium Desktop toolkit"
@@ -10,23 +10,24 @@ arch=('any')
url="https://github.com/edrlab/thorium-reader"
license=('BSD-3-Clause')
conflicts=("${pkgname%-git}")
-provides=("${pkgname%-git}")
+provides=("${pkgname%-git}=${pkgver%.r*}")
depends=(
"electron${_electronversion}"
- 'hicolor-icon-theme'
)
makedepends=(
'gendesk'
'git'
'nvm'
'npm'
+ 'python>=3.8.10'
+ 'python-setuptools'
)
source=(
"${pkgname%-git}.git::git+${url}.git"
"${pkgname%-git}.sh"
)
sha256sums=('SKIP'
- 'dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8')
+ '61d56055897e9d71d68e185ac2de7c4cb2fbca16eb3fb0091703612c113441f3')
pkgver() {
cd "${pkgname%-git}.git"
git describe --long --tags --exclude='*[a-z][a-z]*' | sed -E 's/^v//;s/([^-]*-g)/r\1/;s/-/./g'
@@ -41,10 +42,10 @@ build() {
sed -e "s|@electronversion@|${_electronversion}|" \
-e "s|@appname@|${pkgname%-git}|g" \
-e "s|@runname@|app.asar|g" \
- -e "s|@options@||g" \
+ -e "s|@options@|env ELECTRON_OZONE_PLATFORM_HINT=auto|g" \
-i "${srcdir}/${pkgname%-git}.sh"
_ensure_local_nvm
- gendesk -q -f -n --categories="Utility" --name="${_pkgname}" --exec="${pkgname%-git} %U"
+ gendesk -q -f -n --categories="Office" --name="${_pkgname}" --exec="${pkgname%-git} %U"
cd "${srcdir}/${pkgname%-git}.git"
export npm_config_build_from_source=true
export npm_config_cache="${srcdir}/.npm_cache"
@@ -55,16 +56,15 @@ build() {
export npm_config_disturl=https://electronjs.org/headers
HOME="${srcdir}/.electron-gyp"
if [ `curl -s ipinfo.io/country | grep CN | wc -l ` -ge 1 ];then
- echo 'registry="https://registry.npmmirror.com/"' >> .npmrc
- echo 'electron_mirror="https://registry.npmmirror.com/-/binary/electron/"' >> .npmrc
- echo 'electron_builder_binaries_mirror="https://registry.npmmirror.com/-/binary/electron-builder-binaries/"' >> .npmrc
+ export npm_config_registry=https://registry.npmmirror.com
+ export npm_config_electron_mirror=https://registry.npmmirror.com/-/binary/electron/
+ export npm_config_electron_builder_binaries_mirror=https://registry.npmmirror.com/-/binary/electron-builder-binaries/
else
echo "Your network is OK."
fi
- sed "s|--linux --x64 --publish never|-l --dir|g" -i package.json
- npm ci
- npm run prepackage:linux
- npm run package:linux
+ npm install --no-audit --no-fund --prefer-offline
+ npm run package:build
+ npx electron-builder -l --dir -p never -c.electronDist='/usr/lib/electron' -c.electronVersion="${SYSTEM_ELECTRON_VERSION}"
}
package() {
install -Dm755 "${srcdir}/${pkgname%-git}.sh" "${pkgdir}/usr/bin/${pkgname%-git}"
diff --git a/thorium-reader.sh b/thorium-reader.sh
index 7ddcaab8d734..842c77e19b1d 100644
--- a/thorium-reader.sh
+++ b/thorium-reader.sh
@@ -8,9 +8,14 @@ export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}
export ELECTRON_IS_DEV=0
export ELECTRON_FORCE_IS_PACKAGED=true
export NODE_ENV=production
+export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
+_FLAGS_FILE="${XDG_CONFIG_HOME}/@appname@-flags.conf"
+if [ -r "${_FLAGS_FILE}" ]; then
+ _USER_FLAGS="$(cat "${_FLAGS_FILE}")"
+fi
cd "${_APPDIR}"
if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
- exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" "$@" || exit $?
+ exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" "${_USER_FLAGS}" "$@" || exit $?
else
- exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" --no-sandbox "$@" || exit $?
+ exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" --no-sandbox "${_USER_FLAGS}" "$@" || exit $?
fi \ No newline at end of file