summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--patches/chromium/0022-Adjust-gyp-defines-for-eLinux.patch24
-rw-r--r--patches/chromium/third_party/icu/0001-Do-not-use-icu-config-on-eLinux.patch32
-rwxr-xr-xpatches/patch-chromium.sh1
-rwxr-xr-xpatches/update-patches.sh1
m---------src/3rdparty0
-rw-r--r--src/core/qtwebengine_extras.gypi8
6 files changed, 62 insertions, 4 deletions
diff --git a/patches/chromium/0022-Adjust-gyp-defines-for-eLinux.patch b/patches/chromium/0022-Adjust-gyp-defines-for-eLinux.patch
index 58e2b132..f478727e 100644
--- a/patches/chromium/0022-Adjust-gyp-defines-for-eLinux.patch
+++ b/patches/chromium/0022-Adjust-gyp-defines-for-eLinux.patch
@@ -16,11 +16,11 @@ Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
base/atomicops_internals_arm_gcc.h | 2 +-
base/base.gyp | 2 +-
base/base.gypi | 12 ++++++++++++
- build/linux/system.gyp | 2 +-
+ build/linux/system.gyp | 6 +++++-
net/net.gyp | 2 +-
skia/skia_chrome.gypi | 2 +-
skia/skia_library.gypi | 2 +-
- 7 files changed, 18 insertions(+), 6 deletions(-)
+ 7 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/base/atomicops_internals_arm_gcc.h b/base/atomicops_internals_arm_gcc.h
index 9f4fe2e..1964041 100644
@@ -72,7 +72,7 @@ index 11edab0..45d7180 100644
'sources!': [
'message_loop/message_pump_glib.cc',
diff --git a/build/linux/system.gyp b/build/linux/system.gyp
-index 1451afb..92c74805b 100644
+index 1451afb..2a2c8bd 100644
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -5,7 +5,7 @@
@@ -84,6 +84,24 @@ index 1451afb..92c74805b 100644
'pkg-config': './pkg-config-wrapper "<(sysroot)" "<(target_arch)"',
}, {
'pkg-config': 'pkg-config'
+@@ -506,6 +506,8 @@
+ {
+ 'target_name': 'libpci',
+ 'type': 'static_library',
++ 'conditions': [
++ ['use_x11==1', {
+ 'cflags': [
+ '<!@(<(pkg-config) --cflags libpci)',
+ ],
+@@ -566,6 +568,8 @@
+ 'process_outputs_as_sources': 1,
+ },
+ ],
++ }],
++ ],
+ },
+ {
+ 'target_name': 'libresolv',
diff --git a/net/net.gyp b/net/net.gyp
index c2d618e..69f4827 100644
--- a/net/net.gyp
diff --git a/patches/chromium/third_party/icu/0001-Do-not-use-icu-config-on-eLinux.patch b/patches/chromium/third_party/icu/0001-Do-not-use-icu-config-on-eLinux.patch
new file mode 100644
index 00000000..c330325a
--- /dev/null
+++ b/patches/chromium/third_party/icu/0001-Do-not-use-icu-config-on-eLinux.patch
@@ -0,0 +1,32 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Andras Becsi <andras.becsi@digia.com>
+Date: Tue, 6 May 2014 17:05:55 +0200
+Subject: Do not use icu-config on eLinux
+
+We require that the icu libs are in the default library seach path.
+---
+ icu.gyp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/icu.gyp b/icu.gyp
+index 4d8259a..416050d 100644
+--- a/icu.gyp
++++ b/icu.gyp
+@@ -642,6 +642,8 @@
+ ],
+ },
+ },{ # OS!="android"
++ 'conditions': [
++ ['qt_os!="embedded_linux"', {
+ 'link_settings': {
+ 'ldflags': [
+ '<!@(icu-config --ldflags)',
+@@ -650,6 +652,8 @@
+ '<!@(icu-config --ldflags-libsonly)',
+ ],
+ },
++ }],
++ ],
+ }],
+ ],
+ },
diff --git a/patches/patch-chromium.sh b/patches/patch-chromium.sh
index 07456377..9c672ebf 100755
--- a/patches/patch-chromium.sh
+++ b/patches/patch-chromium.sh
@@ -57,6 +57,7 @@ for MODULE in \
/third_party/libjingle/source/talk \
/third_party/libvpx \
/third_party/openssl \
+ /third_party/icu \
/tools/gyp \
/tools/grit \
/v8
diff --git a/patches/update-patches.sh b/patches/update-patches.sh
index bbe34ef1..bb9e76bb 100755
--- a/patches/update-patches.sh
+++ b/patches/update-patches.sh
@@ -50,6 +50,7 @@ for MODULE in \
/third_party/libjingle/source/talk \
/third_party/libvpx \
/third_party/openssl \
+ /third_party/icu \
/tools/gyp \
/tools/grit \
/v8
diff --git a/src/3rdparty b/src/3rdparty
-Subproject 5a97ad8d88cd71d70f5ff30eb37446ac5cea32f
+Subproject 2d4f839849d8de907d3addd09a0682a53bf47c6
diff --git a/src/core/qtwebengine_extras.gypi b/src/core/qtwebengine_extras.gypi
index 51f8c61f..af2874c3 100644
--- a/src/core/qtwebengine_extras.gypi
+++ b/src/core/qtwebengine_extras.gypi
@@ -63,7 +63,6 @@
'defines!': [
'OPENSSLDIR="/etc/ssl"',
],
- 'ldflags!': ['<!@(icu-config --ldflags)'], # remove garbage added by icu.gyp
'target_conditions': [
['_type=="shared_library"', {
'ldflags': [
@@ -71,6 +70,13 @@
'-Wl,-shared,-Bsymbolic',
],
}],
+ ['_toolset=="target"', {
+ 'libraries': [
+ '-licui18n',
+ '-licuuc',
+ '-licudata',
+ ],
+ }],
],
},
}],