[upd] 3.2.0-16449

1 files changed, 24 insertions, 23 deletions

diff --git a/PKGBUILD b/PKGBUILD
index c79c39575996..286ed8188ed0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,14 +2,14 @@
 # Maintainer: sukanka
 
 _pkgname=linuxqq
-_base_pkgver=3.1.1_11223
-_update_pkgver=3.1.2_13107
-_base_pkgver_hash=2355235c
-_update_pkgver_hash=c893f6be
-
+_base_pkgver=3.2.0_16449
+# _update_pkgver=3.1.2_13107
+_base_pkgver_hash=464d27bd
+# _update_pkgver_hash=c893f6be
 pkgname=linuxqq-nt-bwrap
-pkgver="${_update_pkgver}"
-pkgrel=6
+pkgver="${_base_pkgver}"
+# pkgver="${_update_pkgver}"
+pkgrel=1
 pkgdesc="New Linux QQ based on Electron, with bubblewrap sandbox and some tweaks"
 arch=('x86_64' 'aarch64')  # 龙架构版本停留在 3.1.0 未更新，故不纳入此包中
 url='https://im.qq.com/linuxqq/index.shtml'
@@ -26,24 +26,27 @@ provides=('qq' 'linuxqq')
 conflicts=('linuxqq')
 options=('!emptydirs')
 install="${pkgname}.install"
-source_x86_64=("https://dldir1.qq.com/qqfile/qq/QQNT/${_base_pkgver_hash}/linuxqq_${_base_pkgver//_/-}_amd64.deb"  # 底包
-               "https://qqpatch.gtimg.cn/hotUpdate_new/release/linux-x64/${pkgver//_/-}/${_update_pkgver_hash}/${pkgver//_/-}.zip.zip" )  # 热更新补丁
-source_aarch64=("https://dldir1.qq.com/qqfile/qq/QQNT/${_base_pkgver_hash}/linuxqq_${_base_pkgver//_/-}_arm64.deb"  # 底包
-                "https://qqpatch.gtimg.cn/hotUpdate_new/release/linux-arm64/${pkgver//_/-}/${_update_pkgver_hash}/${pkgver//_/-}.zip.zip" )  # 热更新补丁
+source_x86_64=("https://dldir1.qq.com/qqfile/qq/QQNT/${_base_pkgver_hash}/linuxqq_${_base_pkgver//_/-}_amd64.deb")  # 底包
+               #  "https://qqpatch.gtimg.cn/hotUpdate_new/release/linux-x64/${pkgver//_/-}/${_update_pkgver_hash}/${pkgver//_/-}.zip.zip" )  # 热更新补丁
+source_aarch64=("https://dldir1.qq.com/qqfile/qq/QQNT/${_base_pkgver_hash}/linuxqq_${_base_pkgver//_/-}_arm64.deb")  # 底包
+                #  "https://qqpatch.gtimg.cn/hotUpdate_new/release/linux-arm64/${pkgver//_/-}/${_update_pkgver_hash}/${pkgver//_/-}.zip.zip" )  # 热更新补丁
 source=('start.sh' 'config.json' 'xdg-open.sh')
-sha256sums=('755895c2d45c8de793bdf4467c7e4dd3fc8f181dfb1eb2ccf9eed841ff8e0184'  # start.sh
-            '182e3cc60e9c7f4643043c398f42b7d021bce4e79490e043de195056aa851481'  # config.json
+sha256sums=('df21209bc369d3fe56066a37c1951699694a2d3933aa0453d791cd7437e0183e'  # start.sh
+            'b75ead198645f2ac9089e637a02a5e2171c6d9c8521b769849340ba100258dfd'  # config.json
             '78a573867355fb4c3e728d0c8ac0746d47fa7d64f90ee2b62ee9f0ccae095edb')  # xdg-open.sh
-sha256sums_x86_64=('4c1810ef357e8ee077292808217bafc67626be79ccff5ff05341248a8a48aaf6'  # 底包
-                   '7a1d235b714864b0b62e39f10adbd4bd3b890017168a39e9c97a346931901b35')  # 热更新补丁
-sha256sums_aarch64=('d5b6bf200ffe5ffb3b8d4b48861dceb011d4ecc3e0806ac04ac04fc7c7ae041b'  # 底包
-                    '49a356b051b1fae89f132475128447f184f2385384773114ae9392f19200d7da')  # 热更新补丁
+sha256sums_x86_64=('a83ac7458f18b76c105ed764b7cd8750117ce5ae347d3e27df153fda118a5aa9')  # 底包
+                   #  '7a1d235b714864b0b62e39f10adbd4bd3b890017168a39e9c97a346931901b35')  # 热更新补丁
+sha256sums_aarch64=('2846d76549fcc361d46b591c4875f1b91216c798d526b8db63ff841a5cc455fc')  # 底包
+                    #  '49a356b051b1fae89f132475128447f184f2385384773114ae9392f19200d7da')  # 热更新补丁
 
 package() {
 	# 解压程序包
 	tar -xJ -f "data.tar.xz" -C "${pkgdir}"
-	rm -rf "${pkgdir}/opt/QQ/resources/app"
-	7z x "${pkgver//_/-}.zip" -aoa -o"${pkgdir}/opt/QQ/resources/app"
+
+	# 应用热更新
+	# rm -rf "${pkgdir}/opt/QQ/resources/app"
+	# 7z x "${pkgver//_/-}.zip" -aoa -o"${pkgdir}/opt/QQ/resources/app"
+
 	chmod 755 "${pkgdir}/opt/QQ/resources/app"
 
 	mv "${pkgdir}/opt/QQ/qq" "${pkgdir}/opt/QQ/electron"
@@ -53,14 +56,12 @@ package() {
 	install -Dm755 "xdg-open.sh" "${pkgdir}/opt/QQ/workarounds/xdg-open.sh"
 	cp "${srcdir}/config.json" "${pkgdir}/opt/QQ/workarounds/config.json"
 
-	#mv "${pkgdir}/usr/share/icons/hicolor/2x2" "${pkgdir}/usr/share/icons/hicolor/32x32"
-
 	# 将 LICENSE 移动到正确位置
 	mkdir -p "${pkgdir}/usr/share/licenses/${_pkgname}"
 	ln -s "/opt/QQ/LICENSE.electron.txt" "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
 	ln -s "/opt/QQ/LICENSES.chromium.html" "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSES.chromium.html"
 
-	# 临时解决方案: 删除 linuxqq 自带的 libvips 以解决浏览图片崩溃问题
+	# 删除原生库
 	rm -f "${pkgdir}"/opt/QQ/resources/app/{libssh2.so.1,libunwind*,sharp-lib/libvips-cpp.so.42}
 
 	# 对 desktop 文件做处理，使其使用正确的图标，启动 start.sh
@@ -68,7 +69,7 @@ package() {
 	sed -i "s|/opt/QQ/qq|/opt/QQ/start.sh|" "${pkgdir}/usr/share/applications/qq.desktop"
 	sed -i "s|Icon=/usr/share/icons/hicolor/512x512/apps/qq.png|Icon=qq|" "${pkgdir}/usr/share/applications/qq.desktop"
 
-	# 这样就可以直接输入 qq-nt 命令启动了
+	# 这样就可以直接输入 qq 命令启动了
 	mkdir -p "${pkgdir}/usr/bin"
 	ln -s "/opt/QQ/start.sh" "${pkgdir}/usr/bin/qq"
 }