update to 2.8.3

extract icon from asar.

2 files changed, 20 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8a04f1258fa1..d3cef7bb3ee9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,12 @@
 pkgbase = icalingua++
-	pkgdesc = A branch of deleted Icalingua,with limited support
-	pkgver = 2.8.2
+	pkgdesc = A branch of deleted Icalingua, with limited support
+	pkgver = 2.8.3
 	pkgrel = 1
 	url = https://github.com/Icalingua-plus-plus/Icalingua-plus-plus
 	arch = aarch64
 	arch = x86_64
 	license = AGPL3
+	makedepends = asar
 	depends = ffmpeg
 	depends = electron
 	depends = libappindicator-gtk3
@@ -16,15 +17,13 @@ pkgbase = icalingua++
 	conflicts = electron-qq
 	replaces = electron-qq
 	replaces = icalingua-plus-plus
-	source = 512x512.png::https://github.com/Icalingua-plus-plus/Icalingua-plus-plus/raw/v2.8.2/pkgres/512x512.png
 	source = icalingua.desktop
 	source = icalingua
-	sha256sums = 5743ef3d19be5e41e83c3a1171a807cd0505d7f5d5f9c5abdff8926dccadc6de
 	sha256sums = 43da1c99b7a6aee974c20da3bcf925b660dff4ba44a447c86066c84c8bc95fbd
 	sha256sums = 33a02b61af9cd48abd332b6a13964c939649c7ec089bc1a1aca4014bbb8785d2
-	source_aarch64 = app-aarch64-2.8.2.asar::https://github.com/Icalingua-plus-plus/Icalingua-plus-plus/releases/download/v2.8.2/app-arm64.asar
-	sha256sums_aarch64 = a076352400363d78286e1e83352dfe374a47d79041a1dc1427a4def8aaba372a
-	source_x86_64 = app-x86_64-2.8.2.asar::https://github.com/Icalingua-plus-plus/Icalingua-plus-plus/releases/download/v2.8.2/app-x86_64.asar
-	sha256sums_x86_64 = 1a4e1197a7f963b23f5c078e58c51fabc7da8af67c6631797af5c0e7f898c0a5
+	source_aarch64 = app-aarch64-2.8.3.asar::https://github.com/Icalingua-plus-plus/Icalingua-plus-plus/releases/download/v2.8.3/app-arm64.asar
+	sha256sums_aarch64 = 1be27a79c3a71620192fb91ca5bacd1d51db5bdb197b24a85d19d49d23751c03
+	source_x86_64 = app-x86_64-2.8.3.asar::https://github.com/Icalingua-plus-plus/Icalingua-plus-plus/releases/download/v2.8.3/app-x86_64.asar
+	sha256sums_x86_64 = 0a358d64ec1b9f2aa43998523d2d0c372f2121b1f53a777d7d435bb46cb2977d
 
 pkgname = icalingua++
diff --git a/PKGBUILD b/PKGBUILD
index 23e0a4ee7047..694cf8c35bf5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,24 +1,26 @@
 pkgname=icalingua++
 _pkgname=icalingua
-pkgver=2.8.2
+pkgver=2.8.3
 pkgrel=1
-pkgdesc='A branch of deleted Icalingua,with limited support'
+pkgdesc='A branch of deleted Icalingua, with limited support'
 license=('AGPL3')
 depends=('ffmpeg' 'electron' 'libappindicator-gtk3')
 optdepends=('mongodb-bin: Provides storage'
             'redis: Provides storage')
+makedepends=('asar')
 arch=('aarch64' 'x86_64')
 url="https://github.com/Icalingua-plus-plus/Icalingua-plus-plus"
 provides=('electron-qq' 'icalingua')
 conflicts=('electron-qq')
 replaces=('electron-qq' "icalingua-plus-plus")
-source=("512x512.png::https://github.com/Icalingua-plus-plus/Icalingua-plus-plus/raw/v${pkgver}/pkgres/512x512.png"
-        ${_pkgname}.desktop
+source=(${_pkgname}.desktop
         ${_pkgname})
-source_x86_64=("app-x86_64-${pkgver}.asar::https://github.com/Icalingua-plus-plus/Icalingua-plus-plus/releases/download/v${pkgver//_/-}/app-x86_64.asar")
-source_aarch64=("app-aarch64-${pkgver}.asar::https://github.com/Icalingua-plus-plus/Icalingua-plus-plus/releases/download/v${pkgver//_/-}/app-arm64.asar")
-source_i686=("app-i686-${pkgver}.asar::https://github.com/Icalingua-plus-plus/Icalingua-plus-plus/releases/download/v${pkgver//_/-}/app-ia32.asar")
-
+source_x86_64=("app-x86_64-${pkgver}.asar::${url}/releases/download/v${pkgver//_/-}/app-x86_64.asar")
+source_aarch64=("app-aarch64-${pkgver}.asar::${url}/releases/download/v${pkgver//_/-}/app-arm64.asar")
+prepare(){
+    cd ${srcdir}
+    asar ef app-${CARCH}-${pkgver}.asar dist/electron/static/icons/512x512.png
+}
 package() {
     install -Dm644 -t "${pkgdir}/usr/share/applications" "${_pkgname}.desktop"
     install -Dm644 "512x512.png" "$pkgdir/usr/share/icons/hicolor/512x512/apps/$_pkgname.png"
@@ -26,8 +28,7 @@ package() {
     install -Dm755 "${_pkgname}" "${pkgdir}/usr/bin/${_pkgname}"
     ln -s "/usr/bin/${_pkgname}" "${pkgdir}/usr/bin/electron-qq"
 }
-sha256sums=('5743ef3d19be5e41e83c3a1171a807cd0505d7f5d5f9c5abdff8926dccadc6de'
-            '43da1c99b7a6aee974c20da3bcf925b660dff4ba44a447c86066c84c8bc95fbd'
+sha256sums=('43da1c99b7a6aee974c20da3bcf925b660dff4ba44a447c86066c84c8bc95fbd'
             '33a02b61af9cd48abd332b6a13964c939649c7ec089bc1a1aca4014bbb8785d2')
-sha256sums_aarch64=('a076352400363d78286e1e83352dfe374a47d79041a1dc1427a4def8aaba372a')
-sha256sums_x86_64=('1a4e1197a7f963b23f5c078e58c51fabc7da8af67c6631797af5c0e7f898c0a5')
+sha256sums_aarch64=('1be27a79c3a71620192fb91ca5bacd1d51db5bdb197b24a85d19d49d23751c03')
+sha256sums_x86_64=('0a358d64ec1b9f2aa43998523d2d0c372f2121b1f53a777d7d435bb46cb2977d')