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, qtwayland: refresh patches

Browse Source 
Refresh patches to fix build after latest submodule update.

Change-Id: I7f4e5d05287af89332b104b5a74f7ea93d049baa
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
This commit is contained in:
Mikko Gronoff 2023-05-04 11:45:54 +03:00
parent e82b7d8f1d
commit c97feb4696
2 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
recipes-qt/qt6/qtwayland/0001-Allow-qtwaylandscanner-to-be-built-without-dependenc.patch
View File

@ -1,4 +1,4 @@
From 2a4f01d115ce9a69a71ac8c028e1c9cae9db63b3 Mon Sep 17 00:00:00 2001
From 00acaf097df33091c3158b01d68e1cc52f313d2f Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Wed, 29 Jan 2020 12:39:09 +0200
Subject: [PATCH] Allow qtwaylandscanner to be built without dependencies
@ -10,12 +10,12 @@ Change-Id: I15aa5fc5128fcd0925d5950596bd56710b5b81d4
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 642afabb..08365f2d 100644
index 6649dfcc..02f677b8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,11 +21,6 @@ find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS
BuildInternals
@@ -18,11 +18,6 @@ find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS
)
qt_internal_project_setup()
-if(NOT MACOS AND NOT QNX AND (ANDROID OR NOT LINUX))
- message(NOTICE "Skipping the build as the condition \"LINUX OR MACOS OR QNX\" is not met.")
@ -26,10 +26,10 @@ index 642afabb..08365f2d 100644
Core
)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8e60f0ba..4b2639e3 100644
index 0ac09b52..b1d6fe0c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,7 +3,7 @@
@@ -6,7 +6,7 @@
qt_find_package(WaylandScanner PROVIDED_TARGETS Wayland::Scanner)
qt_find_package(Wayland 1.15 PROVIDED_TARGETS Wayland::Client Wayland::Server)

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

@ -1,4 +1,4 @@
From 6819917c14b55c4352dbd200bb6ab297bfd243fa Mon Sep 17 00:00:00 2001
From c480cd09ed0297975f533c538faf26c7d4fcbe48 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
@ -11,15 +11,15 @@ target binaries where needed.
Upstream-Status: Inappropriate [embedded specific]
Change-Id: I217c9122144f25bb2d28717e7248c2a51b149127
---
cmake/Functions.cmake | 8 ++++----
src/CMakeLists.txt | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
cmake/Functions.cmake | 12 +++++-------
src/CMakeLists.txt | 2 +-
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/cmake/Functions.cmake b/cmake/Functions.cmake
index 89f4cdd39..8845c94f7 100644
index b460dbbe8..98db2e52e 100644
--- a/cmake/Functions.cmake
+++ b/cmake/Functions.cmake
@@ -750,7 +750,7 @@ endfunction()
@@ -819,7 +819,7 @@ endfunction()
macro(create_pkg_config_host_wrapper buildDir)
find_package(PkgConfigHost)
@ -28,24 +28,31 @@ index 89f4cdd39..8845c94f7 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()
@@ -979,9 +979,9 @@ endmacro()
@@ -1055,15 +1055,13 @@ endmacro()
macro(append_toolchain_setup)
if(LINUX)
list(APPEND gnArgArg
- custom_toolchain="${buildDir}/target_toolchain:target"
- host_toolchain="${buildDir}/host_toolchain:host"
- v8_snapshot_toolchain="${buildDir}/v8_toolchain:v8"
+ custom_toolchain="//build/toolchain/yocto:yocto_target"
+ host_toolchain="//build/toolchain/yocto:yocto_native"
+ v8_snapshot_toolchain="//build/toolchain/yocto:yocto_target"
)
get_gn_arch(cpu ${TEST_architecture_arch})
if(CMAKE_CROSSCOMPILING)
- list(APPEND gnArgArg
- v8_snapshot_toolchain="${buildDir}/v8_toolchain:v8"
- target_cpu="${cpu}"
- )
+ list(APPEND gnArgArg target_cpu="${cpu}")
else()
list(APPEND gnArgArg host_cpu="${cpu}")
endif()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 921871bee..c6141988b 100644
index a62252783..3b7e4975f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -151,7 +151,7 @@ endif()
@@ -157,7 +157,7 @@ endif()
# HOST PROJECT
##