Skip to content

Commit f1e44b2

Browse files
committed
2.0 needs qt6 not qt5
1 parent 36e517c commit f1e44b2

4 files changed

Lines changed: 16 additions & 8 deletions

File tree

Dockerfile

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,14 @@ RUN \
2121
apt-get update && \
2222
apt-get install -y --no-install-recommends \
2323
build-essential \
24-
qtbase5-dev \
24+
qt6-5compat-dev \
25+
qt6-base-dev \
2526
zlib1g-dev && \
2627
echo "**** install runtime packages ****" && \
2728
apt-get install -y --no-install-recommends \
2829
git \
29-
libqt5widgets5 \
30+
libqt6widgets6t64 \
31+
libqt6core5compat6 \
3032
liburi-perl \
3133
make \
3234
thunar \
@@ -44,7 +46,7 @@ RUN \
4446
tar xzf /tmp/qdirstat.tar.gz -C \
4547
/tmp/qdirstat/ --strip-components=1 && \
4648
cd /tmp/qdirstat && \
47-
qmake && \
49+
qmake6 && \
4850
make && \
4951
make install && \
5052
echo "**** openbox tweaks ****" && \
@@ -55,7 +57,8 @@ RUN \
5557
echo "**** cleanup ****" && \
5658
apt-get purge -y --autoremove \
5759
build-essential \
58-
qtbase5-dev \
60+
qt6-5compat-dev \
61+
qt6-base-dev \
5962
zlib1g-dev && \
6063
apt-get clean && \
6164
rm -rf \

Dockerfile.aarch64

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,14 @@ RUN \
2121
apt-get update && \
2222
apt-get install -y --no-install-recommends \
2323
build-essential \
24-
qtbase5-dev \
24+
qt6-5compat-dev \
25+
qt6-base-dev \
2526
zlib1g-dev && \
2627
echo "**** install runtime packages ****" && \
2728
apt-get install -y --no-install-recommends \
2829
git \
29-
libqt5widgets5 \
30+
libqt6widgets6t64 \
31+
libqt6core5compat6 \
3032
liburi-perl \
3133
make \
3234
thunar \
@@ -44,7 +46,7 @@ RUN \
4446
tar xzf /tmp/qdirstat.tar.gz -C \
4547
/tmp/qdirstat/ --strip-components=1 && \
4648
cd /tmp/qdirstat && \
47-
qmake && \
49+
qmake6 && \
4850
make && \
4951
make install && \
5052
echo "**** openbox tweaks ****" && \
@@ -55,7 +57,8 @@ RUN \
5557
echo "**** cleanup ****" && \
5658
apt-get purge -y --autoremove \
5759
build-essential \
58-
qtbase5-dev \
60+
qt6-5compat-dev \
61+
qt6-base-dev \
5962
zlib1g-dev && \
6063
apt-get clean && \
6164
rm -rf \

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -594,6 +594,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
594594

595595
## Versions
596596

597+
* **18.01.26:** - Update build logic for Qt6 and version 2.0.
597598
* **28.12.25:** - Add Wayland init logic.
598599
* **12.07.25:** - Rebase to Selkies, HTTPS IS NOW REQUIRED.
599600
* **28.08.24:** - Rebase to noble.

readme-vars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ init_diagram: |
106106
"qdirstat:latest" <- Base Images
107107
# changelog
108108
changelogs:
109+
- {date: "18.01.26:", desc: "Update build logic for Qt6 and version 2.0."}
109110
- {date: "28.12.25:", desc: "Add Wayland init logic."}
110111
- {date: "12.07.25:", desc: "Rebase to Selkies, HTTPS IS NOW REQUIRED."}
111112
- {date: "28.08.24:", desc: "Rebase to noble."}

0 commit comments

Comments
 (0)