From f8f7b09cff9ec5ea24d18dab0bbe397567f861a7 Mon Sep 17 00:00:00 2001 From: Yidaozhan Ya Date: Wed, 28 Dec 2022 21:54:22 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E6=9B=B4=E6=8D=A2=E6=96=B0=E5=BA=95?= =?UTF-8?q?=E5=8C=85;=20[fix]=20=E6=8C=82=E8=BD=BD=E6=95=B4=E4=B8=AA=20/op?= =?UTF-8?q?t=20=E4=BF=AE=E5=A4=8D=20Chrome?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .SRCINFO | 16 ++++++---------- PKGBUILD | 26 +++++++++++++------------- start.sh | 2 +- 3 files changed, 20 insertions(+), 24 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index c314142dd09e..4d3c66f01df6 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = linuxqq-nt-bwrap pkgdesc = Tencent QQ NT for Linux with bubblewrap wrapper pkgver = 2.0.3_543 - pkgrel = 1 + pkgrel = 2 url = https://im.qq.com install = linuxqq.install arch = x86_64 @@ -28,16 +28,12 @@ pkgbase = linuxqq-nt-bwrap source = start.sh source = config.json source = qq_channel_jsbridge_handler.desktop - sha256sums = dac7d36c01c987ebca98fa4f58c61336820913baeaa6d39ace86ada8da02cacc + sha256sums = e3bfd028d97a2ea7d70d7dd047038f1147e6e1ec35142113d6a91f2fe6dcb583 sha256sums = bce0e99fd8f7d22742c7fce83b00a230f2408f8d4caa45efd91b35ef0819f64d sha256sums = e9b4af9b4119876572f6fe7f48563e6b0830493a8d76e8415e15d89afe6453df - source_x86_64 = https://dldir1.qq.com/qqfile/qq/QQNT/4691a571/QQ-v2.0.1-429_x64.deb - source_x86_64 = https://qqpatch.gtimg.cn/hotUpdate_new/release/linux-x64/2.0.3-543/2.0.3-543.zip.zip - sha256sums_x86_64 = e3aa15ff6ae089b655df3913c6020ca56726bd676995aaf29b313fbd0643ea42 - sha256sums_x86_64 = 2e89bc65faa26ddeed9883b5b7e414dea100ad45b5d569365431e761f00dea84 - source_aarch64 = https://dldir1.qq.com/qqfile/qq/QQNT/0186a650/QQ-v2.0.1-453_arm64.deb - source_aarch64 = https://qqpatch.gtimg.cn/hotUpdate_new/release/linux-arm64/2.0.3-543/2.0.3-543.zip.zip - sha256sums_aarch64 = 70c286006dae10da06c191b5f0718d17d686a8ef792f6f72215734773f01498b - sha256sums_aarch64 = 0267df2233bd03a1bd95e9571956a878c141068b2d4165d318481a3d425c0acd + source_x86_64 = https://dldir1.qq.com/qqfile/qq/QQNT/50eed662/QQ-v2.0.3-543_x64.deb + sha256sums_x86_64 = 3bccda547b7fa17b1eacf5477bfafaa4016958578b0d5b2269ace0697ee4c6ef + source_aarch64 = https://dldir1.qq.com/qqfile/qq/QQNT/50eed662/QQ-v2.0.3-543_arm64.deb + sha256sums_aarch64 = d356697284837396f430228032ad7a378717cdba2e1cd724386b2ff99e1eb7bc pkgname = linuxqq-nt-bwrap diff --git a/PKGBUILD b/PKGBUILD index 854232c87901..03449febb444 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ _pkgname=linuxqq pkgname=linuxqq-nt-bwrap pkgver=2.0.3_543 -pkgrel=1 +pkgrel=2 pkgdesc="Tencent QQ NT for Linux with bubblewrap wrapper" arch=('x86_64' 'aarch64') url='https://im.qq.com' @@ -14,25 +14,25 @@ provides=('qq-nt' 'linuxqq-nt') conflicts=('linuxqq-new') options=('!strip' '!emptydirs') install=${_pkgname}.install -source_x86_64=("https://dldir1.qq.com/qqfile/qq/QQNT/4691a571/QQ-v2.0.1-429_x64.deb" # 本体 - "https://qqpatch.gtimg.cn/hotUpdate_new/release/linux-x64/${pkgver//_/-}/${pkgver//_/-}.zip.zip") # 热更新补丁 -source_aarch64=("https://dldir1.qq.com/qqfile/qq/QQNT/0186a650/QQ-v2.0.1-453_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/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=('start.sh' 'config.json' 'qq_channel_jsbridge_handler.desktop') -sha256sums_x86_64=('e3aa15ff6ae089b655df3913c6020ca56726bd676995aaf29b313fbd0643ea42' # 本体 - '2e89bc65faa26ddeed9883b5b7e414dea100ad45b5d569365431e761f00dea84') # 热更新补丁 -sha256sums_aarch64=('70c286006dae10da06c191b5f0718d17d686a8ef792f6f72215734773f01498b' # 本体 - '0267df2233bd03a1bd95e9571956a878c141068b2d4165d318481a3d425c0acd') # 热更新补丁 -sha256sums=('dac7d36c01c987ebca98fa4f58c61336820913baeaa6d39ace86ada8da02cacc' # start.sh +sha256sums_x86_64=('3bccda547b7fa17b1eacf5477bfafaa4016958578b0d5b2269ace0697ee4c6ef') # 本体 + # '2e89bc65faa26ddeed9883b5b7e414dea100ad45b5d569365431e761f00dea84') # 热更新补丁 +sha256sums_aarch64=('d356697284837396f430228032ad7a378717cdba2e1cd724386b2ff99e1eb7bc') # 本体 + # '0267df2233bd03a1bd95e9571956a878c141068b2d4165d318481a3d425c0acd') # 热更新补丁 +sha256sums=('e3bfd028d97a2ea7d70d7dd047038f1147e6e1ec35142113d6a91f2fe6dcb583' # start.sh 'bce0e99fd8f7d22742c7fce83b00a230f2408f8d4caa45efd91b35ef0819f64d' # config.json 'e9b4af9b4119876572f6fe7f48563e6b0830493a8d76e8415e15d89afe6453df') # qq_channel_jsbridge_handler.desktop 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" # 打包相关处理 install -Dm644 "qq_channel_jsbridge_handler.desktop" "${pkgdir}/usr/share/applications/qq_channel_jsbridge_handler.desktop" diff --git a/start.sh b/start.sh index 68bc39a143a7..fdf13189a6b0 100755 --- a/start.sh +++ b/start.sh @@ -38,7 +38,7 @@ bwrap --new-session --die-with-parent --cap-drop ALL --unshare-user-try --unshar --symlink usr/lib64 /lib64 \ --symlink usr/bin /bin \ --ro-bind /usr /usr \ - --ro-bind /opt/QQ /opt/QQ \ + --ro-bind /opt /opt \ --dev-bind /dev /dev \ --ro-bind /sys /sys \ --ro-bind /etc/passwd /etc/passwd \