Skip to content

Commit

Permalink
Remove lingering linuxdeployqt workaround
Browse files Browse the repository at this point in the history
  • Loading branch information
tresf committed Oct 23, 2024
1 parent 7f217d8 commit a9fe1b3
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 9 deletions.
8 changes: 0 additions & 8 deletions cmake/linux/LinuxDeploy.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -121,16 +121,8 @@ if(EXISTS "${VST64_BEFORE}")
endif()

# Patch desktop file
file(READ "${DESKTOP_FILE}" DESKTOP_FILE_CONTENTS)
#string(REPLACE "Exec=${lmms}" "Exec=${lmms}.real" DESKTOP_FILE_CONTENTS "${DESKTOP_FILE_CONTENTS}")
file(WRITE "${DESKTOP_FILE}" "${DESKTOP_FILE_CONTENTS}")
file(APPEND "${DESKTOP_FILE}" "X-AppImage-Version=${CPACK_PROJECT_VERSION}\n")

# TODO: Keep this symlink until LinuxDeployQt.cmake is removed
# - First, edit launch_lmms.sh to point directly to /usr/bin/lmms (instead of lmms.real)
# - Second, delete the below symlink; linuxdeploy supports wrappers natively; linuxdeployqt didn't;
create_symlink("${APP}/usr/bin/${lmms}" "${APP}/usr/bin/${lmms}.real")

# Build list of executables to inform linuxdeploy about
# e.g. -executable=foo.dylib -executable=bar.dylib
file(GLOB LIBS "${APP}/usr/lib/${lmms}/*.so")
Expand Down
2 changes: 1 addition & 1 deletion cmake/linux/launch_lmms.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ else
echo "Jack does not appear to be installed. That's OK, we'll use a dummy version instead." >&2
export LD_LIBRARY_PATH=$DIR/usr/lib/lmms/optional:$LD_LIBRARY_PATH
fi
QT_X11_NO_NATIVE_MENUBAR=1 "$DIR"/usr/bin/lmms.real "$@"
QT_X11_NO_NATIVE_MENUBAR=1 "$DIR"/usr/bin/lmms "$@"

0 comments on commit a9fe1b3

Please sign in to comment.