From 1ed522597138f631c57d0c96ca6aa2f40b2f42c4 Mon Sep 17 00:00:00 2001 From: Jertzukka Date: Fri, 13 Jun 2025 02:51:28 +0300 Subject: [PATCH] Linux: Update 25.04 Plucky dependencies (#1556) Update 25.04 dependency to require libwxgtk3.2-1t64 package. --- src/Build/CMakeLists.txt | 8 ++++++-- src/Main/Main.make | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Build/CMakeLists.txt b/src/Build/CMakeLists.txt index ddf541cd..46ffdd23 100644 --- a/src/Build/CMakeLists.txt +++ b/src/Build/CMakeLists.txt @@ -280,10 +280,14 @@ if ( ( PLATFORM STREQUAL "Debian" ) OR ( PLATFORM STREQUAL "Ubuntu" ) ) else () # Link against gtk3 version of wxWidgets if >= Debian 10 or >= Ubuntu 18.04 # Otherwise, link against gtk2 version of wxWidgets + if ( ( ( PLATFORM STREQUAL "Debian" ) AND ( PLATFORM_VERSION VERSION_GREATER_EQUAL "13" ) ) + OR ( ( PLATFORM STREQUAL "Ubuntu" ) AND ( PLATFORM_VERSION VERSION_GREATER_EQUAL "25.04" ) ) ) + + set( CPACK_DEBIAN_PACKAGE_DEPENDS "libwxgtk3.2-1t64, libayatana-appindicator3-1, libfuse2t64, dmsetup, sudo" ) + # In case of Ubuntu 24.04, we depend on libfuse2t64 instead of libfuse2 and we link statically against wxWidgets # because there is a bug in wxWidgets that ships with Ubuntu 24.04 and which was fixed in wxWidgets 3.2.5 - if ( ( ( PLATFORM STREQUAL "Debian" ) AND ( PLATFORM_VERSION VERSION_GREATER_EQUAL "13" ) ) - OR ( ( PLATFORM STREQUAL "Ubuntu" ) AND ( PLATFORM_VERSION VERSION_GREATER_EQUAL "24.04" ) ) ) + elseif ( ( PLATFORM STREQUAL "Ubuntu" ) AND ( PLATFORM_VERSION VERSION_GREATER_EQUAL "24.04" ) ) set( CPACK_DEBIAN_PACKAGE_DEPENDS "libgtk-3-0t64, libayatana-appindicator3-1, libfuse2t64, dmsetup, sudo" ) diff --git a/src/Main/Main.make b/src/Main/Main.make index f62b4bed..351cc0f3 100755 --- a/src/Main/Main.make +++ b/src/Main/Main.make @@ -327,7 +327,7 @@ ifndef TC_NO_GUI rm -fr $(BASE_DIR)/Setup/Linux/veracrypt.AppDir/usr cp -r $(BASE_DIR)/Setup/Linux/usr $(BASE_DIR)/Setup/Linux/veracrypt.AppDir/. - ln -s usr/share/icons/hicolor/1024x1024/apps/$(APPNAME).png $(BASE_DIR)/Setup/Linux/veracrypt.AppDir/$(APPNAME).png + ln -sf usr/share/icons/hicolor/1024x1024/apps/$(APPNAME).png $(BASE_DIR)/Setup/Linux/veracrypt.AppDir/$(APPNAME).png endif