summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorsukanka2022-12-03 10:29:40 +0800
committersukanka2022-12-03 10:29:40 +0800
commitabe1f9bad8032ca2da92b5266ddc679b2b45184f (patch)
tree45c9b8396bbd806c968db0873701caf2e1fdc01d
parent752b6e6aab4ce2b518a9b40f99610687b6711e23 (diff)
downloadaur-abe1f9bad8032ca2da92b5266ddc679b2b45184f.tar.gz
try new wrapper, @AvianaCruz
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
-rwxr-xr-xwemeet.sh20
3 files changed, 16 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6f65def47c56..4811bba82c49 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = wemeet-bin
pkgdesc = Tencent Video Conferencing, tencent meeting 腾讯会议
pkgver = 3.11.0.402
- pkgrel = 7
+ pkgrel = 8
url = https://source.meeting.qq.com/download-center.html
arch = x86_64
arch = aarch64
@@ -11,7 +11,7 @@ pkgbase = wemeet-bin
provides = wemeet
provides = tencent-meeting
source = wemeet.sh
- sha512sums = 52b4f410a31e3f63d27c84e12cd8c6724a56a4179682ca17dfb99f8e2d64a16cd54b64bffdb8449440f745be261336c71b85270d4717f3640ddde5c1ee7ed586
+ sha512sums = 22c1d02054c915ad31a49be524be80b67d98fc36cca8f05f800cb3bd2794044383e6b3e01a74282a58153a79f0556398e201505bcac180567f7adab55ec3b9f8
source_x86_64 = wemeet-3.11.0.402-x86_64.deb::https://updatecdn.meeting.qq.com/cos/9b74d4127a16a011db8cb6300fa5fbc9/TencentMeeting_0300000000_3.11.0.402_x86_64_default.publish.deb
sha512sums_x86_64 = 6b4a5a5499fd8a92dbf86ae04990434b3a7ff2ade7d768dbe70dd3f60e347c599281e1aed211673a3a7986f5cb7a014abefec0c859e087c291286467bf8fbe73
source_aarch64 = wemeet-3.11.0.402-aarch64.deb::https://updatecdn.meeting.qq.com/cos/ce5d25cc8e8aae8ddd19295bc3b00d5e/TencentMeeting_0300000000_3.11.0.402_arm64_default.publish.deb
diff --git a/PKGBUILD b/PKGBUILD
index 1ddcd930af5c..20a027956b75 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ provides=('wemeet' 'tencent-meeting')
pkgver=3.11.0.402
_x86_md5=9b74d4127a16a011db8cb6300fa5fbc9
_arm_md5=ce5d25cc8e8aae8ddd19295bc3b00d5e
-pkgrel=7
+pkgrel=8
pkgdesc="Tencent Video Conferencing, tencent meeting 腾讯会议"
arch=('x86_64' 'aarch64')
license=('unknown')
@@ -18,7 +18,7 @@ source_aarch64=("${_pkgname}-${pkgver}-aarch64.deb::https://updatecdn.meeting.qq
source=("${_pkgname}".sh)
optdepends=('bubblewrap: Fix abnormal text color in dark mode.')
makedepends=('patchelf')
-sha512sums=('52b4f410a31e3f63d27c84e12cd8c6724a56a4179682ca17dfb99f8e2d64a16cd54b64bffdb8449440f745be261336c71b85270d4717f3640ddde5c1ee7ed586')
+sha512sums=('22c1d02054c915ad31a49be524be80b67d98fc36cca8f05f800cb3bd2794044383e6b3e01a74282a58153a79f0556398e201505bcac180567f7adab55ec3b9f8')
sha512sums_x86_64=('6b4a5a5499fd8a92dbf86ae04990434b3a7ff2ade7d768dbe70dd3f60e347c599281e1aed211673a3a7986f5cb7a014abefec0c859e087c291286467bf8fbe73')
sha512sums_aarch64=('534657987d8030c0798731d72fade34c40a5863f4dcd289423eb0509115e290ad5507616c19d86e76c25ae5ea82272fe167ef45599f0ad1433531ff72f74ce78')
diff --git a/wemeet.sh b/wemeet.sh
index 8fc903b58aa6..9c9dac678394 100755
--- a/wemeet.sh
+++ b/wemeet.sh
@@ -3,18 +3,22 @@ export XDG_SESSION_TYPE=x11
export QT_QPA_PLATFORM=xcb
export QT_AUTO_SCREEN_SCALE_FACTOR=1
export QT_STYLE_OVERRIDE=fusion # 解决使用自带qt情况下,字体颜色全白看不到的问题
-export IBUS_USE_PORTAL=1 # fix ibus
-FONTCONFIG_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/fontconfig"
+export IBUS_USE_PORTAL=1 # fix ibus
unset WAYLAND_DISPLAY
+USER_RUN_DIR="/run/user/$(id -u)"
+CONFIG_DIR="${XDG_CONFIG_HOME:-$HOME/.config}"
+FONTCONFIG_DIR="$CONFIG_DIR/fontconfig"
+KDE_ICON_CACHE_FILE="${XDG_CACHE_HOME:-$HOME/.cache}/icon-cache.kcache"
+WEMEET_APP_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/wemeetapp"
# if pipewire-pulse installed
if [ -f /usr/bin/pipewire-pulse ]; then
export PULSE_LATENCY_MSEC=20
-fi;
+fi
-if [ -f "/usr/bin/bwrap" ];then
- mkdir -p $FONTCONFIG_DIR
- bwrap --dev-bind / / --tmpfs "${XDG_CONFIG_HOME:-$HOME/.config}" --ro-bind $FONTCONFIG_DIR $FONTCONFIG_DIR /opt/wemeet/bin/wemeetapp $*;
+if [ -f /usr/bin/bwrap ]; then
+ mkdir -p "$WEMEET_APP_DIR"
+ bwrap --new-session --die-with-parent --cap-drop ALL --unshare-user-try --unshare-pid --unshare-cgroup-try --ro-bind / / --dev-bind /dev /dev --bind "$USER_RUN_DIR" "$USER_RUN_DIR" --tmpfs "$CONFIG_DIR" --ro-bind-try "$FONTCONFIG_DIR" "$FONTCONFIG_DIR" --bind-try "$KDE_ICON_CACHE_FILE" "$KDE_ICON_CACHE_FILE" --bind "$WEMEET_APP_DIR" "$WEMEET_APP_DIR" /opt/wemeet/bin/wemeetapp "$@"
else
- exec /opt/wemeet/bin/wemeetapp $*;
-fi;
+ exec /opt/wemeet/bin/wemeetapp "$@"
+fi