From 68155e5fb7154f8060340ab5c7cce41a93411667 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Mon, 6 Jul 2015 10:53:00 +0800 Subject: [PATCH 1/4] Don't use OpenSSL for networking --- script/lib/config.py | 2 +- vendor/brightray | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/script/lib/config.py b/script/lib/config.py index 65289fb0a2..0670217a08 100644 --- a/script/lib/config.py +++ b/script/lib/config.py @@ -8,7 +8,7 @@ import sys BASE_URL = os.getenv('LIBCHROMIUMCONTENT_MIRROR') or \ 'http://gh-contractor-zcbenz.s3.amazonaws.com/libchromiumcontent' -LIBCHROMIUMCONTENT_COMMIT = 'a4410de75315f3ecc00db2314bfab184dcd914f8' +LIBCHROMIUMCONTENT_COMMIT = '04f2bc49c19819a12387351dcce4127e7b08966d' PLATFORM = { 'cygwin': 'win32', diff --git a/vendor/brightray b/vendor/brightray index 713bc65074..e555965b29 160000 --- a/vendor/brightray +++ b/vendor/brightray @@ -1 +1 @@ -Subproject commit 713bc650744c3ed987499f64743977c739f11186 +Subproject commit e555965b29420409638100c6095edd51c080d357 From 1979b42ee70247e4919c06b18db6567e2ecb7c3f Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Mon, 6 Jul 2015 12:04:41 +0800 Subject: [PATCH 2/4] OpenSSL is still used on Windows and Mac --- script/lib/config.py | 2 +- vendor/brightray | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/script/lib/config.py b/script/lib/config.py index 0670217a08..cdab2bbde0 100644 --- a/script/lib/config.py +++ b/script/lib/config.py @@ -8,7 +8,7 @@ import sys BASE_URL = os.getenv('LIBCHROMIUMCONTENT_MIRROR') or \ 'http://gh-contractor-zcbenz.s3.amazonaws.com/libchromiumcontent' -LIBCHROMIUMCONTENT_COMMIT = '04f2bc49c19819a12387351dcce4127e7b08966d' +LIBCHROMIUMCONTENT_COMMIT = '078eaea7bafb480b0a3f829b168c18d108000cb2' PLATFORM = { 'cygwin': 'win32', diff --git a/vendor/brightray b/vendor/brightray index e555965b29..706799700b 160000 --- a/vendor/brightray +++ b/vendor/brightray @@ -1 +1 @@ -Subproject commit e555965b29420409638100c6095edd51c080d357 +Subproject commit 706799700b6cbdd8c6657e7253f0395b38412d57 From 9afc016ff9fb059db9f2f31fff521da7e53033a7 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Mon, 6 Jul 2015 14:39:40 +0800 Subject: [PATCH 3/4] Allow ia32 and arm builds to fail for now The ia32 and arm libchromiumcontent can not build on CI for now. --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index af27529cdc..ff7272e3e5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,5 +17,8 @@ matrix: env: TARGET_ARCH=arm - os: linux env: TARGET_ARCH=ia32 + allow_failures: + - env: TARGET_ARCH=arm + - env: TARGET_ARCH=ia32 script: './script/cibuild' From 16fd56c083ef1e884ef9dd35aeb54d7a7aab2322 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Mon, 6 Jul 2015 14:40:51 +0800 Subject: [PATCH 4/4] Update libchromiumcontent to include cursors Refs: #1361. --- script/lib/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/lib/config.py b/script/lib/config.py index cdab2bbde0..b7407fd0f4 100644 --- a/script/lib/config.py +++ b/script/lib/config.py @@ -8,7 +8,7 @@ import sys BASE_URL = os.getenv('LIBCHROMIUMCONTENT_MIRROR') or \ 'http://gh-contractor-zcbenz.s3.amazonaws.com/libchromiumcontent' -LIBCHROMIUMCONTENT_COMMIT = '078eaea7bafb480b0a3f829b168c18d108000cb2' +LIBCHROMIUMCONTENT_COMMIT = 'e4505342f14c0131d64a5fd523485ef93df92050' PLATFORM = { 'cygwin': 'win32',