From ef755697470e37574b3795de53c645dfe00deaf7 Mon Sep 17 00:00:00 2001 From: tmadlener Date: Mon, 11 Nov 2024 19:34:58 +0100 Subject: [PATCH] Qt5: Fix repository and switch to version that can be built --- ilcsoft/qt5.py | 4 ++-- releases/v02-03/release-versions.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ilcsoft/qt5.py b/ilcsoft/qt5.py index b0cd33a8..77ea80ba 100644 --- a/ilcsoft/qt5.py +++ b/ilcsoft/qt5.py @@ -23,7 +23,7 @@ def __init__(self, userInput): self.hasCMakeFindSupport = True self.download.supportHEAD = False self.download.supportedTypes = [ "git" ] - self.download.svnurl = 'https://github.com/qt/qt5.git' + self.download.svnurl = 'https://code.qt.io/qt/qt5.git' self.reqfiles = [ ["lib/libQt5Core.so", "lib64/libQt5Core.so", "lib/libQt5Core.dylib", "lib/libQt5Core.la"], @@ -95,7 +95,7 @@ def compile(self): qt_cfg_options = " -opensource -confirm-license -nomake tests -make libs " cxxStandard = self.envcmake.get("CMAKE_CXX_STANDARD", None) if cxxStandard: - qt_cfg_options += " -c++std c++" + str(cxxStandard) + qt_cfg_options += " -c++std c++17" if( os_system( "../" + self.name + "/configure -prefix " + self.installPath + qt_cfg_options + " 2>&1 | tee -a " + self.logfile ) != 0 ): diff --git a/releases/v02-03/release-versions.py b/releases/v02-03/release-versions.py index 158a7252..2bcce43f 100644 --- a/releases/v02-03/release-versions.py +++ b/releases/v02-03/release-versions.py @@ -116,7 +116,7 @@ GSL_version = "2.7" -Qt5_version = "v5.13.1" +Qt5_version = "v5.15.15-lts-lgpl" CMake_version = "3.31.0"