diff --git a/mob.ini b/mob.ini index 1433ada..c5bf2f9 100644 --- a/mob.ini +++ b/mob.ini @@ -103,14 +103,14 @@ gtest = main libloot = 0.19.4 lz4 = v1.9.4 nmm = 0.71.2 -openssl = 1.1.1u -pyqt = 6.5.1 -pyqt_builder = 1.15.1 -pyqt_sip = 13.5.1 +openssl = 3.1.2 +pyqt = 6.5.2 +pyqt_builder = 1.15.2 +pyqt_sip = 13.5.2 python = v3.10.12 pybind11 = v2.10.4 bzip2 = 1.0.8 -sip = 6.7.1 +sip = 6.7.11 spdlog = v1.10.0 qt = 6.5.2 qt_vs = 2019 diff --git a/src/tasks/openssl.cpp b/src/tasks/openssl.cpp index e2e7d49..c5ecba7 100644 --- a/src/tasks/openssl.cpp +++ b/src/tasks/openssl.cpp @@ -20,13 +20,13 @@ url prebuilt_url() return make_prebuilt_url("openssl-prebuilt-" + openssl::version() + ".7z"); } -std::string version_no_patch_underscores() +std::string version_no_patch_underscores(bool primaryOnly = true) { auto v = openssl::parsed_version(); std::string s = v.major; - if (v.minor != "") + if (v.minor != "" && !primaryOnly) s += "_" + v.minor; return s;