diff --git a/Dockerfile b/Dockerfile index 061d3c4..7434318 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,12 +21,14 @@ RUN \ apt-get update && \ apt-get install -y --no-install-recommends \ build-essential \ - qtbase5-dev \ + qt6-5compat-dev \ + qt6-base-dev \ zlib1g-dev && \ echo "**** install runtime packages ****" && \ apt-get install -y --no-install-recommends \ git \ - libqt5widgets5 \ + libqt6widgets6t64 \ + libqt6core5compat6 \ liburi-perl \ make \ thunar \ @@ -44,7 +46,7 @@ RUN \ tar xzf /tmp/qdirstat.tar.gz -C \ /tmp/qdirstat/ --strip-components=1 && \ cd /tmp/qdirstat && \ - qmake && \ + qmake6 && \ make && \ make install && \ echo "**** openbox tweaks ****" && \ @@ -55,7 +57,8 @@ RUN \ echo "**** cleanup ****" && \ apt-get purge -y --autoremove \ build-essential \ - qtbase5-dev \ + qt6-5compat-dev \ + qt6-base-dev \ zlib1g-dev && \ apt-get clean && \ rm -rf \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 52b0fb2..daacc92 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -21,12 +21,14 @@ RUN \ apt-get update && \ apt-get install -y --no-install-recommends \ build-essential \ - qtbase5-dev \ + qt6-5compat-dev \ + qt6-base-dev \ zlib1g-dev && \ echo "**** install runtime packages ****" && \ apt-get install -y --no-install-recommends \ git \ - libqt5widgets5 \ + libqt6widgets6t64 \ + libqt6core5compat6 \ liburi-perl \ make \ thunar \ @@ -44,7 +46,7 @@ RUN \ tar xzf /tmp/qdirstat.tar.gz -C \ /tmp/qdirstat/ --strip-components=1 && \ cd /tmp/qdirstat && \ - qmake && \ + qmake6 && \ make && \ make install && \ echo "**** openbox tweaks ****" && \ @@ -55,7 +57,8 @@ RUN \ echo "**** cleanup ****" && \ apt-get purge -y --autoremove \ build-essential \ - qtbase5-dev \ + qt6-5compat-dev \ + qt6-base-dev \ zlib1g-dev && \ apt-get clean && \ rm -rf \ diff --git a/README.md b/README.md index 1400b0a..6b874fb 100644 --- a/README.md +++ b/README.md @@ -594,6 +594,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **18.01.26:** - Update build logic for Qt6 and version 2.0. * **28.12.25:** - Add Wayland init logic. * **12.07.25:** - Rebase to Selkies, HTTPS IS NOW REQUIRED. * **28.08.24:** - Rebase to noble. diff --git a/readme-vars.yml b/readme-vars.yml index 55c57c9..b694d1a 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -106,6 +106,7 @@ init_diagram: | "qdirstat:latest" <- Base Images # changelog changelogs: + - {date: "18.01.26:", desc: "Update build logic for Qt6 and version 2.0."} - {date: "28.12.25:", desc: "Add Wayland init logic."} - {date: "12.07.25:", desc: "Rebase to Selkies, HTTPS IS NOW REQUIRED."} - {date: "28.08.24:", desc: "Rebase to noble."}