diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile index 1cb5868dd8..04bd9beb54 100644 --- a/Telegram/build/docker/centos_env/Dockerfile +++ b/Telegram/build/docker/centos_env/Dockerfile @@ -52,7 +52,7 @@ RUN git clone {{ GIT }}/desktop-app/patches.git \ && rm -rf .git FROM builder AS extra-cmake-modules -RUN git clone -b v5.97.0 --depth=1 {{ GIT }}/KDE/extra-cmake-modules.git \ +RUN git clone -b v5.98.0 --depth=1 {{ GIT }}/KDE/extra-cmake-modules.git \ && cd extra-cmake-modules \ && cmake -GNinja -B build . -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF \ && cmake --build build --parallel \ @@ -605,8 +605,9 @@ COPY --link --from=openssl {{ LibrariesPath }}/openssl-cache / COPY --link --from=xkbcommon {{ LibrariesPath }}/xkbcommon-cache / COPY --link --from=qt {{ LibrariesPath }}/qt-cache / -RUN git clone -b v5.97.0 --depth=1 {{ GIT }}/KDE/kcoreaddons.git \ +RUN git clone -b v5.98.0 --depth=1 {{ GIT }}/KDE/kcoreaddons.git \ && cd kcoreaddons \ + && curl -sSL https://invent.kde.org/frameworks/kcoreaddons/-/merge_requests/258.patch | git apply \ && cmake -GNinja -B build . \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_PREFIX_PATH={{ QT_PREFIX }} \ diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 1ae6b18b4f..4512533b22 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -200,7 +200,7 @@ parts: extra-cmake-modules: source: https://github.com/KDE/extra-cmake-modules.git source-depth: 1 - source-tag: v5.97.0 + source-tag: v5.98.0 plugin: cmake cmake-parameters: - -DCMAKE_BUILD_TYPE=Release @@ -230,7 +230,7 @@ parts: kcoreaddons: source: https://github.com/KDE/kcoreaddons.git source-depth: 1 - source-tag: v5.97.0 + source-tag: v5.98.0 plugin: cmake cmake-parameters: - -DCMAKE_BUILD_TYPE=Release @@ -238,6 +238,9 @@ parts: - -DBUILD_TESTING=OFF - -DBUILD_WITH_QT6=ON - -DEXCLUDE_DEPRECATED_BEFORE_AND_AT=5.78.0 + override-pull: | + snapcraftctl pull + curl -sSL https://invent.kde.org/frameworks/kcoreaddons/-/merge_requests/258.patch | git apply prime: - -./usr/bin - -./usr/include