Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add packages to ease Qt6 Kiwix-Desktop compil. #273

Merged
merged 1 commit into from
Jan 5, 2025
Merged

Add packages to ease Qt6 Kiwix-Desktop compil. #273

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions kiwix-build_ci/jammy_builder.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@ RUN apt update -q \
libmicrohttpd-dev aria2 libgtest-dev libgl-dev \
# Devel package to compile python modules
libxml2-dev libxslt-dev python3-dev \
# Qt packages
# Qt5 packages
libqt5gui5 qtbase5-dev qtwebengine5-dev libqt5svg5-dev qt5-image-formats-plugins \
# Qt6 packages
qt6-base-dev qt6-base-dev-tools qt6-webengine-dev libqt6webenginecore6-bin libqt6svg6 \
# To create the appimage of kiwix-desktop
libfuse2 fuse patchelf \
# Flatpak tools
Expand All @@ -32,8 +34,9 @@ RUN apt update -q \
&& rm -rf /var/lib/apt/lists/* /usr/share/doc/* /var/cache/debconf/* \
&& pip3 install meson pytest gcovr requests distro

# QT_SELECT has to be set to Qt5 so Kiwix Linux/Windows compiles
ENV QT_SELECT qt5
# Set Qt6 per default (QT_SELECT has to be set to Qt5 so Kiwix Linux/Windows compiles)
RUN qtchooser -install qt6 $(which qmake6)
ENV QT_SELECT qt6
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the intent to make Qt6 the default with jammy, but then override the kiwix-desktop build on jammy to use qt5? Or to build with both Qt5 and Qt6 on jammy? Right now using the jammy container implies Qt5.

Copy link
Contributor Author

@kelson42 kelson42 Jan 3, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The intent on Jammy is to:

  • be able to build with either with qt6 or qt5
  • per default, without any additional work it should compile with qt6
  • CD will compile with qt6 and CI with qt5


# Create user
RUN groupadd --gid 121 runner
Expand Down
Loading