Skip to content
Snippets Groups Projects
Commit 880936d2 authored by Amin Bandali's avatar Amin Bandali
Browse files

Bump Qt up to 6.2.2, add missing nodejs build-dep for libqt-jami

* Makefile (QT_PATCH): Bump up to 2.
(QT_TARBALL_CHECKSUM): Update to Qt 6.2.2 release tarball's sha256sum.
* docker/Dockerfile_ubuntu_18.04: Move the nodejs installation earlier
in the Dockerfile, as it needs to already be installed by the time we
want to install libqt-jami's build dependencies.
* packaging/rules/debian-qt/control (libqt-jami) <Build-Depends>: Add
missing nodejs (>= 10.19) dependency.

jami-packaging#111
Change-Id: Ie15a1f4c7cfb274dc6a1784ce41f5b7383002abe
parent 6955d680
No related branches found
No related tags found
No related merge requests found
......@@ -47,8 +47,8 @@ DEBIAN_DSC_FILENAME := jami_$(DEBIAN_VERSION).dsc
# Qt versions
QT_MAJOR := 6
QT_MINOR := 2
QT_PATCH := 1
QT_TARBALL_CHECKSUM := e03fffc5c3b5fea09dcc161444df7dfbbe24e8a8ce9377014ec21b66f48d43cd
QT_PATCH := 2
QT_TARBALL_CHECKSUM := 907994f78d42b30bdea95e290e91930c2d9b593f3f8dd994f44157e387feee0f
DEBIAN_QT_VERSION := $(QT_MAJOR).$(QT_MINOR).$(QT_PATCH)-1
DEBIAN_QT_DSC_FILENAME := libqt-jami_$(DEBIAN_QT_VERSION).dsc
QT_JAMI_PREFIX := /usr/lib/libqt-jami
......
......@@ -15,6 +15,10 @@ RUN apt-get update && \
software-properties-common \
wget
# nodejs (more recent version needed for building libqt-jami)
RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
RUN apt install nodejs -y
ADD scripts/prebuild-package-debian.sh /opt/prebuild-package-debian.sh
COPY packaging/rules/debian-qt/control /tmp/builddeps/debian/control
......@@ -30,9 +34,6 @@ RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 10
# Install CMake 3.19 for Qt 6
ADD scripts/install-cmake.sh /opt/install-cmake.sh
RUN /opt/install-cmake.sh
# nodejs
RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
RUN apt install nodejs -y
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
CMD ["/opt/build-package-debian.sh"]
......@@ -311,6 +311,7 @@ Build-Depends: debhelper (>= 9),
libxtst-dev,
mesa-common-dev,
ninja-build,
nodejs (>= 10.19),
# pkg-config,
# pkg-kde-tools,
protobuf-compiler,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment