diff --git a/pack.d/teamspeak3.sh b/pack.d/teamspeak3.sh index 882b9939..fb9d4b06 100755 --- a/pack.d/teamspeak3.sh +++ b/pack.d/teamspeak3.sh @@ -23,9 +23,12 @@ rm -v update cd - >/dev/null # pack libwebp.so.6 from ALT Linux +epm assure rpm2cpio || fatal +epm assure cpio || fatal + eget https://git.altlinux.org/tasks/177836/build/200/x86_64/rpms/libwebp6-0.5.2-alt2.x86_64.rpm -rpm2cpio libwebp6-0.5.2-alt2.x86_64.rpm | cpio -idmv -cp usr/lib64/* opt/$PRODUCT +rpm2cpio libwebp6-0.5.2-alt2.x86_64.rpm | cpio -idmv || fatal +cp usr/lib64/* opt/$PRODUCT || fatal rm libwebp6-0.5.2-alt2.x86_64.rpm # TeamSpeak3-Client-linux_amd64-3.6.0.run diff --git a/repack.d/teamspeak3.sh b/repack.d/teamspeak3.sh index ddac2427..922486d0 100755 --- a/repack.d/teamspeak3.sh +++ b/repack.d/teamspeak3.sh @@ -28,7 +28,13 @@ pack_file /usr/share/applications/$PRODUCT.desktop install_file "ipfs://QmX2qYLUXLpGc18U3MmDL1mg1EydWdGUpPGaFCZ2tWbH6x" /usr/share/pixmaps/$PRODUCT.png -# hack, todo: update libevent in p10 +# Fedora does not provide this old libwebp soname, but pack.d/teamspeak3.sh +# bundles it for the TeamSpeak Qt image plugin. +ignore_lib_requires 'libwebp.so.6()(64bit)' + +# Older systems can have another libevent 2.1 soname. Patch it only when +# libevent is already installed in the build environment; otherwise leave +# libevent-2.1.so.7 as a package dependency. get_libevent() { local libdir @@ -38,9 +44,7 @@ get_libevent() } libevent="$(get_libevent)" -[ -n "$libevent" ] || fatal "libevent is missed, install it before" - -if [ "$libevent" != "libevent-2.1.so.7" ] && epm assure patchelf ; then +if [ -n "$libevent" ] && [ "$libevent" != "libevent-2.1.so.7" ] && epm assure patchelf ; then a= patchelf --replace-needed libevent-2.1.so.7 $libevent .$PRODUCTDIR/libQt5WebEngineCore.so.5 # Fix libquazip1-qt5.so name #patchelf --replace-needed libquazip.so libquazip1-qt5.so.1.0.0 .$PRODUCTDIR/ts3client_linux_amd64 @@ -51,4 +55,3 @@ remove_file $PRODUCTDIR/platforms/libqwayland-generic.so remove_file $PRODUCTDIR/platforms/libqwayland-egl.so remove_file $PRODUCTDIR/platforms/libqwayland-xcomposite-glx.so remove_file $PRODUCTDIR/platforms/libqwayland-xcomposite-egl.so -