diff options
| author | zxp19821005 | 2024-05-14 10:08:03 +0800 |
|---|---|---|
| committer | zxp19821005 | 2024-05-14 10:08:03 +0800 |
| commit | f7afd3801a02e0605f2b8847cf1b67b793416cc7 (patch) | |
| tree | 6b4cd21fa3ca6f0581a70f322a9135746a949c24 | |
| parent | d64632f2d87158b2433385d614c7a01318af7382 (diff) | |
| download | aur-f7afd3801a02e0605f2b8847cf1b67b793416cc7.tar.gz | |
update to 24.4.0.r1.g838e5cb
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 15 | ||||
| -rw-r--r-- | drawio-desktop.sh | 21 |
3 files changed, 29 insertions, 13 deletions
@@ -1,6 +1,6 @@ pkgbase = drawio-desktop-git pkgdesc = A diagramming and whiteboarding desktop app based on Electron that wraps the core draw.io editor. - pkgver = 24.2.5.r1.gc7fbd59 + pkgver = 24.4.0.r1.g838e5cb pkgrel = 1 url = https://www.diagrams.net/ arch = any @@ -13,11 +13,11 @@ pkgbase = drawio-desktop-git makedepends = libicns makedepends = imagemagick depends = electron28 - provides = drawio-desktop=24.2.5.r1.gc7fbd59 + provides = drawio-desktop=24.4.0.r1.g838e5cb conflicts = drawio-desktop source = drawio-desktop.git::git+https://github.com/jgraph/drawio-desktop.git source = drawio-desktop.sh sha256sums = SKIP - sha256sums = dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8 + sha256sums = 41b6d61dffef064762b3eec3dfeca7a3e1f57cbcb6dce9a6940c06797a0eae9d pkgname = drawio-desktop-git @@ -1,6 +1,7 @@ # Maintainer: zxp19821005 <zxp19821005 at 163 dot com> -pkgname=drawio-desktop-git -pkgver=24.2.5.r1.gc7fbd59 +_pkgname=draw.io +pkgname="${_pkgname//./}-desktop-git" +pkgver=24.4.0.r1.g838e5cb _electronversion=28 _nodeversion=20 pkgrel=1 @@ -28,7 +29,7 @@ source=( "${pkgname%-git}.sh" ) sha256sums=('SKIP' - 'dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8') + '41b6d61dffef064762b3eec3dfeca7a3e1f57cbcb6dce9a6940c06797a0eae9d') pkgver() { cd "${srcdir}/${pkgname%-git}.git" git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' @@ -43,24 +44,26 @@ build() { sed -e "s|@electronversion@|${_electronversion}|" \ -e "s|@appname@|${pkgname%-git}|g" \ -e "s|@runname@|app.asar|g" \ - -e "s|@options@|env ELECTRON_OZONE_PLATFORM_HINT=auto|g" \ + -e "s|@cfgdirname@|${_pkgname}|g" \ + -e "s|@options@||g" \ -i "${srcdir}/${pkgname%-git}.sh" _ensure_local_nvm - gendesk -q -f -n --pkgname="${pkgname%-git}" --categories="Graphics" --exec="${pkgname%-git} %U" + gendesk -q -f -n --pkgname="${_pkgname//./}-desktop-git" --categories="Graphics" --exec="${pkgname%-git} %U" cd "${srcdir}/${pkgname%-git}.git" export npm_config_build_from_source=true export ELECTRON_SKIP_BINARY_DOWNLOAD=1 export SYSTEM_ELECTRON_VERSION="$(electron${_electronversion} -v | sed 's/v//g')" export npm_config_target="${SYSTEM_ELECTRON_VERSION}" export ELECTRONVERSION="${_electronversion}" - export npm_config_disturl=https://electronjs.org/headers HOME="${srcdir}/.electron-gyp" mkdir -p "${srcdir}/.electron-gyp" touch "${srcdir}/.electron-gyp/.yarnrc" if [ `curl -s ipinfo.io/country | grep CN | wc -l ` -ge 1 ];then export npm_config_registry=https://registry.npmmirror.com + export npm_config_disturl=https://registry.npmmirror.com/-/binary/node/ 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/ + sed "s|github.com|mirror.ghproxy.com\/https:\/\/github.com|g" -i .gitmodules else echo "Your network is OK." fi diff --git a/drawio-desktop.sh b/drawio-desktop.sh index 7ddcaab8d734..398398461fee 100644 --- a/drawio-desktop.sh +++ b/drawio-desktop.sh @@ -1,16 +1,29 @@ #!/bin/bash -set -e +set -o pipefail _APPDIR="/usr/lib/@appname@" _RUNNAME="${_APPDIR}/@runname@" +_CFGDIR="@cfgdirname@/" _OPTIONS="@options@" export PATH="${_APPDIR}:${PATH}" export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}" export ELECTRON_IS_DEV=0 export ELECTRON_FORCE_IS_PACKAGED=true +export ELECTRON_DISABLE_SECURITY_WARNINGS=true +export ELECTRON_OVERRIDE_DIST_PATH="/usr/bin/electron@electronversion@" export NODE_ENV=production +export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}" +export _FLAGS_FILE="${XDG_CONFIG_HOME}/${_CFGDIR}@appname@-flags.conf" +declare -a _USER_FLAGS +if [[ -f "${_FLAGS_FILE}" ]]; then + while read -r line; do + if [[ ! "${line}" =~ ^[[:space:]]*#.* ]]; then + _USER_FLAGS+=("${line}") + fi + done < "${_FLAGS_FILE}" +fi cd "${_APPDIR}" -if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then - exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" "$@" || exit $? +if [[ "${EUID}" -ne 0 ]] || [[ "${ELECTRON_RUN_AS_NODE}" ]]; then + exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" "${_USER_FLAGS[@]}" "$@" else - exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" --no-sandbox "$@" || exit $? + exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" --no-sandbox "${_USER_FLAGS[@]}" "$@" fi
\ No newline at end of file |