Merge pull request #4521

2ae9d3f build: prepare v0.18.4.4 (selsta)

CMakeLists.txt

@@ -5,7 +5,7 @@ message(STATUS "Initiating compile using CMake ${CMAKE_VERSION}")
 
 set(VERSION_MAJOR "18")
 set(VERSION_MINOR "4")
-set(VERSION_REVISION "3")
+set(VERSION_REVISION "4")
 set(VERSION "0.${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}")
 
 option(STATIC "Link libraries statically, requires static Qt")

Dockerfile.windows

@@ -12,9 +12,9 @@ RUN apt update && \
 RUN update-alternatives --set x86_64-w64-mingw32-g++ $(which x86_64-w64-mingw32-g++-posix) && \
     update-alternatives --set x86_64-w64-mingw32-gcc $(which x86_64-w64-mingw32-gcc-posix)
 
-RUN git clone -b v0.18.4.3 --depth 1 https://github.com/monero-project/monero && \
+RUN git clone -b v0.18.4.4 --depth 1 https://github.com/monero-project/monero && \
     cd monero && \
-    git reset --hard 7c6e84466a90f6701ebe09ff8f61ea8af3883181 && \
+    git reset --hard 516e5355a103a2bf0b7e10328ebcaa2945019445 && \
     cp -a contrib/depends / && \
     cd .. && \
     rm -rf monero

README.md

@@ -105,7 +105,7 @@ Packaging for your favorite distribution would be a welcome contribution!
    ```
    git clone --branch master --recursive https://github.com/monero-project/monero-gui.git
    ```
-   \* `master` - replace with the desired version tag (e.g. `v0.18.4.3`) to build the release binaries.
+   \* `master` - replace with the desired version tag (e.g. `v0.18.4.4`) to build the release binaries.
 3. Prepare build environment
    ```
    cd monero-gui
@@ -128,7 +128,7 @@ Packaging for your favorite distribution would be a welcome contribution!
    ```
    git clone --branch master --recursive https://github.com/monero-project/monero-gui.git
    ```
-   \* `master` - replace with the desired version tag (e.g. `v0.18.4.3`) to build the release binaries.
+   \* `master` - replace with the desired version tag (e.g. `v0.18.4.4`) to build the release binaries.
 3. Prepare build environment
    ```
    cd monero-gui

cmake/Deploy.cmake

@@ -99,11 +99,11 @@ if(APPLE OR (WIN32 AND NOT STATIC))
             libssl-3-x64.dll
             libcrypto-3-x64.dll
             #icu
-            libicudt77.dll
+            libicudt78.dll
-            libicuin77.dll
+            libicuin78.dll
-            libicuio77.dll
+            libicuio78.dll
-            libicutu77.dll
+            libicutu78.dll
-            libicuuc77.dll
+            libicuuc78.dll
         )
 
         # Boost Regex is header-only since 1.77

src/p2pool/P2PoolManager.cpp

@@ -53,21 +53,21 @@ void P2PoolManager::download() {
         QString fileName;
         QString validHash;
         #ifdef Q_OS_WIN
-            url = "https://github.com/SChernykh/p2pool/releases/download/v4.11/p2pool-v4.11-windows-x64.zip";
+            url = "https://github.com/SChernykh/p2pool/releases/download/v4.12/p2pool-v4.12-windows-x64.zip";
-            fileName = m_p2poolPath + "/p2pool-v4.11-windows-x64.zip";
+            fileName = m_p2poolPath + "/p2pool-v4.12-windows-x64.zip";
-            validHash = "7b3851f4a74e3729e17a0601c9bde77bcf849e8a6528ad5829417d034989cf75";
+            validHash = "4ceb1c9f5772f79e3ded081ba1ea3c161586bcbe78863c794659861afde85f24";
         #elif defined(Q_OS_LINUX)
-            url = "https://github.com/SChernykh/p2pool/releases/download/v4.11/p2pool-v4.11-linux-x64.tar.gz";
+            url = "https://github.com/SChernykh/p2pool/releases/download/v4.12/p2pool-v4.12-linux-x64.tar.gz";
-            fileName = m_p2poolPath + "/p2pool-v4.11-linux-x64.tar.gz";
+            fileName = m_p2poolPath + "/p2pool-v4.12-linux-x64.tar.gz";
-            validHash = "57754a4d3ed964314b2ec5c98a64d6ca76ba0062239115859949d0f67d91edb0";
+            validHash = "4a95c5d4ff20d6d8042fea3cb4a8d10a687e980278aa8a36ec0d5fb1e5c395c2";
         #elif defined(Q_OS_MACOS_AARCH64)
-            url = "https://github.com/SChernykh/p2pool/releases/download/v4.11/p2pool-v4.11-macos-aarch64.tar.gz";
+            url = "https://github.com/SChernykh/p2pool/releases/download/v4.12/p2pool-v4.12-macos-aarch64.tar.gz";
-            fileName = m_p2poolPath + "/p2pool-v4.11-macos-aarch64.tar.gz";
+            fileName = m_p2poolPath + "/p2pool-v4.12-macos-aarch64.tar.gz";
-            validHash = "51fe9680fb2a80e8fc29a4401655f40b508f38e8aff1ae94a4399c5a036ab370";
+            validHash = "6f4a9ea650d0cf3afd36d33215c8d2a66c2d3837c9e1a2943bc61b0f68b314f5";
         #elif defined(Q_OS_MACOS)
-            url = "https://github.com/SChernykh/p2pool/releases/download/v4.11/p2pool-v4.11-macos-x64.tar.gz";
+            url = "https://github.com/SChernykh/p2pool/releases/download/v4.12/p2pool-v4.12-macos-x64.tar.gz";
-            fileName = m_p2poolPath + "/p2pool-v4.11-macos-x64.tar.gz";
+            fileName = m_p2poolPath + "/p2pool-v4.12-macos-x64.tar.gz";
-            validHash = "53470b203209837336e60933bda9e2ba4ae179aef4ec773abb76d6f9b64023f5";
+            validHash = "f3174f852cecd600e067ec5e91d8d59fc1511aca0d25344637926cfba288efad";
         #endif
         QFile file(fileName);
         epee::net_utils::http::http_simple_client http_client;