Skip to content

Commit d360fad

Browse files
authored
deps: update Qt to 6.11.1, CMake to 4.3.2 (#36)
1 parent 3856eed commit d360fad

2 files changed

Lines changed: 26 additions & 10 deletions

File tree

Dockerfile_chatterino2-build-ubuntu-22.04

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# cmake
22
FROM ubuntu:22.04 AS build-cmake
33

4-
ARG CMAKE_VERSION=3.28.1
5-
ARG CMAKE_SHA256SUM=15e94f83e647f7d620a140a7a5da76349fc47a1bfed66d0f5cdee8e7344079ad
4+
ARG CMAKE_VERSION=4.3.2
5+
ARG CMAKE_SHA256SUM=b0231eb39b3c3cabdc568c619df78208a7bd95ea10c9b2236d61218bac1b367d
66

77
ARG NUM_JOBS=26
88

@@ -94,7 +94,7 @@ EOF
9494
# Qt
9595
FROM ubuntu:22.04 AS build-qt
9696

97-
ARG QT_TAG=v6.7.2
97+
ARG QT_TAG=v6.11.1
9898

9999
ARG NUM_JOBS=26
100100

@@ -148,7 +148,11 @@ apt-get install -y --no-install-recommends \
148148
libegl1-mesa-dev \
149149
libxkbcommon-dev \
150150
libxkbcommon-x11-dev \
151-
libfontconfig1-dev
151+
libfontconfig1-dev \
152+
pkg-config \
153+
libxcb1-dev \
154+
libxcb-util-dev \
155+
libwebp-dev
152156

153157
apt-get clean
154158
EOF
@@ -277,7 +281,11 @@ apt-get install -y --no-install-recommends \
277281
libegl1-mesa-dev \
278282
libxkbcommon-dev \
279283
libxkbcommon-x11-dev \
280-
libfontconfig1-dev
284+
libfontconfig1-dev \
285+
pkg-config \
286+
libxcb1-dev \
287+
libxcb-util-dev \
288+
libwebp-dev
281289

282290
# Use system RapidJSON instead of Chatterino submodule
283291
apt-get install -y --no-install-recommends \

Dockerfile_chatterino2-build-ubuntu-24.04

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# cmake
22
FROM ubuntu:24.04 AS build-cmake
33

4-
ARG CMAKE_VERSION=3.28.1
5-
ARG CMAKE_SHA256SUM=15e94f83e647f7d620a140a7a5da76349fc47a1bfed66d0f5cdee8e7344079ad
4+
ARG CMAKE_VERSION=4.3.2
5+
ARG CMAKE_SHA256SUM=b0231eb39b3c3cabdc568c619df78208a7bd95ea10c9b2236d61218bac1b367d
66

77
ARG NUM_JOBS=26
88

@@ -94,7 +94,7 @@ EOF
9494
# Qt
9595
FROM ubuntu:24.04 AS build-qt
9696

97-
ARG QT_TAG=v6.7.2
97+
ARG QT_TAG=v6.11.1
9898

9999
ARG NUM_JOBS=26
100100

@@ -148,7 +148,11 @@ apt-get install -y --no-install-recommends \
148148
libegl1-mesa-dev \
149149
libxkbcommon-dev \
150150
libxkbcommon-x11-dev \
151-
libfontconfig1-dev
151+
libfontconfig1-dev \
152+
pkg-config \
153+
libxcb1-dev \
154+
libxcb-util-dev \
155+
libwebp-dev
152156

153157
apt-get clean
154158
EOF
@@ -277,7 +281,11 @@ apt-get install -y --no-install-recommends \
277281
libegl1-mesa-dev \
278282
libxkbcommon-dev \
279283
libxkbcommon-x11-dev \
280-
libfontconfig1-dev
284+
libfontconfig1-dev \
285+
pkg-config \
286+
libxcb1-dev \
287+
libxcb-util-dev \
288+
libwebp-dev
281289

282290
# Use system RapidJSON instead of Chatterino submodule
283291
apt-get install -y --no-install-recommends \

0 commit comments

Comments
 (0)