Fix: xcast.conf not found

3 files changed, 23 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5a5608fb0b5b..78fce4a6aa3e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = wemeet-bin
 	pkgdesc = Tencent Video Conferencing, tencent meeting 腾讯会议
 	pkgver = 2.8.0.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://source.meeting.qq.com/download-center.html
 	arch = x86_64
 	license = unknown
@@ -16,6 +16,8 @@ pkgbase = wemeet-bin
 	provides = wemeet
 	provides = tencent-meeting
 	source = wemeet-2.8.0.1-x86_64.deb::https://updatecdn.meeting.qq.com/cos/196cdf1a3336d5dca56142398818545f/TencentMeeting_0300000000_2.8.0.1_x86_64.publish.deb
+	source = wemeet.sh
 	sha512sums = 37d3aec3de68fc79da744690d65f5ceef6d67d9bfba40f52b14429847ec72d9136e34fe87fbdd7d9dd14e91f543bf9b5fdbd4f50cfe25a3677b557daa4ed38ce
+	sha512sums = b4d199290278539cd9dcd23a4f66f6136abd38b0e5a884db3ca4d9b1a23217c330777d1d5ec533053242dd1493c513a3dc0cf6e7ac5a6ca04f1918d4a9430e4c
 
 pkgname = wemeet-bin
diff --git a/PKGBUILD b/PKGBUILD
index a6d2c25e9728..f29b86cce895 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,15 +3,18 @@ pkgname=wemeet-bin
 _pkgname=wemeet
 provides=('wemeet' 'tencent-meeting')
 pkgver=2.8.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Tencent Video Conferencing, tencent meeting 腾讯会议"
 arch=('x86_64')
 license=('unknown')
 url="https://source.meeting.qq.com/download-center.html"
-source=("${_pkgname}-${pkgver}-${arch}.deb::https://updatecdn.meeting.qq.com/cos/196cdf1a3336d5dca56142398818545f/TencentMeeting_0300000000_${pkgver}_${arch}.publish.deb")
+source=("${_pkgname}-${pkgver}-${arch}.deb::https://updatecdn.meeting.qq.com/cos/196cdf1a3336d5dca56142398818545f/TencentMeeting_0300000000_${pkgver}_${arch}.publish.deb"
+"${_pkgname}".sh
+)
 depends=('qt5-x11extras' 'hicolor-icon-theme' 'libbsd'  'libxrandr' 'qt5-webkit' 'libxinerama' 'libpulse')
 optdepends=('bubblewrap: Fix abnormal text color in dark mode.')
-sha512sums=('37d3aec3de68fc79da744690d65f5ceef6d67d9bfba40f52b14429847ec72d9136e34fe87fbdd7d9dd14e91f543bf9b5fdbd4f50cfe25a3677b557daa4ed38ce')
+sha512sums=('37d3aec3de68fc79da744690d65f5ceef6d67d9bfba40f52b14429847ec72d9136e34fe87fbdd7d9dd14e91f543bf9b5fdbd4f50cfe25a3677b557daa4ed38ce'
+            'b4d199290278539cd9dcd23a4f66f6136abd38b0e5a884db3ca4d9b1a23217c330777d1d5ec533053242dd1493c513a3dc0cf6e7ac5a6ca04f1918d4a9430e4c')
 
 
 package() {
@@ -30,24 +33,11 @@ package() {
     
     sed -i '4c Prefix = /usr/lib/qt' bin/qt.conf
     
-    mkdir -p ${pkgdir}/usr/bin
-    echo '''#!/bin/sh
-export PATH=$PATH:/opt/wemeet/bin
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/wemeet
-export QT_PLUGIN_PATH="/usr/lib/qt/plugins"
-export XDG_SESSION_TYPE=x11
-export QT_QPA_PLATFORM=xcb
-unset WAYLAND_DISPLAY
-if [ -f "/usr/bin/bwrap" ];then
-    bwrap --dev-bind / / --tmpfs $HOME/.config  wemeetapp $*;
-else
-    exec wemeetapp $*;
-fi;
-''' > ${pkgdir}/usr/bin/${_pkgname}
-    chmod a+x ${pkgdir}/usr/bin/${_pkgname}
+    install -Dm755 "${srcdir}/${_pkgname}".sh     ${pkgdir}/usr/bin/${_pkgname}
     
     mkdir -p ${pkgdir}/usr/lib/${_pkgname}
     mv lib/{libwemeet*,libxcast.so,libxnn*,libtquic.so} ${pkgdir}/usr/lib/${_pkgname}
+    cp bin/raw/xcast.conf ${pkgdir}/opt/${_pkgname}/bin/
     
     rm -rf plugins icons lib/libQt* lib wemeetapp.sh
     
diff --git a/wemeet.sh b/wemeet.sh
new file mode 100644
index 000000000000..3973a190ff8e
--- /dev/null
+++ b/wemeet.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+export PATH=$PATH:/opt/wemeet/bin
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/wemeet
+export QT_PLUGIN_PATH="/usr/lib/qt/plugins"
+export XDG_SESSION_TYPE=x11
+export QT_QPA_PLATFORM=xcb
+unset WAYLAND_DISPLAY
+if [ -f "/usr/bin/bwrap" ];then
+    bwrap --dev-bind / / --tmpfs $HOME/.config  wemeetapp $*;
+else
+    exec wemeetapp $*;
+fi;