diff --git a/.SRCINFO b/.SRCINFO index 3a300de5c62b..66b47d07598c 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = miru-viewer-git pkgdesc = GitHub Issue/Pull Request/Release viewer.(Use system-wide electron) - pkgver = 1.3.2.r0.gc440d96 + pkgver = 1.4.1.r1.g81254f2 pkgrel = 1 url = https://github.com/ytakahashi/miru arch = any @@ -11,8 +11,8 @@ pkgbase = miru-viewer-git makedepends = nvm makedepends = gendesk makedepends = curl - depends = electron35 - provides = miru-viewer=1.3.2 + depends = electron36 + provides = miru-viewer=1.4.1 conflicts = miru-viewer source = miru-viewer.git::git+https://github.com/ytakahashi/miru.git source = miru-viewer.sh diff --git a/PKGBUILD b/PKGBUILD index d5ad1546e970..b10ff09cea96 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,9 +1,9 @@ # Maintainer: zxp19821005 _pkgname=miru pkgname="${_pkgname}-viewer-git" -pkgver=1.3.2.r0.gc440d96 -_electronversion=35 -_nodeversion=22 +pkgver=1.4.1.r1.g81254f2 +_electronversion=36 +_nodeversion=24 pkgrel=1 pkgdesc="GitHub Issue/Pull Request/Release viewer.(Use system-wide electron)" arch=('any') @@ -41,16 +41,21 @@ _ensure_local_nvm() { nvm use "${_nodeversion}" } prepare() { - sed -e " + cd "${srcdir}/${pkgname%-git}.git" + sed -i-e " s/@electronversion@/${_electronversion}/g s/@appname@/${pkgname%-git}/g s/@runname@/app.asar/g s/@cfgdirname@/${_pkgname}/g s/@options@/env ELECTRON_OZONE_PLATFORM_HINT=auto/g - " -i "${srcdir}/${pkgname%-git}.sh" + " "${srcdir}/${pkgname%-git}.sh" _ensure_local_nvm - gendesk -q -f -n --pkgname="${_pkgname}-viewer-git" --pkgdesc="${pkgdesc}" --categories="Utility" --name="${pkgname%-git}" --exec="${pkgname%-git} %U" - cd "${srcdir}/${pkgname%-git}.git" + gendesk -q -f -n \ + --pkgname="${_pkgname}-viewer-git" \ + --pkgdesc="${pkgdesc}" \ + --categories="Utility" \ + --name="${pkgname%-git}" \ + --exec="${pkgname%-git} %U" export ELECTRON_SKIP_BINARY_DOWNLOAD=1 export SYSTEM_ELECTRON_VERSION="$(electron${_electronversion} -v | sed 's/v//g')" HOME="${srcdir}/.electron-gyp" @@ -82,13 +87,14 @@ build() { cd "${srcdir}/${pkgname%-git}.git" sed -i "s/\/\${version}//g" electron-builder.json local electronDist="/usr/lib/electron${_electronversion}" - NODE_ENV=production yarn run build - NODE_ENV=production yarn electron-builder --linux dir -c.electronDist="${electronDist}" --config=electron-builder.json + NODE_ENV=production yarn run vite:build + NODE_ENV=production yarn run ts + NODE_ENV=production yarn electron-builder --linux dir -c.electronDist="${electronDist}" --config=electron-builder.json } package() { install -Dm755 "${srcdir}/${pkgname%-git}.sh" "${pkgdir}/usr/bin/${pkgname%-git}" install -Dm644 "${srcdir}/${pkgname%-git}.git/dist_electron/linux-"*/resources/app.asar -t "${pkgdir}/usr/lib/${pkgname%-git}" install -Dm644 "${srcdir}/${pkgname%-git}.git/public/icon.png" "${pkgdir}/usr/share/pixmaps/${pkgname%-git}.png" - install -Dm644 "${srcdir}/${pkgname%-git}.desktop" -t "${pkgdir}/usr/share/applications" + install -Dm644 "${srcdir}/${pkgname%-git}.git/${pkgname%-git}.desktop" -t "${pkgdir}/usr/share/applications" install -Dm644 "${srcdir}/${pkgname%-git}.git/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}" } \ No newline at end of file