diff --git a/debian-base/Dockerfile b/debian-base/Dockerfile index 9454bc9..dd50ef1 100644 --- a/debian-base/Dockerfile +++ b/debian-base/Dockerfile @@ -15,7 +15,7 @@ RUN apt-get update && apt-get install -y subversion git zip unzip wget curl htop && rm -rf /var/cache/apt/archives/* # last cmake from sources, into /opt -ENV CUR_CMAKE_VERSION=4.3.2 +ENV CUR_CMAKE_VERSION=3.20.0 WORKDIR /soft RUN wget -nv https://github.com/Kitware/CMake/releases/download/v${CUR_CMAKE_VERSION}/cmake-${CUR_CMAKE_VERSION}-Linux-x86_64.sh \ && mkdir -p /opt/cmake \ diff --git a/windows/fftw.cmake.patch b/windows/fftw.cmake.patch index 5448149..d71c4a5 100644 --- a/windows/fftw.cmake.patch +++ b/windows/fftw.cmake.patch @@ -6,4 +6,4 @@ if (NOT DEFINED CMAKE_BUILD_TYPE) set (CMAKE_BUILD_TYPE Release CACHE STRING "Build type") - \ No newline at end of file + diff --git a/windows/qt-5.15.18-bluetooth-mingw.patch b/windows/qt-5.15.18-bluetooth-mingw.patch new file mode 100644 index 0000000..7462712 --- /dev/null +++ b/windows/qt-5.15.18-bluetooth-mingw.patch @@ -0,0 +1,11 @@ +--- qbluetoothservicediscoveryagent_win.cpp 2025-03-30 11:49:36.000000000 +0000 ++++ qbluetoothservicediscoveryagent_win.cpp.new 2026-05-06 11:18:55.546127656 +0000 +@@ -211,7 +211,7 @@ + #else + # define SDP_CALLBACK QT_WIN_CALLBACK + #endif +-static BOOL SDP_CALLBACK bluetoothSdpCallback(ULONG attributeId, LPBYTE valueStream, ULONG streamSize, LPVOID param) ++static BOOL SDP_CALLBACK __attribute__((stdcall)) bluetoothSdpCallback(ULONG attributeId, LPBYTE valueStream, ULONG streamSize, LPVOID param) + { + QBluetoothServiceInfo *result = static_cast(param); + diff --git a/windows/qt-5.15.18-location-mbgl-mapbox-include.patch b/windows/qt-5.15.18-location-mbgl-mapbox-include.patch new file mode 100644 index 0000000..d00aa8e --- /dev/null +++ b/windows/qt-5.15.18-location-mbgl-mapbox-include.patch @@ -0,0 +1,10 @@ +--- variant.hpp 2025-03-30 14:49:42.000000000 +0300 ++++ variant.hpp.new 2026-05-06 15:20:14.230916400 +0300 +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include + + #include + #include diff --git a/windows/qt-5.15.18-location-mbgl-rapidjson.patch b/windows/qt-5.15.18-location-mbgl-rapidjson.patch new file mode 100644 index 0000000..cca0ed6 --- /dev/null +++ b/windows/qt-5.15.18-location-mbgl-rapidjson.patch @@ -0,0 +1,11 @@ +--- document.h 2025-03-30 14:49:42.000000000 +0300 ++++ document.h.new 2026-05-06 15:15:34.964280900 +0300 +@@ -316,7 +316,7 @@ + + GenericStringRef(const GenericStringRef& rhs) : s(rhs.s), length(rhs.length) {} + +- GenericStringRef& operator=(const GenericStringRef& rhs) { s = rhs.s; length = rhs.length; } ++ GenericStringRef& operator=(const GenericStringRef& rhs) { s = rhs.s; const_cast(length) = rhs.length; } + + //! implicit conversion to plain CharType pointer + operator const Ch *() const { return s; } diff --git a/windows/qt-5.15.18-location-mbgl-util-include.patch b/windows/qt-5.15.18-location-mbgl-util-include.patch new file mode 100644 index 0000000..80f1b79 --- /dev/null +++ b/windows/qt-5.15.18-location-mbgl-util-include.patch @@ -0,0 +1,10 @@ +--- string.hpp 2025-03-30 14:49:42.000000000 +0300 ++++ string.hpp.new 2026-05-06 15:14:40.188710700 +0300 +@@ -5,6 +5,7 @@ + #include + #include + #include ++#include + + // Polyfill needed by Qt when building for Android with GCC + #if defined(__ANDROID__) && defined(__GLIBCXX__) diff --git a/windows/qt-5.15.18-qcollectiongenerator.patch b/windows/qt-5.15.18-qcollectiongenerator.patch new file mode 100644 index 0000000..9cde283 --- /dev/null +++ b/windows/qt-5.15.18-qcollectiongenerator.patch @@ -0,0 +1,11 @@ +--- main.c 2025-03-30 14:49:56.000000000 +0300 ++++ main.c.new 2026-05-06 15:35:17.502272400 +0300 +@@ -98,7 +98,7 @@ + + argv[0] = newPath; + #ifdef _WIN32 +- const intptr_t ret = _spawnvp(_P_WAIT, newPath, argv); ++ const intptr_t ret = _spawnvp(_P_WAIT, newPath, (const char * const*)argv); + if (ret == -1) { + fprintf(stderr, "Error while executing \"%s\" tool.\n", newPath); + return 3;