diff options
| -rw-r--r-- | .SRCINFO | 13 | ||||
| -rw-r--r-- | PKGBUILD | 34 | ||||
| -rw-r--r-- | notesnook.sh | 9 |
3 files changed, 31 insertions, 25 deletions
@@ -1,6 +1,6 @@ pkgbase = notesnook pkgdesc = A fully open source & end-to-end encrypted note taking alternative to Evernote - pkgver = 2.6.17 + pkgver = 3.0.0 pkgrel = 1 url = https://notesnook.com/ arch = aarch64 @@ -13,14 +13,15 @@ pkgbase = notesnook makedepends = base-devel makedepends = gcc makedepends = curl - depends = electron25-bin - provides = notesnook=2.6.17 + depends = electron29 + depends = nodejs + provides = notesnook=3.0.0 conflicts = notesnook - source = notesnook.git::git+https://github.com/streetwriters/notesnook.git#tag=v2.6.17 + source = notesnook-3.0.0.tar.gz::https://github.com/streetwriters/notesnook/archive/refs/tags/v3.0.0.tar.gz source = notesnook.desktop source = notesnook.sh - sha256sums = SKIP + sha256sums = fcd24879715d267545734a84d9d9008bba549116748937c2ed993973ac8fa18b sha256sums = 102a538ee9432310d854842a578cd3371df0431b4db617479de66aa45b5f2440 - sha256sums = dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8 + sha256sums = 61d56055897e9d71d68e185ac2de7c4cb2fbca16eb3fb0091703612c113441f3 pkgname = notesnook @@ -6,9 +6,9 @@ # Contributor: Ada <adadonderr@gmail.com> # Contributor: Christian Finnberg <christian@finnberg.net> pkgname=notesnook -pkgver=2.6.17 -_electronversion=25 -_nodeversion=16 +pkgver=3.0.0 +_electronversion=29 +_nodeversion=20 pkgrel=1 pkgdesc="A fully open source & end-to-end encrypted note taking alternative to Evernote" arch=( @@ -21,7 +21,8 @@ license=('GPL-3.0-or-later') provides=("${pkgname}=${pkgver}") conflicts=("${pkgname}") depends=( - "electron${_electronversion}-bin" + "electron${_electronversion}" + 'nodejs' ) makedepends=( 'nvm' @@ -33,13 +34,13 @@ makedepends=( 'curl' ) source=( - "${pkgname}.git::git+${_ghurl}.git#tag=v${pkgver}" + "${pkgname}-${pkgver}.tar.gz::${_ghurl}/archive/refs/tags/v${pkgver}.tar.gz" "${pkgname}.desktop" "${pkgname}.sh" ) -sha256sums=('SKIP' +sha256sums=('fcd24879715d267545734a84d9d9008bba549116748937c2ed993973ac8fa18b' '102a538ee9432310d854842a578cd3371df0431b4db617479de66aa45b5f2440' - 'dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8') + '61d56055897e9d71d68e185ac2de7c4cb2fbca16eb3fb0091703612c113441f3') _ensure_local_nvm() { export NVM_DIR="${srcdir}/.nvm" source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]] @@ -50,9 +51,10 @@ build() { sed -e "s|@electronversion@|${_electronversion}|" \ -e "s|@appname@|${pkgname}|g" \ -e "s|@runname@|app|g" \ - -e "s|@options@||g" \ + -e "s|@options@|env ELECTRON_OZONE_PLATFORM_HINT=auto|g" \ -i "${srcdir}/${pkgname}.sh" _ensure_local_nvm + cd "${srcdir}/${pkgname}-${pkgver}" export npm_config_build_from_source=true export npm_config_cache="${srcdir}/.npm_cache" export ELECTRON_SKIP_BINARY_DOWNLOAD=1 @@ -61,12 +63,10 @@ build() { export ELECTRONVERSION="${_electronversion}" export npm_config_disturl=https://electronjs.org/headers HOME="${srcdir}/.electron-gyp" - #build - cd "${srcdir}/${pkgname}.git" - if [ `curl ifconfig.co/country` = "China" ];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 + if [ `curl -s ipinfo.io/country | grep CN | wc -l ` -ge 1 ];then + 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 @@ -77,16 +77,16 @@ build() { npx nx build:desktop @notesnook/web npm run bootstrap -- --scope=desktop # Build Electron wrapper - cd "${srcdir}/${pkgname}.git/apps/desktop" + cd "${srcdir}/${pkgname}-${pkgver}/apps/desktop" npx nx run release --project @notesnook/desktop npx electron-builder --dir } package() { install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}" install -Dm755 -d "${pkgdir}/usr/lib/${pkgname}" - cp -r "${srcdir}/${pkgname}.git/apps/desktop/output/linux-"*/resources/{app,assets} "${pkgdir}/usr/lib/${pkgname}" + cp -r "${srcdir}/${pkgname}-${pkgver}/apps/desktop/output/linux-"*/resources/{app,assets} "${pkgdir}/usr/lib/${pkgname}" for _icons in 16x16 24x24 32x32 48x48 64x64 128x128 256x256 512x512 1024x1024;do - install -Dm644 "${srcdir}/${pkgname}.git/apps/desktop/assets/icons/${_icons}.png" \ + install -Dm644 "${srcdir}/${pkgname}-${pkgver}/apps/desktop/assets/icons/${_icons}.png" \ "${pkgdir}/usr/share/icons/hicolor/${_icons}/apps/${pkgname}.png" done install -Dm644 "${srcdir}/${pkgname}.desktop" -t "${pkgdir}/usr/share/applications" diff --git a/notesnook.sh b/notesnook.sh index 7ddcaab8d734..842c77e19b1d 100644 --- a/notesnook.sh +++ b/notesnook.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 |