From 8f4757ee3b8f1efe321a82d8b10f6bcf990233a9 Mon Sep 17 00:00:00 2001 From: Hyunjin Song Date: Mon, 6 May 2019 12:13:22 +0900 Subject: [PATCH] Use extracted linuxdeployqt directly As of https://github.com/probonopd/linuxdeployqt/pull/370/, the AppRun of linuxdeployqt unsets LD_LIBRARY_PATH. This behavior isn't suitable for our cases, so we use the extracted binary directly as a workaround. --- cmake/linux/package_linux.sh.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmake/linux/package_linux.sh.in b/cmake/linux/package_linux.sh.in index b02a4c68855..7c0e2593b01 100644 --- a/cmake/linux/package_linux.sh.in +++ b/cmake/linux/package_linux.sh.in @@ -70,6 +70,9 @@ elif ! find "$LINUXDEPLOYQT" -mtime -$DAYSOLD 2>/dev/null|grep -q "." > /dev/nul touch "$LINUXDEPLOYQT" success "Downloaded $LINUXDEPLOYQT" "$LINUXDEPLOYQT" --appimage-extract > /dev/null 2>&1 + # We need to set LD_LIBRARY_PATH, but linuxdepoyqt's AppRun unsets it + # See https://github.com/probonopd/linuxdeployqt/pull/370/ + LINUXDEPLOYQT="squashfs-root/usr/bin/linuxdeployqt" success "Extracted $APPIMAGETOOL" else skipped "$LINUXDEPLOYQT is less than $DAYSOLD days old"