Alexey Dokuchaev
fd58e333c3
QOwnNotes now expects Botan 3 when built against the system Botan library due to the end of life of Botan 2, but there is a problem as Botan 3 requires C++20 which causes issues with Qt 5. To deal with this discrepancy, provide two flavors: Qt5/QMake-based which uses bundled Botan 2 amalgamation, and Qt6/CMake-based which uses Botan library from ports.
22 lines
913 B
C++
22 lines
913 B
C++
--- libraries/botan/botan.cpp.orig 2025-06-01 19:29:53 UTC
|
|
+++ libraries/botan/botan.cpp
|
|
@@ -6138,7 +6138,7 @@ uint64_t CPUID::CPUID_Data::detect_cpu_features(size_t
|
|
|
|
if (error == 0 && vector_type > 0) return CPUID::CPUID_ALTIVEC_BIT;
|
|
|
|
-#elif (defined(BOTAN_TARGET_OS_HAS_GETAUXVAL) || defined(BOTAN_TARGET_HAS_ELF_AUX_INFO)) && \
|
|
+#elif (defined(BOTAN_TARGET_OS_HAS_GETAUXVAL) || defined(BOTAN_TARGET_OS_HAS_ELF_AUX_INFO)) && \
|
|
defined(BOTAN_TARGET_ARCH_IS_PPC64)
|
|
|
|
enum PPC_hwcap_bit {
|
|
@@ -6223,8 +6223,7 @@ uint64_t CPUID::CPUID_Data::detect_cpu_features(size_t
|
|
#include <intrin.h>
|
|
#elif defined(BOTAN_BUILD_COMPILER_IS_INTEL)
|
|
#include <ia32intrin.h>
|
|
-#elif defined(BOTAN_BUILD_COMPILER_IS_GCC) && (BOTAN_GCC_VERSION >= 430)
|
|
- // Only available starting in GCC 4.3
|
|
+#elif defined(BOTAN_BUILD_COMPILER_IS_GCC) || defined(BOTAN_BUILD_COMPILER_IS_CLANG)
|
|
#include <cpuid.h>
|
|
|
|
namespace {
|