Fix issues

3 files changed, 34 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 527b311c9c80..d6ab8e0f6fd1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = wechat-uos-bwrap
 	pkgdesc = WeChat Qt w/ bwrap sandbox
 	pkgver = 1.0.0.241
-	pkgrel = 2
+	pkgrel = 3
 	url = https://weixin.qq.com/
 	arch = x86_64
 	arch = aarch64
@@ -50,15 +50,17 @@ pkgbase = wechat-uos-bwrap
 	depends = hicolor-icon-theme
 	depends = bash
 	depends = lsb-release
-	provides = wechat-uos
+	optdepends = gamescope
+	replaces = wechat-universal-bwrap
+	replaces = wechat-beta-bwrap
 	options = !debug
 	source = wechat.sh
-	source = wechat-uos-beta.desktop
-	source = wechat-uos-beta.svg
+	source = wechat-uos-qt.desktop
+	source = wechat-uos-qt.svg
 	source = open.sh
 	source = license.tar.gz
 	source = user-dirs.dirs
-	md5sums = b44163ff18788451bf782e00bc83ebcc
+	md5sums = e9d427f9ae4116244b475add9b37147d
 	md5sums = 82a5663ce32a0504f1f7575d51f2c7cb
 	md5sums = 600e74549ce2258c045d5c2f7689ea63
 	md5sums = dfc069e6c8d9dbaa90fe388cab4002c9
@@ -72,14 +74,18 @@ pkgbase = wechat-uos-bwrap
 	md5sums_loong64 = c4d443515fe76ec35e792d43e9521887
 
 pkgname = wechat-uos-bwrap
-	conflicts = wechat-universal-bwrap
-	conflicts = wechat-beta-bwrap
-	replaces = wechat-universal-bwrap
-	replaces = wechat-beta-bwrap
+	conflicts = 
 
 pkgname = wechat-uos-qt
+	provides = wechat-uos
+	provides = wechat
+	provides = wechat-universal
+	provides = wechat-universal-bwrap
+	provides = wechat-beta-bwrap
 	conflicts = wechat-universal-bwrap
 	conflicts = wechat-beta-bwrap
 	replaces = wechat-universal-bwrap
 	replaces = wechat-beta-bwrap
+	replaces = wechat-universal-bwrap
+	replaces = wechat-beta-bwrap
 	replaces = wechat-uos-bwrap
diff --git a/PKGBUILD b/PKGBUILD
index dd43eb3edcd4..81702c544948 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Kimiblock Moe
 pkgname=(wechat-uos-bwrap wechat-uos-qt)
 pkgver=1.0.0.241
-pkgrel=2
+pkgrel=3
 epoch=
 pkgdesc="WeChat Qt w/ bwrap sandbox"
 arch=('x86_64' 'aarch64' 'loong64')
@@ -55,13 +55,14 @@ depends=(
 	"lsb-release"
 )
 
+optdepends=("gamescope")
+
 makedepends=(
 	"libarchive"
 )
 
 checkdepends=()
-provides=("wechat-uos" "wechat" "wechat-universal" "wechat-universal-bwrap" "wechat-beta-bwrap")
-conflicts=("wechat-universal-bwrap" "wechat-beta-bwrap")
+conflicts=()
 replaces=("wechat-universal-bwrap" "wechat-beta-bwrap")
 
 source=(
@@ -85,7 +86,7 @@ source_loong64=(
 	wechat-loong64-${pkgver}.deb::"https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_${pkgver}_arm64.deb"
 )
 
-md5sums=('69628714247dee95501672612ac0e47c'
+md5sums=('2e422600e33c025f74bcea4131e11462'
          '82a5663ce32a0504f1f7575d51f2c7cb'
          '600e74549ce2258c045d5c2f7689ea63'
          'dfc069e6c8d9dbaa90fe388cab4002c9'
@@ -96,8 +97,9 @@ md5sums_aarch64=('c4d443515fe76ec35e792d43e9521887')
 md5sums_loong64=('c4d443515fe76ec35e792d43e9521887')
 
 function package_wechat-uos-qt() {
-	conflicts+=(wechat-universal-bwrap wechat-beta-bwrap)
+	conflicts=(wechat-universal-bwrap wechat-beta-bwrap)
 	replaces+=(wechat-universal-bwrap wechat-beta-bwrap wechat-uos-bwrap)
+	provides=("wechat-uos" "wechat" "wechat-universal" "wechat-universal-bwrap" "wechat-beta-bwrap")
 	tar -xf data.tar.xz ./opt/apps/com.tencent.wechat
 	mkdir -p "${pkgdir}"/opt
 	cp opt/apps/com.tencent.wechat "${pkgdir}"/opt/wechat-uos-qt -r
@@ -108,12 +110,14 @@ function package_wechat-uos-qt() {
 	install -Dm644 wechat-uos-qt.svg "${pkgdir}/usr/share/icons/hicolor/scalable/apps/wechat-uos-qt.svg"
 	mkdir -p "${pkgdir}/usr/share/wechat-uos-qt/license"
 	#install -Dm755 "${pkgdir}/opt/wechat-uos-qt/files/libuosdevicea.so" "${pkgdir}/usr/lib/license/libuosdevicea.so"
+	install -d "${pkgdir}/usr/lib/license"
+	touch "${pkgdir}/usr/lib/license/libuosdevicea.so"
+	chmod 0755 "${pkgdir}/usr/lib/license" -R
 	cp "${srcdir}/license"/* -r "${pkgdir}/usr/share/wechat-uos-qt/license"
 	chmod 0755 -R "${pkgdir}/usr/share/wechat-uos-qt/license"
 }
 
 function package_wechat-uos-bwrap() {
-	conflicts+=(wechat-universal-bwrap wechat-beta-bwrap)
-	replaces+=(wechat-universal-bwrap wechat-beta-bwrap)
+	conflicts=()
 	requires+=(wechat-uos-qt)
 }
diff --git a/wechat.sh b/wechat.sh
index b90979f6fd97..42cbbcba1eb0 100644
--- a/wechat.sh
+++ b/wechat.sh
@@ -89,6 +89,12 @@ function importEnv() {
 	else
 		touch "${XDG_DATA_HOME}"/WeChat_Data/wechat.env
 	fi
+	if [[ $(cat "${XDG_DATA_HOME}"/WeChat_Data/wechat.env) ]]; then
+		return 0
+	else
+		echo "# Envs" >>"${XDG_DATA_HOME}"/WeChat_Data/wechat.env
+		echo "isWeChatEnvPresent=1" >>"${XDG_DATA_HOME}"/WeChat_Data/wechat.env
+	fi
 }
 
 function cameraDect() {
@@ -121,6 +127,8 @@ function execApp() {
 		--dir /sandbox \
 		--tmpfs /tmp \
 		--bind /usr /usr \
+		--bind /opt/wechat-uos-qt/files/libuosdevicea.so \
+			/usr/lib/license/libuosdevicea.so \
 		--ro-bind /etc /etc \
 		--symlink usr/lib /lib \
 		--symlink usr/lib64 /lib64 \
@@ -163,7 +171,6 @@ function execApp() {
 		--setenv QT_QPA_PLATFORM xcb \
 		--setenv LD_LIBRARY_PATH \
 			/opt/wechat-uos-qt/files:/usr/lib/wechat-uos-qt/so \
-		--setenv LD_PRELOAD /opt/wechat-uos-qt/files/libuosdevicea.so \
 		--setenv QT_AUTO_SCREEN_SCALE_FACTOR 1 \
 		--setenv PATH /sandbox:"${PATH}" \
 		--setenv XDG_DOCUMENTS_DIR "${XDG_DOCUMENTS_DIR}" \
@@ -205,7 +212,6 @@ function execAppUnsafe() {
 		--ro-bind /usr/share/wechat-uos-qt/license/etc/lsb-release /etc/lsb-release \
 		--setenv QT_QPA_PLATFORM xcb \
 		--setenv LD_LIBRARY_PATH /opt/wechat-uos-qt/files:/usr/lib/wechat-uos-qt/so:/usr/lib/wechat-uos-qt/so \
-		--setenv LD_PRELOAD /opt/wechat-uos-qt/files/libuosdevicea.so \
 		--setenv QT_AUTO_SCREEN_SCALE_FACTOR 1 \
 		--setenv PATH /sandbox:"${PATH}" \
 		--setenv QT_PLUGIN_PATH "/usr/lib/qt/plugins /opt/wechat-uos-qt/files/wechat" \