Avoid building qttools
Removing po folder from kcoreaddons allows that
This commit is contained in:
parent
b36063e086
commit
4975254cc1
|
@ -558,7 +558,6 @@ ENV OPENSSL_ROOT_DIR {{ OPENSSL_PREFIX }}
|
||||||
RUN git clone -b {{ QT_TAG }} --depth=1 git://code.qt.io/qt/qt5.git qt_{{ QT }} \
|
RUN git clone -b {{ QT_TAG }} --depth=1 git://code.qt.io/qt/qt5.git qt_{{ QT }} \
|
||||||
&& cd qt_{{ QT }} \
|
&& cd qt_{{ QT }} \
|
||||||
&& git submodule update --init --recursive --depth=1 qtbase qtwayland qtimageformats qtsvg qt5compat \
|
&& git submodule update --init --recursive --depth=1 qtbase qtwayland qtimageformats qtsvg qt5compat \
|
||||||
&& git submodule update --init --recursive qttools \
|
|
||||||
&& cd qtbase \
|
&& cd qtbase \
|
||||||
&& find ../../patches/qtbase_{{ QT }} -type f -print0 | sort -z | xargs -r0 git apply \
|
&& find ../../patches/qtbase_{{ QT }} -type f -print0 | sort -z | xargs -r0 git apply \
|
||||||
&& cd .. \
|
&& cd .. \
|
||||||
|
@ -608,6 +607,7 @@ COPY --link --from=qt {{ LibrariesPath }}/qt-cache /
|
||||||
RUN git clone -b v5.98.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 \
|
&& curl -sSL https://invent.kde.org/frameworks/kcoreaddons/-/merge_requests/258.patch | git apply \
|
||||||
|
&& rm -rf po \
|
||||||
&& 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 }} \
|
||||||
|
|
|
@ -241,6 +241,7 @@ parts:
|
||||||
override-pull: |
|
override-pull: |
|
||||||
snapcraftctl pull
|
snapcraftctl pull
|
||||||
curl -sSL https://invent.kde.org/frameworks/kcoreaddons/-/merge_requests/258.patch | git apply
|
curl -sSL https://invent.kde.org/frameworks/kcoreaddons/-/merge_requests/258.patch | git apply
|
||||||
|
rm -rf po
|
||||||
prime:
|
prime:
|
||||||
- -./usr/bin
|
- -./usr/bin
|
||||||
- -./usr/include
|
- -./usr/include
|
||||||
|
@ -250,7 +251,6 @@ parts:
|
||||||
after:
|
after:
|
||||||
- extra-cmake-modules
|
- extra-cmake-modules
|
||||||
- desktop-qt
|
- desktop-qt
|
||||||
- qttools
|
|
||||||
|
|
||||||
mozjpeg:
|
mozjpeg:
|
||||||
source: https://github.com/mozilla/mozjpeg.git
|
source: https://github.com/mozilla/mozjpeg.git
|
||||||
|
@ -446,22 +446,6 @@ parts:
|
||||||
- openssl
|
- openssl
|
||||||
- patches
|
- patches
|
||||||
|
|
||||||
qttools:
|
|
||||||
source: git://code.qt.io/qt/qttools.git
|
|
||||||
source-depth: 1
|
|
||||||
source-tag: v6.4.0-rc1
|
|
||||||
plugin: cmake
|
|
||||||
build-packages:
|
|
||||||
- clang
|
|
||||||
- libclang-dev
|
|
||||||
- llvm-dev
|
|
||||||
cmake-parameters:
|
|
||||||
- -DCMAKE_BUILD_TYPE=Release
|
|
||||||
- -DCMAKE_INSTALL_PREFIX=/usr
|
|
||||||
prime: [-./*]
|
|
||||||
after:
|
|
||||||
- qt
|
|
||||||
|
|
||||||
rnnoise:
|
rnnoise:
|
||||||
source: https://gitlab.xiph.org/xiph/rnnoise.git
|
source: https://gitlab.xiph.org/xiph/rnnoise.git
|
||||||
source-depth: 1
|
source-depth: 1
|
||||||
|
|
Loading…
Reference in New Issue