Skip to content

Commit 8c00ab3

Browse files
CyanoHaoCyanoHao
committed
update Qt to 5.15.14; remove dependency of libwayland-server and zstd; add qttranslations
1 parent e7a9f7d commit 8c00ab3

3 files changed

Lines changed: 30 additions & 87 deletions

File tree

‎aarch64/Dockerfile‎

Lines changed: 11 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ RUN yum-config-manager --enable ol7_optional_latest && \
99
yum upgrade -y && \
1010
yum install -y \
1111
# general devtools
12-
devtoolset-7-gcc devtoolset-7-gcc-c++ make \
12+
devtoolset-9-gcc devtoolset-9-gcc-c++ make \
1313
# squashfs-tools libs
1414
libzstd-devel \
1515
# Qt build tools
@@ -21,15 +21,15 @@ RUN yum-config-manager --enable ol7_optional_latest && \
2121
git && \
2222
yum clean all
2323

24-
ARG DEVTOOLSET_ROOTPATH=/opt/rh/devtoolset-7/root
24+
ARG DEVTOOLSET_ROOTPATH=/opt/rh/devtoolset-9/root
2525
ENV PATH=/opt/qt/bin:${DEVTOOLSET_ROOTPATH}/usr/bin:${PATH}
2626
ENV LD_LIBRARY_PATH=${DEVTOOLSET_ROOTPATH}/usr/lib64
2727

28-
ARG SQUASHFS_TOOLS_VERSION=4.4
28+
ARG SQUASHFS_TOOLS_VERSION=4.6.1
2929
ARG QT_MAJOR_MINOR=5.15
30-
ARG QT_PATCH=12
30+
ARG QT_PATCH=14
3131
ARG QT_VERSION=${QT_MAJOR_MINOR}.${QT_PATCH}
32-
ARG FCITX5_QT_VERSION=5.0.17
32+
ARG FCITX5_QT_VERSION=5.1.6
3333

3434
# AppImage runtime
3535
RUN curl -L -o /opt/appimage-runtime 'https://github.com/AppImage/type2-runtime/releases/download/continuous/runtime-aarch64'
@@ -49,15 +49,17 @@ RUN mkdir -p /build/squashfs-tools && \
4949
# Qt 5
5050
RUN mkdir -p /build/qt5 && \
5151
cd /build/qt5 && \
52-
curl -L -O "https://download.qt.io/archive/qt/${QT_MAJOR_MINOR}/${QT_VERSION}/submodules/qt{base,svg,tools,wayland}-everywhere-opensource-src-${QT_VERSION}.tar.xz" && \
53-
tar xf qtbase-everywhere-opensource-src-${QT_VERSION}.tar.xz && \
54-
cd qtbase-everywhere-src-${QT_VERSION} && \
52+
curl -L -O "https://download.qt.io/archive/qt/${QT_MAJOR_MINOR}/${QT_VERSION}/single/qt-everywhere-opensource-src-${QT_VERSION}.tar.xz" && \
53+
tar xf qt-everywhere-opensource-src-${QT_VERSION}.tar.xz && \
54+
cd qt-everywhere-src-${QT_VERSION} && \
55+
ls | grep ^qt | grep -vE 'qt(\.pro|base|svg|tools|wayland|translations)' | xargs rm -r && \
5556
./configure \
5657
-prefix /opt/qt \
5758
-opensource -confirm-license \
5859
-optimize-size -static -platform linux-g++ -linker bfd \
60+
-no-feature-wayland-server \
5961
-nomake examples -nomake tests -nomake tools -dbus-linked \
60-
-qt-doubleconversion -no-glib -eventfd -inotify -iconv -no-icu -no-mimetype-database -qt-pcre -qt-zlib \
62+
-qt-doubleconversion -no-glib -eventfd -inotify -iconv -no-icu -no-mimetype-database -qt-pcre -qt-zlib -no-zstd \
6163
-no-openssl \
6264
-no-cups -fontconfig -system-freetype -qt-harfbuzz -no-gtk -no-opengl -xcb-xlib \
6365
-xcb \
@@ -66,27 +68,6 @@ RUN mkdir -p /build/qt5 && \
6668
-sql-sqlite -qt-sqlite && \
6769
make -j$(nproc) && \
6870
make install && \
69-
# svg package
70-
cd /build/qt5 && \
71-
tar xf qtsvg-everywhere-opensource-src-${QT_VERSION}.tar.xz && \
72-
cd qtsvg-everywhere-src-${QT_VERSION} && \
73-
qmake . && \
74-
make -j$(nproc) && \
75-
make install && \
76-
# tools package
77-
cd /build/qt5 && \
78-
tar xf qttools-everywhere-opensource-src-${QT_VERSION}.tar.xz && \
79-
cd qttools-everywhere-src-${QT_VERSION} && \
80-
qmake . && \
81-
make -j$(nproc) && \
82-
make install && \
83-
# wayland package
84-
cd /build/qt5 && \
85-
tar xf qtwayland-everywhere-opensource-src-${QT_VERSION}.tar.xz && \
86-
cd qtwayland-everywhere-src-${QT_VERSION} && \
87-
qmake . && \
88-
make -j$(nproc) && \
89-
make install && \
9071
# cleanup
9172
cd / && \
9273
rm -r /build/qt5

‎riscv64/Dockerfile‎

Lines changed: 8 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -24,25 +24,27 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
2424
ENV PATH=/opt/qt/bin:${PATH}
2525

2626
ARG QT_MAJOR_MINOR=5.15
27-
ARG QT_PATCH=12
27+
ARG QT_PATCH=14
2828
ARG QT_VERSION=${QT_MAJOR_MINOR}.${QT_PATCH}
29-
ARG FCITX5_QT_VERSION=5.0.17
29+
ARG FCITX5_QT_VERSION=5.1.6
3030

3131
# AppImage runtime
3232
RUN curl -L -o /opt/appimage-runtime 'https://github.com/cyano-linux/appimage-riscv64/releases/download/20230808.0/runtime-riscv64'
3333

3434
# Qt 5
3535
RUN mkdir -p /build/qt5 && \
3636
cd /build/qt5 && \
37-
curl -L -O "https://download.qt.io/archive/qt/${QT_MAJOR_MINOR}/${QT_VERSION}/submodules/qt{base,svg,tools,wayland}-everywhere-opensource-src-${QT_VERSION}.tar.xz" && \
38-
tar xf qtbase-everywhere-opensource-src-${QT_VERSION}.tar.xz && \
39-
cd qtbase-everywhere-src-${QT_VERSION} && \
37+
curl -L -O "https://download.qt.io/archive/qt/${QT_MAJOR_MINOR}/${QT_VERSION}/single/qt-everywhere-opensource-src-${QT_VERSION}.tar.xz" && \
38+
tar xf qt-everywhere-opensource-src-${QT_VERSION}.tar.xz && \
39+
cd qt-everywhere-src-${QT_VERSION} && \
40+
ls | grep ^qt | grep -vE 'qt(\.pro|base|svg|tools|wayland|translations)' | xargs rm -r && \
4041
./configure \
4142
-prefix /opt/qt \
4243
-opensource -confirm-license \
4344
-optimize-size -static -platform linux-g++ -linker bfd \
45+
-no-feature-wayland-server \
4446
-nomake examples -nomake tests -nomake tools -dbus-linked \
45-
-qt-doubleconversion -no-glib -eventfd -inotify -iconv -no-icu -no-mimetype-database -qt-pcre -qt-zlib \
47+
-qt-doubleconversion -no-glib -eventfd -inotify -iconv -no-icu -no-mimetype-database -qt-pcre -qt-zlib -no-zstd \
4648
-no-openssl \
4749
-no-cups -fontconfig -system-freetype -qt-harfbuzz -no-gtk -no-opengl -xcb-xlib \
4850
-xcb \
@@ -51,27 +53,6 @@ RUN mkdir -p /build/qt5 && \
5153
-sql-sqlite -qt-sqlite && \
5254
make -j$(nproc) && \
5355
make install && \
54-
# svg package
55-
cd /build/qt5 && \
56-
tar xf qtsvg-everywhere-opensource-src-${QT_VERSION}.tar.xz && \
57-
cd qtsvg-everywhere-src-${QT_VERSION} && \
58-
qmake . && \
59-
make -j$(nproc) && \
60-
make install && \
61-
# tools package
62-
cd /build/qt5 && \
63-
tar xf qttools-everywhere-opensource-src-${QT_VERSION}.tar.xz && \
64-
cd qttools-everywhere-src-${QT_VERSION} && \
65-
qmake . && \
66-
make -j$(nproc) && \
67-
make install && \
68-
# wayland package
69-
cd /build/qt5 && \
70-
tar xf qtwayland-everywhere-opensource-src-${QT_VERSION}.tar.xz && \
71-
cd qtwayland-everywhere-src-${QT_VERSION} && \
72-
qmake . && \
73-
make -j$(nproc) && \
74-
make install && \
7556
# cleanup
7657
cd / && \
7758
rm -r /build/qt5

‎x86_64/Dockerfile‎

Lines changed: 11 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ RUN yum install -y centos-release-scl-rh epel-release && \
77
yum upgrade -y && \
88
yum install -y \
99
# general devtools
10-
devtoolset-7-gcc devtoolset-7-gcc-c++ make \
10+
devtoolset-9-gcc devtoolset-9-gcc-c++ make \
1111
# squashfs-tools libs
1212
libzstd-devel \
1313
# Qt build tools
@@ -19,15 +19,15 @@ RUN yum install -y centos-release-scl-rh epel-release && \
1919
git && \
2020
yum clean all
2121

22-
ARG DEVTOOLSET_ROOTPATH=/opt/rh/devtoolset-7/root
22+
ARG DEVTOOLSET_ROOTPATH=/opt/rh/devtoolset-9/root
2323
ENV PATH=/opt/qt/bin:${DEVTOOLSET_ROOTPATH}/usr/bin:${PATH}
2424
ENV LD_LIBRARY_PATH=${DEVTOOLSET_ROOTPATH}/usr/lib64
2525

26-
ARG SQUASHFS_TOOLS_VERSION=4.4
26+
ARG SQUASHFS_TOOLS_VERSION=4.6.1
2727
ARG QT_MAJOR_MINOR=5.15
28-
ARG QT_PATCH=12
28+
ARG QT_PATCH=14
2929
ARG QT_VERSION=${QT_MAJOR_MINOR}.${QT_PATCH}
30-
ARG FCITX5_QT_VERSION=5.0.17
30+
ARG FCITX5_QT_VERSION=5.1.6
3131

3232
# AppImage runtime
3333
RUN curl -L -o /opt/appimage-runtime 'https://github.com/AppImage/type2-runtime/releases/download/continuous/runtime-x86_64'
@@ -47,15 +47,17 @@ RUN mkdir -p /build/squashfs-tools && \
4747
# Qt 5
4848
RUN mkdir -p /build/qt5 && \
4949
cd /build/qt5 && \
50-
curl -L -O "https://download.qt.io/archive/qt/${QT_MAJOR_MINOR}/${QT_VERSION}/submodules/qt{base,svg,tools,wayland}-everywhere-opensource-src-${QT_VERSION}.tar.xz" && \
51-
tar xf qtbase-everywhere-opensource-src-${QT_VERSION}.tar.xz && \
52-
cd qtbase-everywhere-src-${QT_VERSION} && \
50+
curl -L -O "https://download.qt.io/archive/qt/${QT_MAJOR_MINOR}/${QT_VERSION}/single/qt-everywhere-opensource-src-${QT_VERSION}.tar.xz" && \
51+
tar xf qt-everywhere-opensource-src-${QT_VERSION}.tar.xz && \
52+
cd qt-everywhere-src-${QT_VERSION} && \
53+
ls | grep ^qt | grep -vE 'qt(\.pro|base|svg|tools|wayland|translations)' | xargs rm -r && \
5354
./configure \
5455
-prefix /opt/qt \
5556
-opensource -confirm-license \
5657
-optimize-size -static -platform linux-g++ -linker bfd \
58+
-no-feature-wayland-server \
5759
-nomake examples -nomake tests -nomake tools -dbus-linked \
58-
-qt-doubleconversion -no-glib -eventfd -inotify -iconv -no-icu -no-mimetype-database -qt-pcre -qt-zlib \
60+
-qt-doubleconversion -no-glib -eventfd -inotify -iconv -no-icu -no-mimetype-database -qt-pcre -qt-zlib -no-zstd \
5961
-no-openssl \
6062
-no-cups -fontconfig -system-freetype -qt-harfbuzz -no-gtk -no-opengl -xcb-xlib \
6163
-xcb \
@@ -64,27 +66,6 @@ RUN mkdir -p /build/qt5 && \
6466
-sql-sqlite -qt-sqlite && \
6567
make -j$(nproc) && \
6668
make install && \
67-
# svg package
68-
cd /build/qt5 && \
69-
tar xf qtsvg-everywhere-opensource-src-${QT_VERSION}.tar.xz && \
70-
cd qtsvg-everywhere-src-${QT_VERSION} && \
71-
qmake . && \
72-
make -j$(nproc) && \
73-
make install && \
74-
# tools package
75-
cd /build/qt5 && \
76-
tar xf qttools-everywhere-opensource-src-${QT_VERSION}.tar.xz && \
77-
cd qttools-everywhere-src-${QT_VERSION} && \
78-
qmake . && \
79-
make -j$(nproc) && \
80-
make install && \
81-
# wayland package
82-
cd /build/qt5 && \
83-
tar xf qtwayland-everywhere-opensource-src-${QT_VERSION}.tar.xz && \
84-
cd qtwayland-everywhere-src-${QT_VERSION} && \
85-
qmake . && \
86-
make -j$(nproc) && \
87-
make install && \
8869
# cleanup
8970
cd / && \
9071
rm -r /build/qt5

0 commit comments

Comments
 (0)