Skip to content

Commit 5904e05

Browse files
committed
Qt 6.4.3
1 parent 5916101 commit 5904e05

File tree

5 files changed

+14
-14
lines changed

5 files changed

+14
-14
lines changed

.github/workflows/qt6-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ jobs:
2929
with:
3030
context: "{{defaultContext}}:docker/qt6-build"
3131
push: true
32-
tags: mltframework/qt:6.4.2-ubuntu18.04
32+
tags: mltframework/qt:6.4.3-ubuntu18.04

.github/workflows/shotcut-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ jobs:
2929
with:
3030
context: "{{defaultContext}}:docker/shotcut-build"
3131
push: true
32-
tags: mltframework/shotcut-build:qt6.4.2-ubuntu20.04
32+
tags: mltframework/shotcut-build:qt6.4.3-ubuntu20.04

docker/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
## Build Qt 6 for Linux
44

5-
docker build --rm -t mltframework/qt:6.4.2-ubuntu20.04 docker/qt6-build
6-
docker run -it --rm -v $PWD:/mnt mltframework/qt:6.4.2-ubuntu20.04
7-
s3cmd --acl-public put qt-6.4.2-ubuntu20.04-x86_64.txz s3://misc.meltymedia/shotcut-build/
5+
docker build --rm -t mltframework/qt:6.4.3-ubuntu20.04 docker/qt6-build
6+
docker run -it --rm -v $PWD:/mnt mltframework/qt:6.4.3-ubuntu20.04
7+
s3cmd --acl-public put qt-6.4.3-ubuntu20.04-x86_64.txz s3://misc.meltymedia/shotcut-build/
88

99
## Build Shotcut for Linux
1010

11-
docker build --rm -t mltframework/shotcut-build:qt6.4.2-ubuntu20.04 docker/shotcut-build
11+
docker build --rm -t mltframework/shotcut-build:qt6.4.3-ubuntu20.04 docker/shotcut-build
1212
mkdir work; cd work
1313
wget --no-check-certificate https://raw.githubusercontent.com/mltframework/shotcut/master/scripts/build-shotcut.sh
14-
docker run -it --rm -v $PWD:/root/shotcut mltframework/shotcut-build:qt6.4.2-ubuntu20.04 ./build-shotcut.sh
14+
docker run -it --rm -v $PWD:/root/shotcut mltframework/shotcut-build:qt6.4.3-ubuntu20.04 ./build-shotcut.sh
1515

1616
Artifacts will be in work.

docker/qt6-build/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ RUN apt-get -qq update && \
1818
apt-get install -yqq cmake
1919

2020
WORKDIR /root
21-
RUN curl -L https://download.qt.io/official_releases/qt/6.4/6.4.2/single/qt-everywhere-src-6.4.2.tar.xz | tar xJ
21+
RUN curl -L https://download.qt.io/official_releases/qt/6.4/6.4.3/single/qt-everywhere-src-6.4.3.tar.xz | tar xJ
2222

23-
RUN cmake -S qt-everywhere-src-6.4.2 -B build -G Ninja -Wno-dev \
24-
-D CMAKE_INSTALL_PREFIX=/root/Qt/6.4.2/gcc_64 \
23+
RUN cmake -S qt-everywhere-src-6.4.3 -B build -G Ninja -Wno-dev \
24+
-D CMAKE_INSTALL_PREFIX=/root/Qt/6.4.3/gcc_64 \
2525
-D CMAKE_BUILD_TYPE=Release \
2626
-D FEATURE_sql=ON \
2727
-D QT_BUILD_EXAMPLES=OFF \
@@ -31,8 +31,8 @@ RUN cmake -S qt-everywhere-src-6.4.2 -B build -G Ninja -Wno-dev \
3131
-D FEATURE_openssl_runtime=ON
3232
RUN cmake --build build --parallel --target install
3333
RUN cd /root && \
34-
printf "[Paths]\nPrefix=..\n" > Qt/6.4.2/gcc_64/bin/qt.conf && \
35-
cp -p /usr/lib/x86_64-linux-gnu/libicu*.so.66 Qt/6.4.2/gcc_64/lib
34+
printf "[Paths]\nPrefix=..\n" > Qt/6.4.3/gcc_64/bin/qt.conf && \
35+
cp -p /usr/lib/x86_64-linux-gnu/libicu*.so.66 Qt/6.4.3/gcc_64/lib
3636

3737
FROM base
3838
ARG DEBIAN_FRONTEND=noninteractive
@@ -41,4 +41,4 @@ RUN apt-get -qq update && apt-get -yqq install xz-utils
4141
WORKDIR /root
4242
COPY --from=build /root/Qt/ /root/Qt/
4343

44-
CMD tar cJf /mnt/qt-6.4.2-ubuntu20.04-x86_64.txz Qt
44+
CMD tar cJf /mnt/qt-6.4.3-ubuntu20.04-x86_64.txz Qt

docker/shotcut-build/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ RUN apt-get update -qq && \
2626

2727
ENV CC=gcc-10 CXX=g++-10
2828
WORKDIR /root
29-
COPY --from=mltframework/qt:6.4.2-ubuntu20.04 /root/Qt Qt
29+
COPY --from=mltframework/qt:6.4.3-ubuntu20.04 /root/Qt Qt
3030

3131
WORKDIR /root/shotcut
3232
ENTRYPOINT ["/bin/bash"]

0 commit comments

Comments
 (0)