mirror of
https://git.jami.net/savoirfairelinux/jami-client-qt.git
synced 2025-07-29 20:05:36 +02:00
24edba9a2f
This commit makes the necessary changes to migrate from Qt 6.5.3 to Qt 6.6.1 and fixes the following issues: - EditedPopup.qml: "layout polish loop" and "recursive rearrange" errors (GitLab: #1510) as well as an unreported bug where text was clipped instead of elided - BaseContextMenu.qml: QML warning ("Created graphical object was not placed in the graphics scene.") The daemon is also bumped in order to include a patch for a build issue on openSUSE Leap (GitLab: #1552). GitLab: #1466 Change-Id: I12df2f84067ebe961368879e08ff7ef275d93395
35 lines
1.3 KiB
Text
35 lines
1.3 KiB
Text
FROM debian:testing
|
|
|
|
ENV DEBIAN_FRONTEND=noninteractive
|
|
|
|
RUN apt-get clean
|
|
RUN apt-get update --allow-releaseinfo-change && \
|
|
apt-get install -y -o Acquire::Retries=10 \
|
|
devscripts \
|
|
equivs \
|
|
python-is-python3 \
|
|
wget \
|
|
nasm
|
|
|
|
# As of January 2024, the default compiler on Debian testing is GCC 13.2.0, which
|
|
# can't build one of Qt 6.6.1's dependencies, see:
|
|
# https://github.com/qt/qtquick3d-assimp/commit/253f8bfa621a9fa6cd2c36291cdaa8c60c99322c
|
|
# The linked commit above fixes the problem and is included in more recent versions of Qt.
|
|
# For now, we use GCC 12 as a temporary workaround:
|
|
ADD extras/packaging/gnu-linux/scripts/install-gcc-debian.sh /opt/install-gcc-debian.sh
|
|
RUN /opt/install-gcc-debian.sh 12
|
|
|
|
ADD extras/packaging/gnu-linux/scripts/prebuild-package-debian.sh /opt/prebuild-package-debian.sh
|
|
|
|
COPY extras/packaging/gnu-linux/rules/debian-qt/control /tmp/builddeps/debian/control
|
|
RUN /opt/prebuild-package-debian.sh qt-deps
|
|
|
|
COPY extras/packaging/gnu-linux/rules/debian/control /tmp/builddeps/debian/control
|
|
RUN /opt/prebuild-package-debian.sh jami-deps
|
|
|
|
# Install CMake 3.21 for Qt 6
|
|
ADD extras/packaging/gnu-linux/scripts/install-cmake.sh /opt/install-cmake.sh
|
|
RUN /opt/install-cmake.sh
|
|
|
|
ADD extras/packaging/gnu-linux/scripts/build-package-debian.sh /opt/build-package-debian.sh
|
|
CMD ["/opt/build-package-debian.sh"]
|