Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions pack.d/teamspeak3.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,12 @@ rm -v update
cd - >/dev/null

# pack libwebp.so.6 from ALT Linux

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ну мне не нравится такой заход. Вообще pack не должен таким заниматься, тем более скачивать что-то. pack конвертирует архивы в понятный вид.

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
Expand Down
13 changes: 8 additions & 5 deletions repack.d/teamspeak3.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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