From 87b5315f54dc5e5eb19f0330e5cee7ad5ca005fa Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Thu, 13 Jun 2024 17:03:12 +0200 Subject: [PATCH] Fixes : appimage creation, patch name packages, logo --- Linphone/core/App.cpp | 2 ++ Linphone/tool/Constants.hpp | 7 +++---- cmake/install/install.cmake | 18 ++++++++++++------ external/linphone-sdk | 2 +- 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/Linphone/core/App.cpp b/Linphone/core/App.cpp index d8159150b..0ae4276c9 100644 --- a/Linphone/core/App.cpp +++ b/Linphone/core/App.cpp @@ -99,6 +99,7 @@ App::App(int &argc, char *argv[]) auto ignoreVSync = QSurfaceFormat::defaultFormat(); ignoreVSync.setSwapInterval(0); QSurfaceFormat::setDefaultFormat(ignoreVSync); + setWindowIcon(QIcon(Constants::WindowIconPath)); lInfo() << "Loading Fonts"; QDirIterator it(":/font/", QDirIterator::Subdirectories); while (it.hasNext()) { @@ -256,6 +257,7 @@ void App::initCore() { #endif mEngine->rootContext()->setContextProperty("applicationName", APPLICATION_NAME); mEngine->rootContext()->setContextProperty("executableName", EXECUTABLE_NAME); + initCppInterfaces(); mEngine->addImageProvider(ImageProvider::ProviderId, new ImageProvider()); mEngine->addImageProvider(AvatarProvider::ProviderId, new AvatarProvider()); diff --git a/Linphone/tool/Constants.hpp b/Linphone/tool/Constants.hpp index 2f514c09a..074d8e17f 100644 --- a/Linphone/tool/Constants.hpp +++ b/Linphone/tool/Constants.hpp @@ -69,7 +69,7 @@ public: static constexpr char PrivatePolicyUrl[] = "https://www.linphone.org/privacy-policy"; static constexpr char ContactUrl[] = "https://www.linphone.org/contact"; static constexpr char TranslationUrl[] = "https://weblate.linphone.org/projects/linphone-desktop/"; - + static constexpr int MaxMosaicParticipants = 6; // From 7, the mosaic quality will be limited to avoid useless computations @@ -99,7 +99,6 @@ public: Q_PROPERTY(int maxMosaicParticipants MEMBER MaxMosaicParticipants CONSTANT) Q_PROPERTY(QStringList reactionsList READ getReactionsList CONSTANT) - // For Webviews static constexpr char DefaultAssistantRegistrationUrl[] = "https://subscribe.linphone.org/register"; static constexpr char DefaultAssistantLoginUrl[] = "https://subscribe.linphone.org/login"; @@ -117,8 +116,8 @@ public: //-------------------------------------------------------------------------------- static constexpr char LinphoneDomain[] = "sip.linphone.org"; // Use for checking if config are a Linphone - static constexpr char WindowIconPath[] = ":/assets/images/linphone_logo.svg"; - static constexpr char ApplicationMinimalQtVersion[] = "5.10.0"; + static constexpr char WindowIconPath[] = ":/data/image/logo.svg"; + static constexpr char ApplicationMinimalQtVersion[] = "6.6.5"; static constexpr char DefaultConferenceURI[] = "sip:conference-factory@sip.linphone.org"; // Default for a Linphone account static constexpr char DefaultVideoConferenceURI[] = diff --git a/cmake/install/install.cmake b/cmake/install/install.cmake index 89a60edb9..0b3e100e0 100644 --- a/cmake/install/install.cmake +++ b/cmake/install/install.cmake @@ -25,18 +25,24 @@ cmake_minimum_required(VERSION 3.1) set(TARGET_NAME Linphone) if (GIT_EXECUTABLE AND NOT(LINPHONEAPP_VERSION)) - execute_process( - COMMAND ${GIT_EXECUTABLE} describe --always - OUTPUT_VARIABLE LINPHONEAPP_VERSION - OUTPUT_STRIP_TRAILING_WHITESPACE - WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../.." - ) + execute_process( + COMMAND ${GIT_EXECUTABLE} describe --always + OUTPUT_VARIABLE LINPHONEAPP_VERSION + OUTPUT_STRIP_TRAILING_WHITESPACE + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" + ) endif() if (NOT(LINPHONEAPP_VERSION)) set(LINPHONEAPP_VERSION "0.0.0") endif () +set(LINPHONE_MAJOR_VERSION) +set(LINPHONE_MINOR_VERSION) +set(LINPHONE_MICRO_VERSION) +set(LINPHONE_BRANCH_VERSION) +bc_parse_full_version(${LINPHONEAPP_VERSION} LINPHONE_MAJOR_VERSION LINPHONE_MINOR_VERSION LINPHONE_MICRO_VERSION LINPHONE_BRANCH_VERSION) + set(LINPHONE_VERSION ${LINPHONE_MAJOR_VERSION}.${LINPHONE_MINOR_VERSION}.${LINPHONE_MICRO_VERSION}) set(PACKAGE_VERSION "${LINPHONEAPP_VERSION}") diff --git a/external/linphone-sdk b/external/linphone-sdk index ff8f01d91..0a11d2b01 160000 --- a/external/linphone-sdk +++ b/external/linphone-sdk @@ -1 +1 @@ -Subproject commit ff8f01d91f4a37773541ef05fb3c29d759116264 +Subproject commit 0a11d2b01defb1fda8bf4cfef4388e65c4b71258