mirror of
				https://git.jami.net/savoirfairelinux/jami-client-qt.git
				synced 2025-10-30 07:53:33 +08:00 
			
		
		
		
	packaging: fix Qt build on Fedora 40
GitLab: #1858 Change-Id: Ib0cfa7a1c458faecdb9c82359c182d4debadc6ab
This commit is contained in:
		 François-Simon Fauteux-Chapleau
					François-Simon Fauteux-Chapleau
				
			
				
					committed by
					
						 Adrien Béraud
						Adrien Béraud
					
				
			
			
				
	
			
			
			 Adrien Béraud
						Adrien Béraud
					
				
			
						parent
						
							056cf14613
						
					
				
				
					commit
					7b298deee8
				
			| @ -30,6 +30,7 @@ Vendor:        Savoir-faire Linux Inc. | ||||
| URL:           https://jami.net/ | ||||
| Source:        jami-libqt-%{version}.tar.xz | ||||
| Patch0:        0001-fix-gcc14.patch | ||||
| Patch1:        0002-qtwebengine-add-missing-chromium-dependencies.patch | ||||
|  | ||||
| %global gst 0.10 | ||||
| %if 0%{?fedora} || 0%{?rhel} > 7 | ||||
| @ -65,7 +66,8 @@ This package contains Qt libraries for Jami. | ||||
|  | ||||
| %prep | ||||
| %setup -n qt-everywhere-src-%{version} | ||||
| %patch0 -p1 | ||||
| %patch -P 0 -p1 | ||||
| %patch -P 1 -p1 | ||||
|  | ||||
| %build | ||||
| echo "Building Qt using %{job_count} parallel jobs" | ||||
|  | ||||
| @ -0,0 +1,40 @@ | ||||
| From 04778c7f54c8a1a0e7fced75c5ef39ced82cece1 Mon Sep 17 00:00:00 2001 | ||||
| From: =?UTF-8?q?Fran=C3=A7ois-Simon=20Fauteux-Chapleau?= | ||||
|  <francois-simon.fauteux-chapleau@savoirfairelinux.com> | ||||
| Date: Sat, 12 Oct 2024 16:21:35 -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.47.0 | ||||
|  | ||||
		Reference in New Issue
	
	Block a user