diff --git a/.SRCINFO b/.SRCINFO index 7e92292..74bc304 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,24 +1,20 @@ pkgbase = stoat-desktop-bin pkgdesc = Stoat for Desktop. (Prebuilt version. Use system-wide electron) - pkgver = 1.5.1 + pkgver = 1.5.3 pkgrel = 1 url = https://stoat.chat/ arch = aarch64 arch = x86_64 license = AGPL-3.0-only - makedepends = gendesk - makedepends = git depends = electron43 - provides = stoat-desktop=1.5.1 + provides = stoat-desktop=1.5.3 conflicts = stoat-desktop options = !emptydirs - source = stoat-desktop-assets::git+https://github.com/stoatchat/assets source = stoat-desktop.sh - sha256sums = SKIP sha256sums = a774c2f54fbbeeaac3cefc0f7250796d30c86d27f0fd40b7eaf9c0fdb021623d - source_aarch64 = stoat-desktop-1.5.1-aarch64.zip::https://github.com/stoatchat/for-desktop/releases/download/v1.5.1/Stoat-linux-arm64-1.5.1.zip - sha256sums_aarch64 = 59dfc154c608cfc4217e554554289b360fdb36b410bd398d381dbb1f9dd38bdd - source_x86_64 = stoat-desktop-1.5.1-x86_64.zip::https://github.com/stoatchat/for-desktop/releases/download/v1.5.1/Stoat-linux-x64-1.5.1.zip - sha256sums_x86_64 = d84f970b324a904db35fc2ea64682a2ec1a0cc108a8c61fe7c4e5eb31290aa6f + source_aarch64 = stoat-desktop-1.5.3-aarch64.AppImage::https://github.com/stoatchat/for-desktop/releases/download/v1.5.3/Stoat-1.5.3-anylinux-aarch64.AppImage + sha256sums_aarch64 = fa36a052dcf3953a273d87161937ad327da525e9061e3631100c98b42cf8ad8f + source_x86_64 = stoat-desktop-1.5.3-x86_64.AppImage::https://github.com/stoatchat/for-desktop/releases/download/v1.5.3/Stoat-1.5.3-anylinux-x86_64.AppImage + sha256sums_x86_64 = 8f6e8c6c16069ba1ff30ee60443e4cca35eb5e11c6f279f64a93f0af1500b1eb pkgname = stoat-desktop-bin diff --git a/PKGBUILD b/PKGBUILD index 71d3555..2ea04eb 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: zxp19821005 pkgname=stoat-desktop-bin _pkgname=Stoat -pkgver=1.5.1 +pkgver=1.5.3 _electronversion=43 pkgrel=1 pkgdesc="Stoat for Desktop. (Prebuilt version. Use system-wide electron)" @@ -17,29 +17,21 @@ conflicts=("${pkgname%-bin}") depends=( "electron${_electronversion}" ) -makedepends=( - 'gendesk' - 'git' -) options=( '!emptydirs' ) -source=( - "${pkgname%-bin}-assets::git+https://github.com/stoatchat/assets" - "${pkgname%-bin}.sh" -) -source_aarch64=("${pkgname%-bin}-${pkgver}-aarch64.zip::${_ghurl}/releases/download/v${pkgver}/${_pkgname}-linux-arm64-${pkgver}.zip") -source_x86_64=("${pkgname%-bin}-${pkgver}-x86_64.zip::${_ghurl}/releases/download/v${pkgver}/${_pkgname}-linux-x64-${pkgver}.zip") -sha256sums=('SKIP' - 'a774c2f54fbbeeaac3cefc0f7250796d30c86d27f0fd40b7eaf9c0fdb021623d') -sha256sums_aarch64=('59dfc154c608cfc4217e554554289b360fdb36b410bd398d381dbb1f9dd38bdd') -sha256sums_x86_64=('d84f970b324a904db35fc2ea64682a2ec1a0cc108a8c61fe7c4e5eb31290aa6f') +source=("${pkgname%-bin}.sh") +source_aarch64=("${pkgname%-bin}-${pkgver}-aarch64.AppImage::${_ghurl}/releases/download/v${pkgver}/${_pkgname}-${pkgver}-anylinux-aarch64.AppImage") +source_x86_64=("${pkgname%-bin}-${pkgver}-x86_64.AppImage::${_ghurl}/releases/download/v${pkgver}/${_pkgname}-${pkgver}-anylinux-x86_64.AppImage") +sha256sums=('a774c2f54fbbeeaac3cefc0f7250796d30c86d27f0fd40b7eaf9c0fdb021623d') +sha256sums_aarch64=('fa36a052dcf3953a273d87161937ad327da525e9061e3631100c98b42cf8ad8f') +sha256sums_x86_64=('8f6e8c6c16069ba1ff30ee60443e4cca35eb5e11c6f279f64a93f0af1500b1eb') _get_app_dir() { find "${srcdir}" -type f -name "resources.pak" -exec dirname {} + | head -n 1 } _check_electron_version() { echo "Verifying Electron version..." - local _main_exe=$(find "$(_get_app_dir)" -maxdepth 1 -type f -executable -printf '%s %p\n' | sort -nr | head -1 | cut -d' ' -f2-) + local _main_exe="${srcdir}/AppDir/shared/bin/${pkgname%-bin}" [[ -z "${_main_exe}" ]] && echo -e "\033[1;33mNote: Could not find Electron binary.\033[0m" && return local _elec_ver=$(strings "${_main_exe}" | grep -oP 'Electron/\K[0-9]+' | head -1) [[ -z "${_elec_ver}" ]] && echo -e "\033[1;33mNote: Could not determine Electron version.\033[0m" && return @@ -54,19 +46,21 @@ prepare() { s/@runname@/app.asar/g s/@cfgdirname@/${pkgname%-bin}/g " "${srcdir}/${pkgname%-bin}.sh" + if [ ! -x "${srcdir}/${pkgname%-bin}-${pkgver}-${CARCH}.AppImage" ];then + chmod +x "${srcdir}/${pkgname%-bin}-${pkgver}-${CARCH}.AppImage" + fi + if [ -d "${srcdir}/squashfs-root" ];then + rm -rf "${srcdir}/squashfs-root" + fi + "${srcdir}/${pkgname%-bin}-${pkgver}-${CARCH}.AppImage" --appimage-extract > /dev/null _check_electron_version - gendesk -q -f -n \ - --pkgname="${pkgname%-bin}" \ - --pkgdesc="Stoat for Desktop." \ - --categories="Network" \ - --name="${_pkgname}" \ - --exec="${pkgname%-bin} %U" + sed -i "s/Icon=chat.stoat.StoatDesktop/Icon=${pkgname%-bin}/g" "${srcdir}/AppDir/chat.stoat.StoatDesktop.desktop" } package() { install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}" install -Dm755 -d "${pkgdir}/usr/lib/${pkgname%-bin}" local _app_dir=$(_get_app_dir) - cp -a "${_app_dir}/resources/"* "${pkgdir}/usr/lib/${pkgname%-bin}/" - install -Dm644 "${srcdir}/${pkgname%-bin}-assets/desktop/icon@3x.png" "${pkgdir}/usr/share/pixmaps/${pkgname%-bin}.png" - install -Dm644 "${srcdir}/${pkgname%-bin}.desktop" -t "${pkgdir}/usr/share/applications" -} + cp -a "${_app_dir}/resources/". "${pkgdir}/usr/lib/${pkgname%-bin}/" + install -Dm644 "${srcdir}/AppDir/icon.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${pkgname%-bin}.svg" + install -Dm644 "${srcdir}/AppDir/chat.stoat.StoatDesktop.desktop" "${pkgdir}/usr/share/applications/${pkgname%-bin}.desktop" +} \ No newline at end of file