CaROS/meta-qt6
3
0
Fork 0
mirror of http://code.qt.io/yocto/meta-qt6.git synced 2026-01-01 13:58:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

qtwebengine: update patches

Browse Source 
Update patches to match current code & fix
patch fuzz.

Change-Id: I3a329a467f523aedd5be9bd8bca647d25ae687e1
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
This commit is contained in:
Mikko Gronoff 2021-10-14 11:10:26 +03:00
parent 9970f6c9de
commit f96a7db1d4
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
recipes-qt/qt6/qtwebengine/0001-CMake-use-generated-yocto-toolchains.patch
View File

@ -1,4 +1,4 @@
From ba24cb211c85c28833554d674d43b88b72e9a488 Mon Sep 17 00:00:00 2001
From 7c16e38b85e514991d57802136de498ac1201bca Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Wed, 18 Aug 2021 15:09:41 +0300
Subject: [PATCH] CMake: use generated yocto toolchains
@ -14,10 +14,10 @@ Change-Id: I217c9122144f25bb2d28717e7248c2a51b149127
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/cmake/Functions.cmake b/cmake/Functions.cmake
index b7c386fc..a75dfc30 100644
index 37fd593a..2654cdc3 100644
--- a/cmake/Functions.cmake
+++ b/cmake/Functions.cmake
@@ -630,7 +630,7 @@ endfunction()
@@ -642,7 +642,7 @@ endfunction()
macro(create_pkg_config_host_wrapper buildDir)
find_package(PkgConfigHost)
@ -26,7 +26,7 @@ index b7c386fc..a75dfc30 100644
create_pkg_config_wrapper("${buildDir}/pkg-config-host_wrapper.sh" "${PKG_CONFIG_HOST_EXECUTABLE}")
set(PKG_CONFIG_HOST_EXECUTABLE "${buildDir}/pkg-config-host_wrapper.sh")
endif()
@@ -818,9 +818,9 @@ endmacro()
@@ -855,9 +855,9 @@ endmacro()
macro(append_toolchain_setup)
if(LINUX)
list(APPEND gnArgArg

6
recipes-qt/qt6/qtwebengine/0002-Enable-examples.patch
View File

@ -1,4 +1,4 @@
From 8e132b25c19836f66dd844ed53da3122f1a56cd5 Mon Sep 17 00:00:00 2001
From 219123a78c639197128bd4feecca3dd27f10ecf3 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Tue, 31 Aug 2021 18:27:48 +0300
Subject: [PATCH] Enable examples
@ -11,7 +11,7 @@ Change-Id: I076763d9241061f9cdb4d46bcd88e46bd4f783aa
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index e1762672..a336c313 100644
index 06e36ecc..035a14f6 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -1,7 +1,7 @@
@ -21,5 +21,5 @@ index e1762672..a336c313 100644
-if(NOT CMAKE_CROSSCOMPILING) #QTBUG-86533
+if(TRUE) #QTBUG-86533
if(TARGET Qt::WebEngineCore)
add_subdirectory(webengine)
add_subdirectory(webenginequick)
endif()