[opt] 更换链接打开方式为 snapd-xdg-open 以兼容更多浏览器

4 files changed, 15 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a19301b89b24..a47d8f5fa050 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = linuxqq-nt-bwrap
 	pkgdesc = New Linux QQ based on Electron, with bubblewrap sandbox and some tweaks
 	pkgver = 3.0.0_571
-	pkgrel = 4
+	pkgrel = 5
 	url = https://im.qq.com/linuxqq/index.shtml
 	install = linuxqq.install
 	arch = x86_64
@@ -19,6 +19,7 @@ pkgbase = linuxqq-nt-bwrap
 	depends = bubblewrap
 	depends = xdg-user-dirs
 	depends = flatpak-xdg-utils
+	depends = snapd-xdg-open-git
 	optdepends = libappindicator-gtk3: 以显示托盘图标
 	optdepends = gjs: 提供 GNOME Wayland 下的截图支持
 	provides = qq
@@ -29,9 +30,9 @@ pkgbase = linuxqq-nt-bwrap
 	source = start.sh
 	source = config.json
 	source = xdg-open.sh
-	sha256sums = 215ae97927dcb25e95ed65a108b07eb889dcb974d4ebd8ed333a75a9ea58bee3
+	sha256sums = ee4e8dac9c6208acefbcb773e838b88d1f313bc346bda2725545677ae0418f3a
 	sha256sums = 82182e49c883e16c7ff38e4722c3950e2758b4342c51521147423026965196a9
-	sha256sums = a57a3c34943168d4fdb7d8ddec0c09097b997405b9cd88af205a80fa7cfd899a
+	sha256sums = 78a573867355fb4c3e728d0c8ac0746d47fa7d64f90ee2b62ee9f0ccae095edb
 	source_x86_64 = https://dldir1.qq.com/qqfile/qq/QQNT/c005c911/linuxqq_3.0.0-571_amd64.deb
 	sha256sums_x86_64 = f0a714859c20785cc6cab4084d69c953310f1993828f42c81cb991b8aaa48264
 	source_aarch64 = https://dldir1.qq.com/qqfile/qq/QQNT/c005c911/linuxqq_3.0.0-571_arm64.deb
diff --git a/PKGBUILD b/PKGBUILD
index 4774450e463f..1513ca64a354 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,12 +2,12 @@
 _pkgname=linuxqq
 pkgname=linuxqq-nt-bwrap
 pkgver=3.0.0_571
-pkgrel=4
+pkgrel=5
 pkgdesc="New Linux QQ based on Electron, with bubblewrap sandbox and some tweaks"
 arch=('x86_64' 'aarch64')
 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')
+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')
 makedepends=('p7zip')
 optdepends=('libappindicator-gtk3: 以显示托盘图标' 'gjs: 提供 GNOME Wayland 下的截图支持')
 provides=('qq' 'linuxqq')
@@ -23,9 +23,9 @@ sha256sums_x86_64=('f0a714859c20785cc6cab4084d69c953310f1993828f42c81cb991b8aaa4
                    # '814ddc3eea99bf2e291e2eeff0c3805928e3059e23b12d41cc8bf75bb8cd5fd3')  # 热更新补丁
 sha256sums_aarch64=('2ef13e3ebcaae0a2eef8115856b1a24f005d80eac182e3c741def730c1657e26')  # 底包
                     # 'f2f61581a5c09e4a7bfb23922a667e8df327d58fed9601034c4b60a08ad29049')  # 热更新补丁
-sha256sums=('215ae97927dcb25e95ed65a108b07eb889dcb974d4ebd8ed333a75a9ea58bee3'  # start.sh
+sha256sums=('ee4e8dac9c6208acefbcb773e838b88d1f313bc346bda2725545677ae0418f3a'  # start.sh
             '82182e49c883e16c7ff38e4722c3950e2758b4342c51521147423026965196a9'  # config.json
-            'a57a3c34943168d4fdb7d8ddec0c09097b997405b9cd88af205a80fa7cfd899a')  # xdg-open.sh
+            '78a573867355fb4c3e728d0c8ac0746d47fa7d64f90ee2b62ee9f0ccae095edb')  # xdg-open.sh
 
 package() {
 	# 解压程序包
diff --git a/start.sh b/start.sh
index d5b8896b5f7b..dfb34c1ed8f3 100755
--- a/start.sh
+++ b/start.sh
@@ -41,7 +41,8 @@ bwrap --new-session --cap-drop ALL --unshare-user-try --unshare-pid --unshare-cg
     --ro-bind /usr /usr \
     --ro-bind /opt /opt \
     --ro-bind /opt/QQ/workarounds/xdg-open.sh /usr/bin/xdg-open \
-    --ro-bind /usr/lib/flatpak-xdg-utils/xdg-open /real-xdg-open \
+    --ro-bind /usr/lib/snapd-xdg-open/xdg-open /snapd-xdg-open \
+    --ro-bind /usr/lib/flatpak-xdg-utils/xdg-open /flatpak-xdg-open \
     --dev-bind /dev /dev \
     --ro-bind /sys /sys \
     --ro-bind /etc/passwd /etc/passwd \
diff --git a/xdg-open.sh b/xdg-open.sh
index e9a9a6231fe0..d6c6d882ba08 100755
--- a/xdg-open.sh
+++ b/xdg-open.sh
@@ -2,5 +2,9 @@
 URI_TO_OPEN="$1"
 
 if ! [ "${URI_TO_OPEN:0:8}" == "jsbridge" ]; then
-    /real-xdg-open "$URI_TO_OPEN"
+    if [ "${URI_TO_OPEN:0:4}" == "http" ]; then
+        /snapd-xdg-open "$URI_TO_OPEN"
+    else
+        /flatpak-xdg-open "$URI_TO_OPEN"
+    fi
 fi