3 files changed, 49 insertions(+), 1 deletions(-)

M gnu/local.mk
M gnu/packages/jami.scm
A gnu/packages/patches/jami-unittests-fix-build.patch

@@ 1646,6 1646,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/jami-skip-tests-requiring-internet.patch	\
   %D%/packages/patches/jami-tests-qtwebengine-ifdef-to-if.patch	\
   %D%/packages/patches/jami-unbundle-dependencies.patch		\
+  %D%/packages/patches/jami-unittests-fix-build.patch		\
   %D%/packages/patches/jamvm-1.5.1-aarch64-support.patch	\
   %D%/packages/patches/jamvm-1.5.1-armv7-support.patch	\
   %D%/packages/patches/jamvm-2.0.0-aarch64-support.patch	\

@@ 242,7 242,8 @@ QSortFilterProxyModel conveniently exposed for QML.")
                         "jami-qwindowkit.patch"
                         "jami-skip-tests-requiring-internet.patch"
                         "jami-tests-qtwebengine-ifdef-to-if.patch"
-                        "jami-unbundle-dependencies.patch"))))
+                        "jami-unbundle-dependencies.patch"
+                        "jami-unittests-fix-build.patch"))))
     (build-system qt-build-system)
     (outputs '("out" "debug"))
     (arguments

@@ 0,0 1,46 @@
+Upstream-status: https://review.jami.net/c/jami-client-qt/+/31508
+
+diff --git a/tests/unittests/previewengine_unittest.cpp b/tests/unittests/previewengine_unittest.cpp
+index f5c103cf..810e621b 100644
+--- a/tests/unittests/previewengine_unittest.cpp
++++ b/tests/unittests/previewengine_unittest.cpp
+@@ -17,7 +17,8 @@
+ 
+ #include "globaltestenvironment.h"
+ 
+-#include <QtHttpServer/QHttpServer>
++#include <QtHttpServer>
++#include <QTcpServer>
+ 
+ class PreviewEngineFixture : public ::testing::Test
+ {
+@@ -27,19 +28,27 @@ public:
+     void SetUp() override
+     {
+         server = new QHttpServer();
+-        // Setup a server that can return an HTML body.
+-        server->listen(QHostAddress::LocalHost, 8000);
++        tcpserver = new QTcpServer();
++
++        // Setup a server that can return an HTML body, which listens
++        // on 127.0.0.1 (localhost) and port 8000.
++        if (!tcpserver->listen(QHostAddress::LocalHost, 8000)
++            || !server->bind(tcpserver)) {
++            qFatal() << "failed to listen:" << tcpserver->errorString();
++        }
+     }
+ 
+     // Close unit test context. Called
+     // after each unit test ending
+     void TearDown() override
+     {
++        delete tcpserver;
+         delete server;
+     }
+ 
+     // An instance of QHttpServer used to create a server.
+     QHttpServer* server;
++    QTcpServer* tcpserver;
+ };
+ 
+ /*!