From 91e2efcc1b8932518deadf7471a94eee0f4ab2cd Mon Sep 17 00:00:00 2001 From: Yidaozhan Ya Date: Fri, 30 Dec 2022 10:59:15 +0800 Subject: [PATCH] =?UTF-8?q?[upd]=20=E6=9B=B4=E6=8D=A2=E5=AE=98=E7=BD=91?= =?UTF-8?q?=E6=96=B0=E5=BA=95=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .SRCINFO | 17 +++++++---------- PKGBUILD | 38 +++++++++++++++++--------------------- 2 files changed, 24 insertions(+), 31 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 8238b18bd4eb..6a87fe849b32 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,8 +1,8 @@ pkgbase = linuxqq-nt-bwrap pkgdesc = Tencent QQ NT for Linux with bubblewrap wrapper pkgver = 3.0.0_565 - pkgrel = 5 - url = https://im.qq.com + pkgrel = 6 + url = https://im.qq.com/linuxqq/index.shtml install = linuxqq.install arch = x86_64 arch = aarch64 @@ -23,6 +23,7 @@ pkgbase = linuxqq-nt-bwrap provides = qq-nt provides = linuxqq-nt conflicts = linuxqq-new + conflicts = linuxqq options = !strip options = !emptydirs source = start.sh @@ -33,13 +34,9 @@ pkgbase = linuxqq-nt-bwrap sha256sums = 68069b9360c09a5e64c370dbcba54089ac4b1f8b30fc3d6d1c9b8b316a8f92c6 sha256sums = e9b4af9b4119876572f6fe7f48563e6b0830493a8d76e8415e15d89afe6453df sha256sums = 63844046a2453e5320710831156805d4e2d2920a6bea774f3df9aa76e69ea179 - source_x86_64 = https://dldir1.qq.com/qqfile/qq/QQNT/50eed662/QQ-v2.0.3-543_x64.deb - source_x86_64 = https://qqpatch.gtimg.cn/hotUpdate_new/release/linux-x64/3.0.0-565/3.0.0-565.zip.zip - sha256sums_x86_64 = 3bccda547b7fa17b1eacf5477bfafaa4016958578b0d5b2269ace0697ee4c6ef - sha256sums_x86_64 = 814ddc3eea99bf2e291e2eeff0c3805928e3059e23b12d41cc8bf75bb8cd5fd3 - source_aarch64 = https://dldir1.qq.com/qqfile/qq/QQNT/50eed662/QQ-v2.0.3-543_arm64.deb - source_aarch64 = https://qqpatch.gtimg.cn/hotUpdate_new/release/linux-arm64/3.0.0-565/3.0.0-565.zip.zip - sha256sums_aarch64 = d356697284837396f430228032ad7a378717cdba2e1cd724386b2ff99e1eb7bc - sha256sums_aarch64 = f2f61581a5c09e4a7bfb23922a667e8df327d58fed9601034c4b60a08ad29049 + source_x86_64 = https://dldir1.qq.com/qqfile/qq/QQNT/64bd2578/linuxqq_3.0.0-565_amd64.deb + sha256sums_x86_64 = 21f05b85e5708386f93ee2d7f5bcea4ae4dc125c4d695ded99b19ddeffcd9026 + source_aarch64 = https://dldir1.qq.com/qqfile/qq/QQNT/64bd2578/linuxqq_3.0.0-565_amd64.deb + sha256sums_aarch64 = e8894025d3e49da433384e3cb1dc5be506c1f99175c4ab2d177011187337d066 pkgname = linuxqq-nt-bwrap diff --git a/PKGBUILD b/PKGBUILD index 7b9702f1371f..9ea27fce925c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,27 +2,27 @@ _pkgname=linuxqq pkgname=linuxqq-nt-bwrap pkgver=3.0.0_565 -pkgrel=5 +pkgrel=6 pkgdesc="Tencent QQ NT for Linux with bubblewrap wrapper" arch=('x86_64' 'aarch64') -url='https://im.qq.com' +url='https://im.qq.com/linuxqq/index.shtml' license=('custom') depends=('at-spi2-core' 'alsa-lib' 'desktop-file-utils' 'gjs' 'gtk3' 'libnotify' 'nss' 'bubblewrap' 'xdg-utils' 'xdg-user-dirs' 'snapd-xdg-open') makedepends=('p7zip') optdepends=('libappindicator-gtk3: 以最小化到托盘') provides=('qq-nt' 'linuxqq-nt') -conflicts=('linuxqq-new') +conflicts=('linuxqq-new' 'linuxqq') options=('!strip' '!emptydirs') install=${_pkgname}.install -source_x86_64=("https://dldir1.qq.com/qqfile/qq/QQNT/50eed662/QQ-v2.0.3-543_x64.deb" # 本体 - "https://qqpatch.gtimg.cn/hotUpdate_new/release/linux-x64/${pkgver//_/-}/${pkgver//_/-}.zip.zip") # 热更新补丁 -source_aarch64=("https://dldir1.qq.com/qqfile/qq/QQNT/50eed662/QQ-v2.0.3-543_arm64.deb" # 本体 - "https://qqpatch.gtimg.cn/hotUpdate_new/release/linux-arm64/${pkgver//_/-}/${pkgver//_/-}.zip.zip" ) # 热更新补丁 +source_x86_64=("https://dldir1.qq.com/qqfile/qq/QQNT/64bd2578/linuxqq_3.0.0-565_amd64.deb") # 底包 + # "https://qqpatch.gtimg.cn/hotUpdate_new/release/linux-x64/${pkgver//_/-}/${pkgver//_/-}.zip.zip") # 热更新补丁 +source_aarch64=("https://dldir1.qq.com/qqfile/qq/QQNT/64bd2578/linuxqq_3.0.0-565_amd64.deb") # 底包 + # "https://qqpatch.gtimg.cn/hotUpdate_new/release/linux-arm64/${pkgver//_/-}/${pkgver//_/-}.zip.zip" ) # 热更新补丁 source=('start.sh' 'config.json' 'qq_channel_jsbridge_handler.desktop' 'xdg-open.sh') -sha256sums_x86_64=('3bccda547b7fa17b1eacf5477bfafaa4016958578b0d5b2269ace0697ee4c6ef' # 本体 - '814ddc3eea99bf2e291e2eeff0c3805928e3059e23b12d41cc8bf75bb8cd5fd3') # 热更新补丁 -sha256sums_aarch64=('d356697284837396f430228032ad7a378717cdba2e1cd724386b2ff99e1eb7bc' # 本体 - 'f2f61581a5c09e4a7bfb23922a667e8df327d58fed9601034c4b60a08ad29049') # 热更新补丁 +sha256sums_x86_64=('21f05b85e5708386f93ee2d7f5bcea4ae4dc125c4d695ded99b19ddeffcd9026') # 底包 + # '814ddc3eea99bf2e291e2eeff0c3805928e3059e23b12d41cc8bf75bb8cd5fd3') # 热更新补丁 +sha256sums_aarch64=('e8894025d3e49da433384e3cb1dc5be506c1f99175c4ab2d177011187337d066') # 底包 + # 'f2f61581a5c09e4a7bfb23922a667e8df327d58fed9601034c4b60a08ad29049') # 热更新补丁 sha256sums=('81dce28be38ea8a21fad83a276f8d7522b4fa736bde717260d87ba4b3508587a' # start.sh '68069b9360c09a5e64c370dbcba54089ac4b1f8b30fc3d6d1c9b8b316a8f92c6' # config.json 'e9b4af9b4119876572f6fe7f48563e6b0830493a8d76e8415e15d89afe6453df' # qq_channel_jsbridge_handler.desktop @@ -31,9 +31,9 @@ sha256sums=('81dce28be38ea8a21fad83a276f8d7522b4fa736bde717260d87ba4b3508587a' 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" - chmod 755 "${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" # 打包相关处理 mkdir -p "${pkgdir}/opt/QQ/workarounds" @@ -41,9 +41,7 @@ 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/0x0" "${pkgdir}/usr/share/icons/hicolor/512x512" + mv "${pkgdir}/usr/share/icons/hicolor/2x2" "${pkgdir}/usr/share/icons/hicolor/32x32" # 将 LICENSE 移动到正确位置 mkdir -p "${pkgdir}/usr/share/licenses/${_pkgname}" @@ -52,11 +50,9 @@ package() { # 对 desktop 文件做处理，使其使用正确的图标，启动 start.sh cp "${srcdir}/start.sh" "${pkgdir}/opt/QQ/start.sh" - mv "${pkgdir}/usr/share/applications/qq.desktop" "${pkgdir}/usr/share/applications/qq-nt.desktop" - sed -i "s|Icon=/opt/QQ/resources/app/512x512.png|Icon=qq-nt|" "${pkgdir}/usr/share/applications/qq-nt.desktop" - sed -i "s|/opt/QQ/qq|/opt/QQ/start.sh|" "${pkgdir}/usr/share/applications/qq-nt.desktop" + sed -i "s|/opt/QQ/qq|/opt/QQ/start.sh|" "${pkgdir}/usr/share/applications/qq.desktop" # 这样就可以直接输入 qq-nt 命令启动了 mkdir -p "${pkgdir}/usr/bin" - ln -s "/opt/QQ/start.sh" "${pkgdir}/usr/bin/qq-nt" + ln -s "/opt/QQ/start.sh" "${pkgdir}/usr/bin/qq" }