ubuntu: package client-qt on 21.04

Change-Id: Iaf5f84533e2eb6d7efc9f52b1aab3846152d9ae8

docker/Dockerfile_ubuntu_21.04

 FROM ubuntu:21.04
 
-ENV DEBIAN_FRONTEND noninteractive
+ENV DEBIAN_FRONTEND=noninteractive
 
-RUN apt-get clean
-RUN apt-get update && \
-    apt-get install -y devscripts equivs
-
-# Speed up mk-build-deps
 RUN apt-get clean
 RUN apt-get update && \
     apt-get install -y -o Acquire::Retries=10 \
-        git \
-        autoconf \
-        automake \
-        autopoint \
-        cmake \
-        libtool \
-        libdbus-1-dev \
-        libdbus-c++-dev \
-        libgnutls28-dev \
-        libargon2-0-dev \
-        libcanberra-gtk3-dev \
-        libclutter-gtk-1.0-dev \
-        libclutter-1.0-dev \
-        libglib2.0-dev \
-        libgtk-3-dev \
-        libnotify-dev \
-        qtbase5-dev \
-        qttools5-dev \
-        qttools5-dev-tools \
-        yasm \
-        nasm \
-        autotools-dev \
-        gettext \
-        libpulse-dev \
-        libasound2-dev \
-        libexpat1-dev \
-        libpcre3-dev \
-        libyaml-cpp-dev \
-        libboost-dev \
-        libxext-dev \
-        libxfixes-dev \
-        libspeex-dev \
-        libspeexdsp-dev \
-        uuid-dev \
-        libavcodec-dev \
-        libavutil-dev \
-        libavformat-dev \
-        libswscale-dev \
-        libavdevice-dev \
-        libopus-dev \
-        libudev-dev \
-        libgsm1-dev \
-        libjsoncpp-dev \
-        libmsgpack-dev \
-        libnatpmp-dev \
-        libayatana-appindicator3-dev \
-        libqrencode-dev \
-        libnm-dev \
-        libwebkit2gtk-4.0-dev \
-        libcrypto++-dev \
-        libva-dev \
-        libvdpau-dev \
-        libssl-dev
+        ca-certificates \
+        devscripts \
+        dirmngr \
+        equivs \
+        gnupg \
+        wget
+
+RUN wget -O - https://dl.jami.net/public-key.gpg | \
+    tee /usr/share/keyrings/jami-archive-keyring.gpg > /dev/null
+RUN sh -c "echo 'deb [signed-by=/usr/share/keyrings/jami-archive-keyring.gpg] https://dl.jami.net/nightly/ubuntu_21.04_qt/ jami main' > /etc/apt/sources.list.d/libqt-jami.list"
+
+# add deb-src entries (needed for next step)
+RUN sed -n '/^deb\s/s//deb-src /p' /etc/apt/sources.list > /etc/apt/sources.list.d/deb-src.list
+RUN apt-get clean && apt-get update
+
+COPY packaging/rules/debian/* /tmp/builddeps/debian/
+RUN cd /tmp/builddeps && \
+    apt-get update; \
+    mk-build-deps \
+        --remove --install \
+        --tool "apt-get -y --no-install-recommends -o Acquire::Retries=10" \
+        "debian/control"; \
+    cd / && rm -rf /tmp/builddeps
 
 ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
 

docker/Dockerfile_ubuntu_21.04_qt

+FROM ubuntu:21.04
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get clean
+RUN apt-get update && \
+    apt-get install -y -o Acquire::Retries=10 \
+        devscripts \
+        equivs \
+        wget
+
+# add/enable src repos (needed for next step)
+RUN sed -n '/^deb\s/s//deb-src /p' /etc/apt/sources.list > /etc/apt/sources.list.d/deb-src.list
+
+RUN apt-get clean && apt-get update
+COPY packaging/rules/debian-qt/* /tmp/builddeps/debian/
+RUN cd /tmp/builddeps && \
+    apt-get update; \
+    mk-build-deps \
+        --remove --install \
+        --tool "apt-get -y --no-install-recommends -o Acquire::Retries=10" \
+        "debian/control"; \
+    cd / && rm -rf /tmp/builddeps
+
+ADD scripts/build-package-debian-qt.sh /opt/build-package-debian-qt.sh
+
+CMD /opt/build-package-debian-qt.sh

scripts/make-packaging-target.py

@@ -207,7 +207,13 @@ def run_generate_all(parsed_args):
         {
             "distribution": "ubuntu_21.04",
             "output_file": "$(DEBIAN_DSC_FILENAME)",
-            "options": "--privileged --security-opt apparmor=docker-default",
+            "options": "-e QT_JAMI_PREFIX=$(QT_JAMI_PREFIX) --privileged --security-opt apparmor=docker-default",
+        },
+        {
+            "distribution": "ubuntu_21.04_qt",
+            "output_file": "$(DEBIAN_QT_DSC_FILENAME)",
+            "options": DPKG_BASED_SYSTEMS_DOCKER_RUN_OPTIONS_QT,
+            "version": "$(DEBIAN_QT_VERSION)",
         },
         # Fedora
         {