mirror of
https://git.jami.net/savoirfairelinux/jami-client-qt.git
synced 2025-07-27 19:05:39 +02:00
b92cd902b9
This commit adds four patches to fix various issues that were preventing Qt 6.6.1 from building on Debian testing and Debian unstable. These patches are backports of fixes that were applied in later versions of Qt; links to the relevant commits are included in the description at the top of each patch. There are also two changes in the Dockerfiles for Debian testing and Debian unstable: 1) CMake 3.21 is no longer installed via the install-cmake.sh script. This is not necessary anymore given that Debian testing and Debian unstable now both come with more recent versions of CMake by default (3.29 and 3.30 respectively). 2) The libre2-dev package (which is part of the dependencies in debian-qt/control) is removed from the Docker image in order to force Qt to build using the bundled version of the RE2 library. This is necessary because the system version of the library on testing and unstable (libre2-11) is not compatible with earlier versions due to an API change, c.f. https://codereview.qt-project.org/c/qt/qtwebengine/+/516094 GitLab: #1822 Change-Id: I763fb6692949052e2a846b3f4ce54619e6d98108
40 lines
1.5 KiB
Diff
40 lines
1.5 KiB
Diff
From 420b3e5ac2e91b7a99488ac34577e2798a84a68c Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Fran=C3=A7ois-Simon=20Fauteux-Chapleau?=
|
|
<francois-simon.fauteux-chapleau@savoirfairelinux.com>
|
|
Date: Tue, 6 Aug 2024 17:35:56 -0400
|
|
Subject: [PATCH] qtbase: fix CMake error
|
|
|
|
For more information, see:
|
|
https://github.com/qt/qtbase/commit/3411f2984a5325a35e3bed1f961e5973d8a565b9
|
|
---
|
|
qtbase/configure.cmake | 1 +
|
|
qtbase/src/corelib/CMakeLists.txt | 1 -
|
|
2 files changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/qtbase/configure.cmake b/qtbase/configure.cmake
|
|
index 43de2aa026..37a82dcdb6 100644
|
|
--- a/qtbase/configure.cmake
|
|
+++ b/qtbase/configure.cmake
|
|
@@ -18,6 +18,7 @@ if(TARGET ZLIB::ZLIB)
|
|
set_property(TARGET ZLIB::ZLIB PROPERTY IMPORTED_GLOBAL TRUE)
|
|
endif()
|
|
|
|
+qt_find_package(Threads PROVIDED_TARGETS Threads::Threads)
|
|
qt_find_package(WrapOpenSSLHeaders PROVIDED_TARGETS WrapOpenSSLHeaders::WrapOpenSSLHeaders MODULE_NAME core)
|
|
# openssl_headers
|
|
# OPENSSL_VERSION_MAJOR is not defined for OpenSSL 1.1.1
|
|
diff --git a/qtbase/src/corelib/CMakeLists.txt b/qtbase/src/corelib/CMakeLists.txt
|
|
index 31b81734e8..b62e2f763b 100644
|
|
--- a/qtbase/src/corelib/CMakeLists.txt
|
|
+++ b/qtbase/src/corelib/CMakeLists.txt
|
|
@@ -1,7 +1,6 @@
|
|
# Copyright (C) 2022 The Qt Company Ltd.
|
|
# SPDX-License-Identifier: BSD-3-Clause
|
|
|
|
-qt_find_package(Threads PROVIDED_TARGETS Threads::Threads)
|
|
qt_find_package(WrapPCRE2 PROVIDED_TARGETS WrapPCRE2::WrapPCRE2)
|
|
qt_find_package(WrapZLIB PROVIDED_TARGETS WrapZLIB::WrapZLIB)
|
|
|
|
--
|
|
2.34.1
|
|
|