diff options
| author | lilongyu | 2024-03-11 08:54:34 +0800 |
|---|---|---|
| committer | lilongyu | 2024-03-11 08:54:34 +0800 |
| commit | 6c60355a0654e8b4b058b6f25837c8cb2d7a5924 (patch) | |
| tree | b1f1dc3655583f2bbe84f34d73e30e0d09b11b0d | |
| parent | fc2fad46859a138f2aae0045698e251153a6cdd3 (diff) | |
| download | aur-6c60355a0654e8b4b058b6f25837c8cb2d7a5924.tar.gz | |
wip: try to guess the system screen factor value
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 4 | ||||
| -rw-r--r-- | wechat.sh | 15 |
3 files changed, 15 insertions, 8 deletions
@@ -1,7 +1,7 @@ pkgbase = wechat-beta-bwrap pkgdesc = WeChat Testing with bwrap sandbox pkgver = 1.0.0.145 - pkgrel = 12 + pkgrel = 13 arch = x86_64 license = proprietary depends = nss @@ -22,7 +22,7 @@ pkgbase = wechat-beta-bwrap source = license.tar.gz source = wechat-uos_2.1.5_amd64.deb::https://home-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.weixin/com.tencent.weixin_2.1.5_amd64.deb source = wechat-beta_1.0.0.145_amd64.deb::https://cdn4.cnxclm.com/uploads/2024/03/05/3VDyAc0x_wechat-beta_1.0.0.145_amd64.deb?attname=wechat-beta_1.0.0.145_amd64.deb - md5sums = 222a2eb9b29569c4753ec887a505164d + md5sums = 801cda44cb86f28317977a018fc2256b md5sums = 4967385a00db424e596263618335411f md5sums = cf971cb2cb01d8a5fd89d3a3555abfaf md5sums = 6b159c6e9d21a98925489bc37a9aea43 @@ -2,7 +2,7 @@ # pkgname=wechat-beta-bwrap pkgver=1.0.0.145 -pkgrel=12 +pkgrel=13 uosver=2.1.5 epoch= pkgdesc="WeChat Testing with bwrap sandbox" @@ -27,7 +27,7 @@ noextract=( wechat-beta_${pkgver}_amd64.deb ) -md5sums=('222a2eb9b29569c4753ec887a505164d' +md5sums=('801cda44cb86f28317977a018fc2256b' '4967385a00db424e596263618335411f' 'cf971cb2cb01d8a5fd89d3a3555abfaf' '6b159c6e9d21a98925489bc37a9aea43' diff --git a/wechat.sh b/wechat.sh index e7ddf62e4217..513ea2968887 100644 --- a/wechat.sh +++ b/wechat.sh @@ -8,9 +8,15 @@ if [ -z ${QT_IM_MODULE} ]; then BWRAP_ENV_APPEND="${BWRAP_ENV_APPEND} --setenv QT_IM_MODULE fcitx" fi -if [ -z ${QT_SCALE_FACTOR} ] && [ -z ${QT_AUTO_SCREEN_SCALE_FACTOR} ]; then - BWRAP_ENV_APPEND="${BWRAP_ENV_APPEND} --setenv QT_SCALE_FACTOR 1.5" -fi +case "$XDG_CURRENT_DESKTOP" in + KDE) + SCALE_FACTOR=$(kreadconfig6 --group KScreen --key ScaleFactor --default 1.0) + BWRAP_ENV_APPEND="${BWRAP_ENV_APPEND} --setenv QT_SCALE_FACTOR ${SCALE_FACTOR}" + ;; + *) + BWRAP_ENV_APPEND="${BWRAP_ENV_APPEND} --setenv QT_AUTO_SCREEN_SCALE_FACTOR ${QT_AUTO_SCREEN_SCALE_FACTOR:-1}" + ;; +esac if [ -z ${GTK_USE_PORTAL} ]; then BWRAP_ENV_APPEND="${BWRAP_ENV_APPEND} --setenv GTK_USE_PORTAL 1" @@ -22,7 +28,8 @@ fi exec bwrap \ --dev-bind / / \ - --bind ${WECHAT_HOME_DIR} ${HOME} \ + --bind "${WECHAT_HOME_DIR}" "${HOME}" \ + --bind "$HOME/.fontconfig" "${HOME}/.fontconfig" \ --ro-bind /usr/share/wechat-uos/var/ /var/ \ --ro-bind /usr/share/wechat-uos/etc/os-release /etc/os-release \ --ro-bind /usr/share/wechat-uos/etc/lsb-release /etc/lsb-release \ |