diff --git a/client-android b/client-android index 0ba9cfd7f836af17ca6872e9e689b58b472b8427..1376034cc660b69d09158aeb28d7665ae5cd6ec6 160000 --- a/client-android +++ b/client-android @@ -1 +1 @@ -Subproject commit 0ba9cfd7f836af17ca6872e9e689b58b472b8427 +Subproject commit 1376034cc660b69d09158aeb28d7665ae5cd6ec6 diff --git a/client-qt b/client-qt index 1ab4edb6cc510ce15d7965823ecc5b879d946a96..e0737f4b70cb0e31bd7f8514847a26ccbedc8169 160000 --- a/client-qt +++ b/client-qt @@ -1 +1 @@ -Subproject commit 1ab4edb6cc510ce15d7965823ecc5b879d946a96 +Subproject commit e0737f4b70cb0e31bd7f8514847a26ccbedc8169 diff --git a/daemon b/daemon index eb158ad655cbdd0c71d4c12102a2fd642146835e..c2b167da6171d54740a9afeb7a66577a8abfb504 160000 --- a/daemon +++ b/daemon @@ -1 +1 @@ -Subproject commit eb158ad655cbdd0c71d4c12102a2fd642146835e +Subproject commit c2b167da6171d54740a9afeb7a66577a8abfb504 diff --git a/docker/Dockerfile_ubuntu_18.04 b/docker/Dockerfile_ubuntu_18.04 index 7eaec5585fa128a3237eea546233940041f9d0cf..95ad7ddd0f04ed37bf2e00b8f607bfce147e4969 100644 --- a/docker/Dockerfile_ubuntu_18.04 +++ b/docker/Dockerfile_ubuntu_18.04 @@ -11,6 +11,12 @@ RUN apt-get update && \ g++-8 \ wget +# FindPythonInterp in CMake < 3.12 is buggy; install 3.12. +RUN wget https://cmake.org/files/v3.12/cmake-3.12.0-Linux-x86_64.tar.gz && \ + echo "2cc891a77f5850ffecb2d358f3a84cd9b90e6941496ca531ea31e7bd7600a373 \ +cmake-3.12.0-Linux-x86_64.tar.gz" | sha256sum --check && \ + tar xf cmake-3.12.0-Linux-x86_64.tar.gz --strip-components=1 -C /usr/local + ADD scripts/prebuild-package-debian.sh /opt/prebuild-package-debian.sh COPY packaging/rules/debian-qt/control /tmp/builddeps/debian/control diff --git a/lrc b/lrc index 26ad683c133d1604a082c7743a6d7d3b2d20fdff..bbda106696c397a16c9f7da5e0ff40821509f90a 160000 --- a/lrc +++ b/lrc @@ -1 +1 @@ -Subproject commit 26ad683c133d1604a082c7743a6d7d3b2d20fdff +Subproject commit bbda106696c397a16c9f7da5e0ff40821509f90a diff --git a/packaging/rules/debian/rules b/packaging/rules/debian/rules index 276f2f875260797c86d9245e408f91794c0a2ad5..7ae06366cb24b3e9027b19ce17d36e5c20cf5bd5 100755 --- a/packaging/rules/debian/rules +++ b/packaging/rules/debian/rules @@ -75,7 +75,7 @@ override_dh_auto_configure: --disable-natpmp \ --enable-gnutls $(BUNDLED_PKGS) && \ make list && \ - make -j$(NO_CPUS) V=1 + GTKDOCIZE=true make -j$(NO_CPUS) V=1 cd daemon && \ ./autogen.sh && \ ./configure \ diff --git a/packaging/rules/rpm/jami-daemon.spec b/packaging/rules/rpm/jami-daemon.spec index c7a6a1d5f9f0da176ed7812f464e5d144253dc42..82be069c74aee34a2295c894b145d536fe93e45a 100644 --- a/packaging/rules/rpm/jami-daemon.spec +++ b/packaging/rules/rpm/jami-daemon.spec @@ -118,7 +118,6 @@ This package contains the header files for using the Jami daemon as a library. %files devel %{_includedir}/jami -%{_includedir}/jami_contact.h %post /sbin/ldconfig