diff options
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | PKGBUILD | 37 | ||||
| -rw-r--r-- | config.json | 10 | ||||
| -rwxr-xr-x | start.sh | 23 |
4 files changed, 49 insertions, 31 deletions
@@ -1,6 +1,6 @@ pkgbase = linuxqq-nt-bwrap pkgdesc = New Linux QQ based on Electron, with bubblewrap sandbox and some tweaks - pkgver = 3.1.1_11223 + pkgver = 3.1.2_12912 pkgrel = 1 url = https://im.qq.com/linuxqq/index.shtml install = linuxqq-nt-bwrap.install @@ -33,12 +33,16 @@ pkgbase = linuxqq-nt-bwrap source = start.sh source = config.json source = xdg-open.sh - sha256sums = d3decdf850a9d9f49fc2114b5cf027eb023eb23079ac0b6f919781f79dbfe824 - sha256sums = bf180fbc93d95cb08608f97896cd5fe99323b7f5e4666844343f6065cf5f8528 + sha256sums = 0fed32df5f53574d8c602a56ae126459dc0ece444434eb3e94d09eea0595df5f + sha256sums = 72c4a432acc4c06490e9a9a5fe8b6e3f4e3f62edc94878161aebe84fa81655cd sha256sums = 78a573867355fb4c3e728d0c8ac0746d47fa7d64f90ee2b62ee9f0ccae095edb source_x86_64 = https://dldir1.qq.com/qqfile/qq/QQNT/2355235c/linuxqq_3.1.1-11223_amd64.deb + source_x86_64 = https://qqpatch.gtimg.cn/hotUpdate_new/release/linux-x64/3.1.2-12912/5f0d6d75/3.1.2-12912.zip.zip sha256sums_x86_64 = 4c1810ef357e8ee077292808217bafc67626be79ccff5ff05341248a8a48aaf6 + sha256sums_x86_64 = 0449dd2c169f401b6a4489bafde51e9206388e690b34dd6c15273e232b61f67f source_aarch64 = https://dldir1.qq.com/qqfile/qq/QQNT/2355235c/linuxqq_3.1.1-11223_arm64.deb + source_aarch64 = https://qqpatch.gtimg.cn/hotUpdate_new/release/linux-arm64/3.1.2-12912/5f0d6d75/3.1.2-12912.zip.zip sha256sums_aarch64 = d5b6bf200ffe5ffb3b8d4b48861dceb011d4ecc3e0806ac04ac04fc7c7ae041b + sha256sums_aarch64 = 78a78fb466c0f0a63068f6de233b994ebcfb74d58b3fa793c264af48228754e3 pkgname = linuxqq-nt-bwrap @@ -1,11 +1,16 @@ # Maintainer: Yidaozhan Ya <yidaozhan_ya@outlook.com> + _pkgname=linuxqq +_base_pkgver=3.1.1_11223 +_update_pkgver=3.1.2_12912 +_base_pkgver_hash=2355235c +_update_pkgver_hash=5f0d6d75 + pkgname=linuxqq-nt-bwrap -pkgver=3.1.1_11223 -_pkgver_hash=2355235c +pkgver="${_update_pkgver}" pkgrel=1 pkgdesc="New Linux QQ based on Electron, with bubblewrap sandbox and some tweaks" -arch=('x86_64' 'aarch64') +arch=('x86_64' 'aarch64') # 龙架构版本停留在 3.1.0 未更新，故不纳入此包中 url='https://im.qq.com/linuxqq/index.shtml' license=('custom') depends=('at-spi2-core' 'alsa-lib' 'desktop-file-utils' 'gtk3' 'gtk-update-icon-cache' 'libnotify' 'nss' 'gnutls' 'bubblewrap' 'xdg-user-dirs' 'flatpak-xdg-utils' 'snapd-xdg-open-git' 'libvips' 'openslide' 'autoconf') @@ -16,25 +21,25 @@ provides=('qq' 'linuxqq') conflicts=('linuxqq') options=('!strip' '!emptydirs') install="${pkgname}.install" -source_x86_64=("https://dldir1.qq.com/qqfile/qq/QQNT/${_pkgver_hash}/linuxqq_${pkgver//_/-}_amd64.deb" ) # 底包 - # "https://qqpatch.gtimg.cn/hotUpdate_new/release/linux-x64/${pkgver//_/-}/${pkgver//_/-}.zip.zip" ) # 热更新补丁 -source_aarch64=("https://dldir1.qq.com/qqfile/qq/QQNT/${_pkgver_hash}/linuxqq_${pkgver//_/-}_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/${_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_x86_64=('4c1810ef357e8ee077292808217bafc67626be79ccff5ff05341248a8a48aaf6' ) # 底包 - # 'e9d7d27c6df425dfface9398be2b14c24f32ae9d880e344ce599593f2919f6dd') # 热更新补丁 -sha256sums_aarch64=('d5b6bf200ffe5ffb3b8d4b48861dceb011d4ecc3e0806ac04ac04fc7c7ae041b' ) # 底包 - # 'f17bbff10be65135130c7a4cd05ac5f6e324e560a5dafe27113f05a9e7bbc3d5') # 热更新补丁 -sha256sums=('d3decdf850a9d9f49fc2114b5cf027eb023eb23079ac0b6f919781f79dbfe824' # start.sh - 'bf180fbc93d95cb08608f97896cd5fe99323b7f5e4666844343f6065cf5f8528' # config.json +sha256sums_x86_64=('4c1810ef357e8ee077292808217bafc67626be79ccff5ff05341248a8a48aaf6' # 底包 + '0449dd2c169f401b6a4489bafde51e9206388e690b34dd6c15273e232b61f67f') # 热更新补丁 +sha256sums_aarch64=('d5b6bf200ffe5ffb3b8d4b48861dceb011d4ecc3e0806ac04ac04fc7c7ae041b' # 底包 + '78a78fb466c0f0a63068f6de233b994ebcfb74d58b3fa793c264af48228754e3') # 热更新补丁 +sha256sums=('0fed32df5f53574d8c602a56ae126459dc0ece444434eb3e94d09eea0595df5f' # start.sh + '72c4a432acc4c06490e9a9a5fe8b6e3f4e3f62edc94878161aebe84fa81655cd' # config.json '78a573867355fb4c3e728d0c8ac0746d47fa7d64f90ee2b62ee9f0ccae095edb') # xdg-open.sh 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" mv "${pkgdir}/opt/QQ/qq" "${pkgdir}/opt/QQ/electron" diff --git a/config.json b/config.json index 6c156a413eb6..07434da0b875 100644 --- a/config.json +++ b/config.json @@ -1,9 +1,9 @@ { - "baseVersion": "3.1.1-11223", - "currentVersion": "3.1.1-11223", - "buildVersion": "11223", - "skippedVersions": [ - ], + "baseVersion": "3.1.2-12912", + "currentVersion": "3.1.2-12912", + "previousVersion": "", + "buildVersion": "12912", + "skippedVersions": [], "inUsePkg": "", "hasRan": false } @@ -11,10 +11,11 @@ if [ -z "${QQ_DOWNLOAD_DIR}" ]; then fi QQ_DOWNLOAD_DIR="${XDG_DOWNLOAD_DIR:-$HOME/Downloads}" fi -set -euo pipefail -flags_file="${XDG_CONFIG_HOME}/qq-electron-flags.conf" +# 从 flags 文件中加载参数 +set -euo pipefail +flags_file="${XDG_CONFIG_HOME}/qq-electron-flags.conf" declare -a flags if [[ -f "${flags_file}" ]]; then @@ -28,18 +29,26 @@ for line in "${MAPFILE[@]}"; do done QQ_HOTUPDATE_DIR="${QQ_APP_DIR}/versions" -QQ_HOTUPDATE_VERSION="3.1.1-11223" -QQ_PREVIOUS_VERSIONS=("2.0.1-429" "2.0.1-453" "2.0.2-510" "2.0.3-543" "3.0.0-565" "3.0.0-571" "3.1.0-9332" "3.1.0-9572") +QQ_HOTUPDATE_VERSION="3.1.2-12912" +QQ_PREVIOUS_VERSIONS=("2.0.1-429" "2.0.1-453" "2.0.2-510" "2.0.3-543" "3.0.0-565" "3.0.0-571" "3.1.0-9332" "3.1.0-9572" "3.1.1-11223") if [ "${QQ_DOWNLOAD_DIR%*/}" == "${HOME}" ]; then QQ_DOWNLOAD_DIR="${HOME}/Downloads" - if [ ! -d "${QQ_DOWNLOAD_DIR}" ]; then mkdir -p "${QQ_DOWNLOAD_DIR}"; fi + # if [ ! -d "${QQ_DOWNLOAD_DIR}" ]; then mkdir -p "${QQ_DOWNLOAD_DIR}"; fi + # 还是不自动建立为好 fi if [ ! -d "${QQ_APP_DIR}" ]; then mkdir -p "${QQ_APP_DIR}"; fi -if [ ! -d "${QQ_APP_DIR}/versions" ]; then mkdir -p "${QQ_APP_DIR}/versions"; fi -if [ ! -d "${QQ_HOTUPDATE_DIR}/${QQ_HOTUPDATE_VERSION}" ]; then ln -sfd "/opt/QQ/resources/app" "${QQ_HOTUPDATE_DIR}/${QQ_HOTUPDATE_VERSION}"; fi +if [ ! -d "${QQ_HOTUPDATE_DIR}" ]; then mkdir -p "${QQ_HOTUPDATE_DIR}"; fi +if [ ! -L "${QQ_HOTUPDATE_DIR}/${QQ_HOTUPDATE_VERSION}" ]; then + # 删除 QQ 自动下载的热更新包，因为其中可能包含 libvips 等有问题的库 + rm -rf "${QQ_HOTUPDATE_DIR}/${QQ_HOTUPDATE_VERSION}" +fi +if [ ! -d "${QQ_HOTUPDATE_DIR}/${QQ_HOTUPDATE_VERSION}" ]; then + # 将本包内的 app 链接到热更新文件夹下 + ln -sfd "/opt/QQ/resources/app" "${QQ_HOTUPDATE_DIR}/${QQ_HOTUPDATE_VERSION}" +fi rm -rf "${QQ_HOTUPDATE_DIR}/"**".zip" # 处理 config.json |