summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorzhanghua0002021-11-07 20:27:33 +0800
committerzhanghua0002021-11-07 20:27:33 +0800
commit18224879bd8e7eb8c4d70d1675cc0705f23b7434 (patch)
treed4072a7a0c299f0ac0845f615d54ff5040bf90af
parent508ab69606abcb3e10b5c1f6b932431c1829d3fe (diff)
downloadaur-18224879bd8e7eb8c4d70d1675cc0705f23b7434.tar.gz
Fix issue which results build failure
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD35
2 files changed, 40 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index af8175d2b4a..922805a46d5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = icalingua-git
pkgdesc = A Linux client for QQ and more
- pkgver = 2.3.2_40_g0d621e0
+ pkgver = 2.3.2_66_g390b427
pkgrel = 1
url = https://github.com/Icalingua/Icalingua
arch = aarch64
@@ -23,3 +23,10 @@ pkgbase = icalingua-git
sha256sums = SKIP
pkgname = icalingua-git
+ conflicts = icalingua-electron
+
+pkgname = icalingua-electron-git
+ pkgdesc = A Linux client for QQ and more with system electron
+ provides = icalingua-electron
+ provides = electron-qq
+ conflicts = icalingua
diff --git a/PKGBUILD b/PKGBUILD
index f21ef16d4a3..39a6dcc1d58 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
-pkgname=icalingua-git
-pkgver=2.3.2_40_g0d621e0
+pkgname=("icalingua-git" "icalingua-electron-git")
+pkgver=2.3.2_66_g390b427
pkgrel=1
pkgdesc='A Linux client for QQ and more'
license=('GPL')
@@ -21,13 +21,15 @@ pkgver(){
}
prepare(){
cd "${srcdir}/Icalingua/icalingua"
+ sed -i "919s/temp/Number(temp)/" "src/main/adapters/oicqAdapter.ts"
yarn install
}
build(){
cd "${srcdir}/Icalingua/icalingua"
yarn run build:dir
}
-package(){
+package_icalingua-git(){
+ conflicts=("icalingua-electron")
case ${CARCH} in
"x86_64")
_arch="-";;
@@ -47,3 +49,30 @@ package(){
install -Dm644 icalingua.desktop "${pkgdir}/usr/share/applications/icalingua.desktop"
ln -s "/opt/icalingua/icalingua" "${pkgdir}/usr/bin/icalingua"
}
+package_icalingua-electron-git(){
+ conflicts=("icalingua")
+ provides=("icalingua-electron" "electron-qq")
+ pkgdesc='A Linux client for QQ and more with system electron'
+ case ${CARCH} in
+ "x86_64")
+ _arch="-";;
+ "aarch64")
+ _arch="-arm64-";;
+ "i686")
+ _arch="-ia32-";;
+ "*")
+ _arch="-${CARCH}-";;
+ esac
+ mkdir -p "${pkgdir}/usr/share/icalingua"
+ mkdir -p "${pkgdir}/usr/bin"
+ cd "${srcdir}/Icalingua/icalingua/build/linux${_arch}unpacked"
+ install -Dm644 "resources/app.asar" "${pkgdir}/usr/share/icalingua/app.asar"
+ cat>"${pkgdir}/usr/bin/icalingua"<<EOF
+#!/usr/bin/env bash
+electron /usr/share/icalingua/app.asar $@
+EOF
+ chmod +x "${pkgdir}/usr/bin/icalingua"
+ cd "${srcdir}/Icalingua/pkgres"
+ install -Dm644 512x512.png "${pkgdir}/usr/share/icons/hicolor/512x512/apps/icalingua.png"
+ install -Dm644 icalingua.desktop "${pkgdir}/usr/share/applications/icalingua.desktop"
+}