Skip to content

Commit 7885963

Browse files
committed
Upgrade to qt6
1 parent 8f3b88c commit 7885963

File tree

1 file changed

+28
-23
lines changed

1 file changed

+28
-23
lines changed

Dockerfile

Lines changed: 28 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -28,38 +28,33 @@ RUN \
2828
git \
2929
lcov \
3030
libexiv2-dev \
31+
libgtest-dev \
3132
libheif-dev \
3233
libopencv-dev \
33-
libqt5svg5-dev \
34-
libquazip5-dev \
34+
libqt6svg6-dev \
35+
libquazip1-qt6-dev \
3536
libraw-dev \
3637
libtiff-dev \
3738
libwebp-dev \
39+
libxkbcommon-dev \
3840
libzip-dev \
39-
qt5-qmake \
40-
qttools5-dev \
41-
qttools5-dev-tools && \
41+
qmake6 \
42+
qt6-declarative-dev-tools \
43+
qt6-svg-dev \
44+
qt6-tools-dev && \
4245
echo "**** install runtime dependencies ****" && \
4346
apt-get install -y --no-install-recommends \
4447
kimageformat-plugins \
4548
libexiv2-27 \
4649
libheif1 \
4750
libopencv-core406t64 \
4851
libopencv-imgproc406t64 \
49-
libquazip5-1t64 \
50-
libqt5concurrent5t64 \
51-
libqt5printsupport5t64 \
52-
libqt5svg5 \
52+
libquazip1-qt6-1t64 \
53+
libqt6concurrent6t64 \
54+
libqt6printsupport6t64 \
55+
libqt6svg6 \
5356
libraw23t64 \
54-
qt5-image-formats-plugins && \
55-
echo "**** compile heif plugin ****" && \
56-
mkdir -p /tmp/heif && \
57-
git clone https://github.com/jakar/qt-heif-image-plugin.git /tmp/heif && \
58-
mkdir -p /tmp/heif/build && \
59-
cd /tmp/heif/build && \
60-
cmake .. && \
61-
make && \
62-
make install && \
57+
qt6-image-formats-plugins && \
6358
echo "**** compile nomacs ****" && \
6459
if [ -z "${APP_VERSION}" ]; then \
6560
APP_VERSION=$(curl -sX GET https://api.github.com/repos/nomacs/nomacs/commits/master | jq -r '. | .sha' | cut -c1-8); \
@@ -70,7 +65,13 @@ RUN \
7065
git checkout "${APP_VERSION}" && \
7166
mkdir -p /tmp/nomacs/build && \
7267
cd /tmp/nomacs/build && \
73-
cmake ../ImageLounge/. && \
68+
cmake \
69+
-DENABLE_OPENCV=ON \
70+
-DENABLE_RAW=ON \
71+
-DENABLE_TIFF=ON \
72+
-DENABLE_QUAZIP=ON \
73+
-DENABLE_PLUGINS=ON \
74+
../ImageLounge/. && \
7475
make && \
7576
make install && \
7677
ldconfig && \
@@ -84,17 +85,21 @@ RUN \
8485
git \
8586
lcov \
8687
libexiv2-dev \
88+
libgtest-dev \
8789
libheif-dev \
8890
libopencv-dev \
89-
libqt5svg5-dev \
91+
libqt6svg6-dev \
92+
libquazip1-qt6-dev \
9093
libquazip5-dev \
9194
libraw-dev \
9295
libtiff-dev \
9396
libwebp-dev \
97+
libxkbcommon-dev \
9498
libzip-dev \
95-
qt5-qmake \
96-
qttools5-dev \
97-
qttools5-dev-tools && \
99+
qmake6 \
100+
qt6-declarative-dev-tools \
101+
qt6-svg-dev \
102+
qt6-tools-dev && \
98103
rm -rf \
99104
/tmp/* \
100105
/var/lib/apt/lists/* \

0 commit comments

Comments
 (0)