diff options
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/chromium/0022-Adjust-gyp-defines-for-eLinux.patch | 24 | ||||
| -rw-r--r-- | patches/chromium/third_party/icu/0001-Do-not-use-icu-config-on-eLinux.patch | 32 | ||||
| -rwxr-xr-x | patches/patch-chromium.sh | 1 | ||||
| -rwxr-xr-x | patches/update-patches.sh | 1 |
4 files changed, 55 insertions, 3 deletions
diff --git a/patches/chromium/0022-Adjust-gyp-defines-for-eLinux.patch b/patches/chromium/0022-Adjust-gyp-defines-for-eLinux.patch index 58e2b1324..f478727e1 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 000000000..c330325a7 --- /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 074563775..9c672ebf9 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 bbe34ef11..bb9e76bb8 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 |