aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/0005-icu-use-system-library-only-targets.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2020-09-08 09:41:36 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2020-09-08 09:52:34 +0200
commitfaa5163a269b429c1d6bfd4387ced0aaff4eba69 (patch)
tree715edf950cf9da83e31548935e06f1be157c4788 /recipes-qt/qt5/qtwebengine/0005-icu-use-system-library-only-targets.patch
parentafcde8567252191820ed07abcc241f3794b75988 (diff)
qtwebengine: refresh the patches
* update to match https://github.com/meta-qt5/qtwebengine/commits/b5.15-glibc 5.15-glibc.meta-qt5.8 https://github.com/meta-qt5/qtwebengine/commits/b5.15 5.15-glibc.meta-qt5.8 https://github.com/meta-qt5/qtwebengine-chromium/commits/80-based-glibc 80-based-glibc.meta-qt5.4 https://github.com/meta-qt5/qtwebengine-chromium/commits/80-based 80-based.meta-qt5.4 * 0002-icu-use-system-library-only-targets.patch is only for chromium, so it was updated and moved to right place in SRC_URI * 0014-Fix-sandbox-Aw-snap-for-syscalls-403-and-407.patch prefix was moved to src/3rdparty not src/3rdparty/chromium so that it can apply with "git am" together with other chromium patches Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0005-icu-use-system-library-only-targets.patch')
-rwxr-xr-xrecipes-qt/qt5/qtwebengine/0005-icu-use-system-library-only-targets.patch90
1 files changed, 0 insertions, 90 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0005-icu-use-system-library-only-targets.patch b/recipes-qt/qt5/qtwebengine/0005-icu-use-system-library-only-targets.patch
deleted file mode 100755
index 066ee516..00000000
--- a/recipes-qt/qt5/qtwebengine/0005-icu-use-system-library-only-targets.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From fe811323fbe787264b15b83d027947926477f0c2 Mon Sep 17 00:00:00 2001
-From: Andrej Valek <andrej.valek@siemens.com>
-Date: Fri, 17 Apr 2020 09:43:32 +0200
-Subject: [PATCH] icu: use system library only targets
-
- - use bundled one for native/v8 internal builds
-
-Complete system ICU library using requires ICU dev package
-be installed on host. Enabling dependency on native package
-is not enough due to V8 hosttools toolchain. V8 toolchain
-is not using native sysroot, only a host packages.
-On the other hand webenegine does not produce external
-native artifacts. So external system ICU linking is not
-needed.
-
-Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
----
- src/3rdparty/chromium/third_party/icu/BUILD.gn | 18 ++++++++++++++----
- 1 file changed, 14 insertions(+), 4 deletions(-)
-
-diff --git a/src/3rdparty/chromium/third_party/icu/BUILD.gn b/src/3rdparty/chromium/third_party/icu/BUILD.gn
-index 97073f09787..5d293ca628d 100644
---- a/src/3rdparty/chromium/third_party/icu/BUILD.gn
-+++ b/src/3rdparty/chromium/third_party/icu/BUILD.gn
-@@ -7,9 +7,13 @@ import("//build/config/host_byteorder.gni")
- import("//build/config/linux/pkg_config.gni")
- import("//build/shim_headers.gni")
- import("//third_party/icu/config.gni")
-+import("//v8/gni/snapshot_toolchain.gni")
-
- declare_args() {
- use_system_icu = false
-+
-+ # Use only target icu library, when system using is enabled
-+ use_system_icu_target_only = false
- }
-
- if (is_android) {
-@@ -20,6 +24,12 @@ if (is_mac) {
- import("//build/config/sanitizers/sanitizers.gni")
- }
-
-+if (use_system_icu) {
-+ # Use system library only for target, otherwise use bundled
-+ if ((current_toolchain != host_toolchain) && (current_toolchain != v8_snapshot_toolchain)) {
-+ use_system_icu_target_only = true
-+ }
-+}
- # Meta target that includes both icuuc and icui18n. Most targets want both.
- # You can depend on the individually if you need to.
- group("icu") {
-@@ -1137,7 +1147,7 @@ config("system_icu_config") {
- }
- }
-
--if (use_system_icu) {
-+if (use_system_icu_target_only) {
- pkg_config("system_icui18n") {
- packages = [ "icu-i18n" ]
- }
-@@ -1346,7 +1356,7 @@ shim_headers("icuuc_shim") {
- }
-
- config("icu_config") {
-- if (use_system_icu) {
-+ if (use_system_icu_target_only) {
- configs = [ ":system_icu_config"]
- } else {
- configs = [ ":bundled_icu_config"]
-@@ -1354,7 +1364,7 @@ config("icu_config") {
- }
-
- group("icuuc") {
-- if (use_system_icu) {
-+ if (use_system_icu_target_only) {
- deps = [ ":icuuc_shim" ]
- public_configs = [
- ":system_icu_config",
-@@ -1366,7 +1376,7 @@ group("icuuc") {
- }
-
- group("icui18n") {
-- if (use_system_icu) {
-+ if (use_system_icu_target_only) {
- deps = [ ":icui18n_shim" ]
- public_configs = [
- ":system_icu_config",
---
-2.20.1
-