From c715fc35f3775eacf189a49f991e0f664ee2753d Mon Sep 17 00:00:00 2001 From: Mathieu Schroeter Date: Fri, 15 Nov 2024 22:04:29 +0100 Subject: [PATCH] Adapt build to the latest appimagetool --- CMakeLists.txt | 12 +----------- planetblupi | 2 +- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b929eac..a6750b8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -805,23 +805,14 @@ endif () ############## if (BUILD_LINUX AND NOT DISABLE_APPIMAGE) - set (APPIMAGE_APPRUN_BIN "AppRun-x86_64") - set (APPIMAGE_APPRUN_URL "https://github.com/probonopd/AppImageKit/releases/download/continuous/${APPIMAGE_APPRUN_BIN}") - set (APPIMAGE_APPRUN_PROGRAM "${CMAKE_CURRENT_SOURCE_DIR}/externals/${APPIMAGE_APPRUN_BIN}") - set (APPIMAGE_TOOL_BIN "appimagetool-x86_64.AppImage") - set (APPIMAGE_TOOL_URL "https://github.com/probonopd/AppImageKit/releases/download/continuous/${APPIMAGE_TOOL_BIN}") + set (APPIMAGE_TOOL_URL "https://github.com/AppImage/appimagetool/releases/download/continuous/${APPIMAGE_TOOL_BIN}") set (APPIMAGE_TOOL_PROGRAM "${CMAKE_CURRENT_SOURCE_DIR}/externals/${APPIMAGE_TOOL_BIN}") - if (NOT EXISTS "${APPIMAGE_APPRUN_PROGRAM}") - file (DOWNLOAD "${APPIMAGE_APPRUN_URL}" "${APPIMAGE_APPRUN_PROGRAM}") - endif () - if (NOT EXISTS "${APPIMAGE_TOOL_PROGRAM}") file (DOWNLOAD "${APPIMAGE_TOOL_URL}" "${APPIMAGE_TOOL_PROGRAM}") endif () - execute_process (COMMAND /bin/chmod 0755 "${APPIMAGE_APPRUN_PROGRAM}") execute_process (COMMAND /bin/chmod 0755 "${APPIMAGE_TOOL_PROGRAM}") endif () @@ -832,7 +823,6 @@ ExternalProject_Add (planetblupi_Project PREFIX ${CMAKE_BINARY_DIR} CMAKE_COMMAND ${CMD} cmake CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} - -DAPPIMAGE_APPRUN_PROGRAM=${APPIMAGE_APPRUN_PROGRAM} -DAPPIMAGE_ASSISTANT_PROGRAM=${APPIMAGE_TOOL_PROGRAM} -DCMAKE_INSTALL_PREFIX:PATH= -DPB_HTTP_VERSION_CHECK=${HAS_CURL} diff --git a/planetblupi b/planetblupi index fa0bfae..f2f50f2 160000 --- a/planetblupi +++ b/planetblupi @@ -1 +1 @@ -Subproject commit fa0bfae7550267d689f123b09f561831102d318d +Subproject commit f2f50f23fa236598bc9e6c94016e0edfd72f7a89