From d2e87150b42c66d5f4329f4cf62512c9c937f000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
 <sebastien.blin@savoirfairelinux.com>
Date: Tue, 24 Oct 2023 09:15:14 -0400
Subject: [PATCH] misc: fix build on fedora 39

Change-Id: I0b64db0a418e9992dcafa053c762e153a65515b8
---
 daemon                                                 | 2 +-
 extras/packaging/gnu-linux/docker/Dockerfile_fedora_39 | 5 ++---
 extras/packaging/gnu-linux/rules/rpm/jami-libqt.spec   | 9 +++++++++
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/daemon b/daemon
index 24f8c52a..a7e2c494 160000
--- a/daemon
+++ b/daemon
@@ -1 +1 @@
-Subproject commit 24f8c52acf3aece41d42b50f5ea4b34a96137273
+Subproject commit a7e2c494d1d16bec68b7e098734884062a4b2505
diff --git a/extras/packaging/gnu-linux/docker/Dockerfile_fedora_39 b/extras/packaging/gnu-linux/docker/Dockerfile_fedora_39
index e3442b01..eb688c5e 100644
--- a/extras/packaging/gnu-linux/docker/Dockerfile_fedora_39
+++ b/extras/packaging/gnu-linux/docker/Dockerfile_fedora_39
@@ -96,9 +96,8 @@ RUN dnf install -y \
         clang \
         cmake \
         fmt-devel \
-        python3-html5lib \
-        cups-devel \
-        python-six
+        python3.10 \
+        cups-devel
 
 ADD extras/packaging/gnu-linux/scripts/build-package-rpm.sh /opt/build-package-rpm.sh
 
diff --git a/extras/packaging/gnu-linux/rules/rpm/jami-libqt.spec b/extras/packaging/gnu-linux/rules/rpm/jami-libqt.spec
index 92d918b7..b40ad29a 100644
--- a/extras/packaging/gnu-linux/rules/rpm/jami-libqt.spec
+++ b/extras/packaging/gnu-linux/rules/rpm/jami-libqt.spec
@@ -91,6 +91,15 @@ cat qtbase/src/corelib/global/qendian.h
 sed -i 's,#include <string.h>,#include <string.h>\n#include <limits>,g' qtbase/src/corelib/global/qfloat16.h
 sed -i 's,#include <QtCore/qbytearray.h>,#include <QtCore/qbytearray.h>\n#include <limits>,g' qtbase/src/corelib/text/qbytearraymatcher.h
 cat qtwebengine/configure.cmake
+
+#https://bugreports.qt.io/browse/QTBUG-117979
+if test -f "/usr/bin/python3.10"; then
+  /usr/bin/python3.10 -m venv env
+  source env/bin/activate
+  python -m pip install html5lib
+  python -m pip install six
+fi
+
 # recent gcc version do not like lto from qt
 CXXFLAGS="${CXXFLAGS} -fno-lto" CFLAGS="${CFLAGS} -fno-lto" LDFLAGS="$(CFLAGS) ${LDFLAGS}" ./configure \
   -opensource \