1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-07-24 09:25:33 +02:00

misc: fix build on fedora 39

Change-Id: I0b64db0a418e9992dcafa053c762e153a65515b8
This commit is contained in:
Sébastien Blin 2023-10-24 09:15:14 -04:00
parent ec60458dbe
commit d2e87150b4
3 changed files with 12 additions and 4 deletions

2
daemon

@ -1 +1 @@
Subproject commit 24f8c52acf3aece41d42b50f5ea4b34a96137273
Subproject commit a7e2c494d1d16bec68b7e098734884062a4b2505

View file

@ -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

View file

@ -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 \