mirror of
https://git.jami.net/savoirfairelinux/jami-client-qt.git
synced 2025-07-27 02:45:34 +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.8 KiB
Diff
40 lines
1.8 KiB
Diff
From 4c7360faeb0fb7f1dfd995619fb8c596b4e15606 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Fran=C3=A7ois-Simon=20Fauteux-Chapleau?=
|
|
<francois-simon.fauteux-chapleau@savoirfairelinux.com>
|
|
Date: Thu, 8 Aug 2024 10:29:43 -0400
|
|
Subject: [PATCH] qtwebengine: add missing chromium dependencies
|
|
|
|
For more information, see:
|
|
https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/555586
|
|
---
|
|
chromium/content/public/browser/BUILD.gn | 1 +
|
|
chromium/extensions/browser/api/declarative_net_request/BUILD.gn | 1 +
|
|
2 files changed, 2 insertions(+)
|
|
|
|
diff --git a/qtwebengine/src/3rdparty/chromium/content/public/browser/BUILD.gn b/qtwebengine/src/3rdparty/chromium/content/public/browser/BUILD.gn
|
|
index b25bf5764e7..dfbfb2ec77b 100644
|
|
--- a/qtwebengine/src/3rdparty/chromium/content/public/browser/BUILD.gn
|
|
+++ b/qtwebengine/src/3rdparty/chromium/content/public/browser/BUILD.gn
|
|
@@ -515,6 +515,7 @@ jumbo_source_set("browser_sources") {
|
|
"//cc",
|
|
"//components/services/storage/public/cpp",
|
|
"//components/viz/host",
|
|
+ "//components/spellcheck:buildflags",
|
|
"//content/browser", # Must not be public_deps!
|
|
"//device/fido",
|
|
"//gpu",
|
|
diff --git a/qtwebengine/src/3rdparty/chromium/extensions/browser/api/declarative_net_request/BUILD.gn b/qtwebengine/src/3rdparty/chromium/extensions/browser/api/declarative_net_request/BUILD.gn
|
|
index 1fc492f5a0c..13a266e22f1 100644
|
|
--- a/qtwebengine/src/3rdparty/chromium/extensions/browser/api/declarative_net_request/BUILD.gn
|
|
+++ b/qtwebengine/src/3rdparty/chromium/extensions/browser/api/declarative_net_request/BUILD.gn
|
|
@@ -23,6 +23,7 @@ source_set("declarative_net_request") {
|
|
"//extensions/common",
|
|
"//extensions/common/api",
|
|
"//services/preferences/public/cpp",
|
|
+ "//components/web_cache/browser",
|
|
]
|
|
|
|
public_deps = [ "//extensions/browser:browser_sources" ]
|
|
--
|
|
2.34.1
|
|
|