diff options
author | zxp19821005 | 2024-09-03 11:55:54 +0800 |
---|---|---|
committer | zxp19821005 | 2024-09-03 11:55:54 +0800 |
commit | b643a959de071e3a825157a6146972f789392be8 (patch) | |
tree | f0e81dc86f45e3bd32db27f6dced472a965ce61e | |
parent | ac12f4e08c0d1c419c502dcff7337cbd41e8cd02 (diff) | |
download | aur-b643a959de071e3a825157a6146972f789392be8.tar.gz |
update to 3.1.5
-rw-r--r-- | .SRCINFO | 8 | ||||
-rw-r--r-- | PKGBUILD | 36 |
2 files changed, 23 insertions, 21 deletions
@@ -1,6 +1,6 @@ pkgbase = siyuan pkgdesc = A privacy-first, self-hosted, fully open source personal knowledge management software, written in typescript and golang. - pkgver = 3.1.4 + pkgver = 3.1.5 pkgrel = 1 url = https://b3log.org/siyuan arch = aarch64 @@ -10,16 +10,16 @@ pkgbase = siyuan makedepends = curl makedepends = nvm makedepends = npm - makedepends = go>=1.22 + makedepends = go makedepends = pnpm makedepends = git depends = electron30 provides = siyuan conflicts = siyuan conflicts = siyuan-note - source = siyuan.git::git+https://github.com/siyuan-note/siyuan.git#tag=v3.1.4 + source = siyuan.git::git+https://github.com/siyuan-note/siyuan.git#tag=v3.1.5 source = siyuan.sh - sha256sums = 4a4d1b10019c5c8b4ed10c8343fa006bfac8968cf9b93c7126e41f28152ca358 + sha256sums = cadb49d557c3fd68abd57622ca68946df4025005594ea2dfa6fe631da1067c9d sha256sums = 2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051 pkgname = siyuan @@ -1,7 +1,7 @@ # Maintainer: zxp19821005 <zxp19821005 at 163 dot com> # Contributor: Xiaozhu1337 <nihaoaheheda@gmail.com> pkgname=siyuan -pkgver=3.1.4 +pkgver=3.1.5 _electronversion=30 _nodeversion=18 pkgrel=1 @@ -26,7 +26,7 @@ makedepends=( 'curl' 'nvm' 'npm' - 'go>=1.22' + 'go' 'pnpm' 'git' ) @@ -34,7 +34,7 @@ source=( "${pkgname}.git::git+${_ghurl}.git#tag=v${pkgver}" "${pkgname}.sh" ) -sha256sums=('4a4d1b10019c5c8b4ed10c8343fa006bfac8968cf9b93c7126e41f28152ca358' +sha256sums=('cadb49d557c3fd68abd57622ca68946df4025005594ea2dfa6fe631da1067c9d' '2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051') _ensure_local_nvm() { export NVM_DIR="${srcdir}/.nvm" @@ -53,33 +53,35 @@ build() { gendesk -q -f -n --pkgname="${pkgname}" --pkgdesc="${pkgdesc}" --categories="Office" --name="${pkgname}" --exec="${pkgname} %U" sed "2i\Name[zh_CN]=思源笔记" -i "${srcdir}/${pkgname}.desktop" cd "${srcdir}/${pkgname}.git/app" - 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 ELECTRONVERSION="${_electronversion}" - HOME="${srcdir}/.electron-gyp" - pnpm config set store-dir "${srcdir}/.pnpm_store" - pnpm config set cache-dir "${srcdir}/.pnpm_cache" - pnpm config set link-workspace-packages true export CGO_ENABLED=1 export GO111MODULE=on export GOOS=linux export GOCACHE="${srcdir}/go-build" export GOMODCACHE="${srcdir}/go/pkg/mod" - 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/ - export GOPROXY=https://goproxy.cn + HOME="${srcdir}/.electron-gyp" + echo 'build_from_source=true' >> .npmrc + echo 'link-workspace-packages=true' >> .npmrc + echo 'fetch-retry-maxtimeout=10000' >> .npmrc + echo "cache-dir="${srcdir}"/.pnpm_cache" >> .npmrc + echo "store-dir="${srcdir}"/.pnpm_store" >> .npmrc + if [[ "$(curl -s ipinfo.io/country)" == *"CN"* ]]; then + echo 'registry=https://registry.npmmirror.com' >> .npmrc + echo 'disturl=https://registry.npmmirror.com/-/binary/node/' >> .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 + go env -w GOPROXY=https://goproxy.cn,direct + else echo "Your network is OK." fi sed "/tar.gz/d;/deb/d;s|AppImage|dir|g;s|icon.icns|icon.png|g" -i electron-builder-linux.yml sed "s|tar.gz|dir|g;s|deb|dir|g;s|AppImage|dir|g;s|icon.icns|icon.png|g" -i electron-builder-linux-arm64.yml - sed "/packageManager/d" -i package.json - NODE_ENV=development pnpm install --no-frozen-lockfile - NODE_ENV=production pnpm run build + sed -i "s/\"electron\": \"\([^\"]*\)\"/\"electron\": \"${SYSTEM_ELECTRON_VERSION}\"/" -i package.json + NODE_ENV=development pnpm install --no-frozen-lockfile + NODE_ENV=production pnpm run build cd "${srcdir}/${pkgname}.git/kernel" go build --tags fts5 -o "../app/kernel-linux/SiYuan-Kernel" -v -ldflags "-s -w -X github.com/siyuan-note/siyuan/kernel/util.Mode=prod" cd "${srcdir}/${pkgname}.git/app" |