lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-08-27 10:13:25 +02:00
Code Activity

misc: fix build on fedora 39

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
daemon

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

5
extras/packaging/gnu-linux/docker/Dockerfile_fedora_39
View file

@ -96,9 +96,8 @@ RUN dnf install -y \
clang \ clang \
cmake \ cmake \
fmt-devel \ fmt-devel \
python3-html5lib \ python3.10 \
cups-devel \ cups-devel
python-six
ADD extras/packaging/gnu-linux/scripts/build-package-rpm.sh /opt/build-package-rpm.sh ADD extras/packaging/gnu-linux/scripts/build-package-rpm.sh /opt/build-package-rpm.sh

9
extras/packaging/gnu-linux/rules/rpm/jami-libqt.spec
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 <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 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 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 # recent gcc version do not like lto from qt
CXXFLAGS="${CXXFLAGS} -fno-lto" CFLAGS="${CFLAGS} -fno-lto" LDFLAGS="$(CFLAGS) ${LDFLAGS}" ./configure \ CXXFLAGS="${CXXFLAGS} -fno-lto" CFLAGS="${CFLAGS} -fno-lto" LDFLAGS="$(CFLAGS) ${LDFLAGS}" ./configure \
-opensource \ -opensource \