Update kcoreaddons to 5.98.0
And patch to cache portal result
This commit is contained in:
parent
645ae69220
commit
b36063e086
|
@ -52,7 +52,7 @@ RUN git clone {{ GIT }}/desktop-app/patches.git \
|
||||||
&& rm -rf .git
|
&& rm -rf .git
|
||||||
|
|
||||||
FROM builder AS extra-cmake-modules
|
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 \
|
&& cd extra-cmake-modules \
|
||||||
&& cmake -GNinja -B build . -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF \
|
&& cmake -GNinja -B build . -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF \
|
||||||
&& cmake --build build --parallel \
|
&& 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=xkbcommon {{ LibrariesPath }}/xkbcommon-cache /
|
||||||
COPY --link --from=qt {{ LibrariesPath }}/qt-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 \
|
&& cd kcoreaddons \
|
||||||
|
&& curl -sSL https://invent.kde.org/frameworks/kcoreaddons/-/merge_requests/258.patch | git apply \
|
||||||
&& cmake -GNinja -B build . \
|
&& cmake -GNinja -B build . \
|
||||||
-DCMAKE_BUILD_TYPE=Release \
|
-DCMAKE_BUILD_TYPE=Release \
|
||||||
-DCMAKE_PREFIX_PATH={{ QT_PREFIX }} \
|
-DCMAKE_PREFIX_PATH={{ QT_PREFIX }} \
|
||||||
|
|
|
@ -200,7 +200,7 @@ parts:
|
||||||
extra-cmake-modules:
|
extra-cmake-modules:
|
||||||
source: https://github.com/KDE/extra-cmake-modules.git
|
source: https://github.com/KDE/extra-cmake-modules.git
|
||||||
source-depth: 1
|
source-depth: 1
|
||||||
source-tag: v5.97.0
|
source-tag: v5.98.0
|
||||||
plugin: cmake
|
plugin: cmake
|
||||||
cmake-parameters:
|
cmake-parameters:
|
||||||
- -DCMAKE_BUILD_TYPE=Release
|
- -DCMAKE_BUILD_TYPE=Release
|
||||||
|
@ -230,7 +230,7 @@ parts:
|
||||||
kcoreaddons:
|
kcoreaddons:
|
||||||
source: https://github.com/KDE/kcoreaddons.git
|
source: https://github.com/KDE/kcoreaddons.git
|
||||||
source-depth: 1
|
source-depth: 1
|
||||||
source-tag: v5.97.0
|
source-tag: v5.98.0
|
||||||
plugin: cmake
|
plugin: cmake
|
||||||
cmake-parameters:
|
cmake-parameters:
|
||||||
- -DCMAKE_BUILD_TYPE=Release
|
- -DCMAKE_BUILD_TYPE=Release
|
||||||
|
@ -238,6 +238,9 @@ parts:
|
||||||
- -DBUILD_TESTING=OFF
|
- -DBUILD_TESTING=OFF
|
||||||
- -DBUILD_WITH_QT6=ON
|
- -DBUILD_WITH_QT6=ON
|
||||||
- -DEXCLUDE_DEPRECATED_BEFORE_AND_AT=5.78.0
|
- -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:
|
prime:
|
||||||
- -./usr/bin
|
- -./usr/bin
|
||||||
- -./usr/include
|
- -./usr/include
|
||||||
|
|
Loading…
Reference in New Issue