diff options
| -rw-r--r-- | Dockerfile.android | 2 | ||||
| -rw-r--r-- | Dockerfile.linux | 2 | ||||
| -rw-r--r-- | Dockerfile.windows | 2 | ||||
| -rw-r--r-- | README.md | 6 | ||||
| -rw-r--r-- | src/p2pool/P2PoolManager.cpp | 24 |
5 files changed, 18 insertions, 18 deletions
diff --git a/Dockerfile.android b/Dockerfile.android index 9d1e9ab9..7e3189cc 100644 --- a/Dockerfile.android +++ b/Dockerfile.android @@ -5,7 +5,7 @@ ARG ANDROID_NDK_REVISION=23c ARG ANDROID_NDK_HASH=e5053c126a47e84726d9f7173a04686a71f9a67a ARG ANDROID_SDK_REVISION=7302050_latest ARG ANDROID_SDK_HASH=7a00faadc0864f78edd8f4908a629a46d622375cbe2e5814e82934aebecdb622 -ARG QT_VERSION=v5.15.18-lts-lgpl +ARG QT_VERSION=v5.15.19-lts-lgpl WORKDIR /opt/android ENV WORKDIR=/opt/android diff --git a/Dockerfile.linux b/Dockerfile.linux index f6f75cef..dc5795cf 100644 --- a/Dockerfile.linux +++ b/Dockerfile.linux @@ -1,7 +1,7 @@ FROM ubuntu:18.04 ARG THREADS=1 -ARG QT_VERSION=v5.15.18-lts-lgpl +ARG QT_VERSION=v5.15.19-lts-lgpl ENV CFLAGS="-fPIC" ENV CPPFLAGS="-fPIC" diff --git a/Dockerfile.windows b/Dockerfile.windows index aaf4e4d6..07542705 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -1,7 +1,7 @@ FROM ubuntu:20.04 ARG THREADS=1 -ARG QT_VERSION=v5.15.18-lts-lgpl +ARG QT_VERSION=v5.15.19-lts-lgpl ENV SOURCE_DATE_EPOCH=1397818193 RUN apt update && \ @@ -219,9 +219,9 @@ Packaging for your favorite distribution would be a welcome contribution! 2. Install Qt: - *Note*: The Qt 5.9.7 or newer requirement makes **some** distributions (mostly based on Debian, like Ubuntu 16.x or Linux Mint 18.x) obsolete due to their repositories containing an older Qt version. + *Note*: The Qt 5.12 or newer requirement makes **some** distributions (mostly based on Debian, like Ubuntu 16.x or Linux Mint 18.x) obsolete due to their repositories containing an older Qt version. - The recommended way is to install 5.9.7 from the [official Qt installer](https://www.qt.io/download-qt-installer) or [compiling it yourself](https://wiki.qt.io/Install_Qt_5_on_Ubuntu). This ensures you have the correct version. Higher versions *can* work but as it differs from our production build target, slight differences may occur. + The recommended way is to install 5.12 or newer from the [official Qt installer](https://www.qt.io/download-qt-installer) or [compiling it yourself](https://wiki.qt.io/Install_Qt_5_on_Ubuntu). This ensures you have the correct version. Higher versions *can* work but as it differs from our production build target, slight differences may occur. The following instructions will fetch Qt from your distribution's repositories instead. Take note of what version it installs. Your mileage may vary. @@ -277,7 +277,7 @@ The executable can be found in the build/release/bin folder. 4. Install Qt: - `brew install qt5` (or download QT 5.9.7+ from [qt.io](https://www.qt.io/download-open-source/)) + `brew install qt5` (or download QT 5.12+ from [qt.io](https://www.qt.io/download-open-source/)) 5. Grab an up-to-date copy of the monero-gui repository diff --git a/src/p2pool/P2PoolManager.cpp b/src/p2pool/P2PoolManager.cpp index cf1af558..83524c1f 100644 --- a/src/p2pool/P2PoolManager.cpp +++ b/src/p2pool/P2PoolManager.cpp @@ -55,21 +55,21 @@ void P2PoolManager::download() { QString fileName; QString validHash; #ifdef Q_OS_WIN - url = "https://github.com/SChernykh/p2pool/releases/download/v4.15/p2pool-v4.15-windows-x64.zip"; - fileName = m_p2poolPath + "/p2pool-v4.15-windows-x64.zip"; - validHash = "c131d1ebf8658780f632276db587866f9e0d6d7952c04135fb0559c76249541e"; + url = "https://github.com/SChernykh/p2pool/releases/download/v4.15.1/p2pool-v4.15.1-windows-x64.zip"; + fileName = m_p2poolPath + "/p2pool-v4.15.1-windows-x64.zip"; + validHash = "97b4ba97e65d766ecf223694168b5739e65156390707fbf50f9979054cba52d3"; #elif defined(Q_OS_LINUX) - url = "https://github.com/SChernykh/p2pool/releases/download/v4.15/p2pool-v4.15-linux-x64.tar.gz"; - fileName = m_p2poolPath + "/p2pool-v4.15-linux-x64.tar.gz"; - validHash = "1611a159b4f60e12d9dc9650597cbe831961a123621216349d764f620cdff34b"; + url = "https://github.com/SChernykh/p2pool/releases/download/v4.15.1/p2pool-v4.15.1-linux-x64.tar.gz"; + fileName = m_p2poolPath + "/p2pool-v4.15.1-linux-x64.tar.gz"; + validHash = "efd8b23579774711a5b86743da980e0936b7c220894063296719116d7f9ba254"; #elif defined(Q_OS_MACOS_AARCH64) - url = "https://github.com/SChernykh/p2pool/releases/download/v4.15/p2pool-v4.15-macos-aarch64.tar.gz"; - fileName = m_p2poolPath + "/p2pool-v4.15-macos-aarch64.tar.gz"; - validHash = "14211494a9d0adce8547c77eb75c5f86f8608dfbb4fa0e80b1967ece0dc916b5"; + url = "https://github.com/SChernykh/p2pool/releases/download/v4.15.1/p2pool-v4.15.1-macos-aarch64.tar.gz"; + fileName = m_p2poolPath + "/p2pool-v4.15.1-macos-aarch64.tar.gz"; + validHash = "391c55474c3f08994340df2824a0b452dac8e0d18ee43cf3b361ce80f00dcd5b"; #elif defined(Q_OS_MACOS) - url = "https://github.com/SChernykh/p2pool/releases/download/v4.15/p2pool-v4.15-macos-x64.tar.gz"; - fileName = m_p2poolPath + "/p2pool-v4.15-macos-x64.tar.gz"; - validHash = "a358489a4b1a6addfcc86ff235a0ce50210899f5e3a6dc93ce0eb69e0d181564"; + url = "https://github.com/SChernykh/p2pool/releases/download/v4.15.1/p2pool-v4.15.1-macos-x64.tar.gz"; + fileName = m_p2poolPath + "/p2pool-v4.15.1-macos-x64.tar.gz"; + validHash = "0e113c9beff21001ded4a15a3ae2f5ce8a151d18457476923026b322113bc1de"; #endif QFile file(fileName); epee::net_utils::http::http_simple_client http_client; |