amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: jami: Fix build.

Browse source 
The unittests were now failing to build with GCC 14 (see:
<https://git.jami.net/savoirfairelinux/jami-daemon/-/issues/1144>).

* gnu/packages/patches/jami-unittests-fix-build.patch: New patch.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/jami.scm (jami) [source]: Apply it.

Change-Id: I11eb97663bb28a4153b2459ea886658cf08b6129
This commit is contained in:
Maxim Cournoyer 2025-07-21 22:47:10 +09:00
parent a82efc0739
commit ca15e63490
No known key found for this signature in database
GPG key ID: 1260E46482E63562
3 changed files with 49 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gnu/local.mk
View file

@ -1646,6 +1646,7 @@ dist_patch_DATA = \
%D%/packages/patches/jami-skip-tests-requiring-internet.patch \ %D%/packages/patches/jami-skip-tests-requiring-internet.patch \
%D%/packages/patches/jami-tests-qtwebengine-ifdef-to-if.patch \ %D%/packages/patches/jami-tests-qtwebengine-ifdef-to-if.patch \
%D%/packages/patches/jami-unbundle-dependencies.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-aarch64-support.patch \
%D%/packages/patches/jamvm-1.5.1-armv7-support.patch \ %D%/packages/patches/jamvm-1.5.1-armv7-support.patch \
%D%/packages/patches/jamvm-2.0.0-aarch64-support.patch \ %D%/packages/patches/jamvm-2.0.0-aarch64-support.patch \

3
gnu/packages/jami.scm
View file

@ -242,7 +242,8 @@ QSortFilterProxyModel conveniently exposed for QML.")
"jami-qwindowkit.patch" "jami-qwindowkit.patch"
"jami-skip-tests-requiring-internet.patch" "jami-skip-tests-requiring-internet.patch"
"jami-tests-qtwebengine-ifdef-to-if.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) (build-system qt-build-system)
(outputs '("out" "debug")) (outputs '("out" "debug"))
(arguments (arguments

46
gnu/packages/patches/jami-unittests-fix-build.patch Normal file
View file

@ -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;
};
/*!