summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-icu-use-system-library-only-targets.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0014-chromium-icu-use-system-library-only-targets.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0014-chromium-icu-use-system-library-only-targets.patch18
1 files changed, 9 insertions, 9 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-icu-use-system-library-only-targets.patch b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-icu-use-system-library-only-targets.patch
index 52607983..8a6660ff 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-icu-use-system-library-only-targets.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-icu-use-system-library-only-targets.patch
@@ -1,4 +1,4 @@
1From 8c9a4027426b0a2c56cc834da0dbad5b8378c2c6 Mon Sep 17 00:00:00 2001 1From 344e8a3945a29239dd2f27ea4969e3d64d5d8911 Mon Sep 17 00:00:00 2001
2From: Andrej Valek <andrej.valek@siemens.com> 2From: Andrej Valek <andrej.valek@siemens.com>
3Date: Fri, 17 Apr 2020 09:43:32 +0200 3Date: Fri, 17 Apr 2020 09:43:32 +0200
4Subject: [PATCH] chromium: icu: use system library only targets 4Subject: [PATCH] chromium: icu: use system library only targets
@@ -20,7 +20,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
20 1 file changed, 14 insertions(+), 4 deletions(-) 20 1 file changed, 14 insertions(+), 4 deletions(-)
21 21
22diff --git a/chromium/third_party/icu/BUILD.gn b/chromium/third_party/icu/BUILD.gn 22diff --git a/chromium/third_party/icu/BUILD.gn b/chromium/third_party/icu/BUILD.gn
23index 023d6e13a2c..312f34d6186 100644 23index 73673fa20ac..a656692c7bf 100644
24--- a/chromium/third_party/icu/BUILD.gn 24--- a/chromium/third_party/icu/BUILD.gn
25+++ b/chromium/third_party/icu/BUILD.gn 25+++ b/chromium/third_party/icu/BUILD.gn
26@@ -7,9 +7,13 @@ import("//build/config/host_byteorder.gni") 26@@ -7,9 +7,13 @@ import("//build/config/host_byteorder.gni")
@@ -37,9 +37,9 @@ index 023d6e13a2c..312f34d6186 100644
37 } 37 }
38 38
39 if (is_android) { 39 if (is_android) {
40@@ -20,6 +24,12 @@ if (is_mac) { 40@@ -23,6 +27,12 @@ if (is_mac) {
41 import("//build/config/sanitizers/sanitizers.gni") 41 assert(!icu_disable_thin_archive || !is_component_build,
42 } 42 "icu_disable_thin_archive only works in static library builds")
43 43
44+if (use_system_icu) { 44+if (use_system_icu) {
45+ # Use system library only for target, otherwise use bundled 45+ # Use system library only for target, otherwise use bundled
@@ -50,7 +50,7 @@ index 023d6e13a2c..312f34d6186 100644
50 # Meta target that includes both icuuc and icui18n. Most targets want both. 50 # Meta target that includes both icuuc and icui18n. Most targets want both.
51 # You can depend on the individually if you need to. 51 # You can depend on the individually if you need to.
52 group("icu") { 52 group("icu") {
53@@ -1207,7 +1217,7 @@ config("system_icu_config") { 53@@ -1222,7 +1232,7 @@ config("system_icu_config") {
54 } 54 }
55 } 55 }
56 56
@@ -59,7 +59,7 @@ index 023d6e13a2c..312f34d6186 100644
59 pkg_config("system_icui18n") { 59 pkg_config("system_icui18n") {
60 packages = [ "icu-i18n" ] 60 packages = [ "icu-i18n" ]
61 } 61 }
62@@ -1420,7 +1430,7 @@ shim_headers("icuuc_shim") { 62@@ -1435,7 +1445,7 @@ shim_headers("icuuc_shim") {
63 } 63 }
64 64
65 config("icu_config") { 65 config("icu_config") {
@@ -68,7 +68,7 @@ index 023d6e13a2c..312f34d6186 100644
68 configs = [ ":system_icu_config"] 68 configs = [ ":system_icu_config"]
69 } else { 69 } else {
70 configs = [ ":bundled_icu_config"] 70 configs = [ ":bundled_icu_config"]
71@@ -1428,7 +1438,7 @@ config("icu_config") { 71@@ -1443,7 +1453,7 @@ config("icu_config") {
72 } 72 }
73 73
74 group("icuuc") { 74 group("icuuc") {
@@ -77,7 +77,7 @@ index 023d6e13a2c..312f34d6186 100644
77 deps = [ ":icuuc_shim" ] 77 deps = [ ":icuuc_shim" ]
78 public_configs = [ 78 public_configs = [
79 ":system_icu_config", 79 ":system_icu_config",
80@@ -1440,7 +1450,7 @@ group("icuuc") { 80@@ -1455,7 +1465,7 @@ group("icuuc") {
81 } 81 }
82 82
83 group("icui18n") { 83 group("icui18n") {