| 1 |
commit: 35506c7c014973e97a1d4234d055dd018bb5d769 |
| 2 |
Author: Pawel Hajdan, Jr <phajdan.jr <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Dec 7 21:18:42 2015 +0000 |
| 4 |
Commit: Paweł Hajdan <phajdan.jr <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Dec 7 21:19:16 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35506c7c |
| 7 |
|
| 8 |
www-client/chromium: beta channel bump (48.0.2564.23) |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.20.1 |
| 11 |
|
| 12 |
www-client/chromium/Manifest | 2 +- |
| 13 |
...omium-48.0.2560.0.ebuild => chromium-48.0.2564.23.ebuild} | 12 ++++++++++-- |
| 14 |
www-client/chromium/files/chromium-system-icu-r0.patch | 11 +++++++++++ |
| 15 |
3 files changed, 22 insertions(+), 3 deletions(-) |
| 16 |
|
| 17 |
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest |
| 18 |
index a87f49d..c84129c 100644 |
| 19 |
--- a/www-client/chromium/Manifest |
| 20 |
+++ b/www-client/chromium/Manifest |
| 21 |
@@ -1,3 +1,3 @@ |
| 22 |
DIST chromium-47.0.2526.73-lite.tar.xz 317476384 SHA256 f1b79a5c8dffc4606076fa6c1797aac0da2f3d0c41457eb271769413820987b0 SHA512 3a7d27d258c7b15a26f5a009c58d1d8a1b0ff181b427d63e01d610846eda94bf16c90bbbab5939dbdef187b90cbfb4b1ba1663d7b32804a6414399f96c274bc8 WHIRLPOOL 87b450ab5849baeb98738d47d43cf478db58072a0dcf7f54b9ffd0f2f479cb4aeff1bd3fb857383f9c4be80196589cd355186576c2d60d4f81f65f28ac9df1ea |
| 23 |
-DIST chromium-48.0.2560.0.tar.xz 395160400 SHA256 d2c1b9ad53dcaa08302d1dbfa74dc5d003c3c62ce1cd4b6eaf05d274d1af462b SHA512 422b09b0cfafc8761d6addb178b065a7de8f72d0c312b2288a991916536c06403a819b4ec6e3bc37ff0c2fd1ba8b8929f4e43b57a732a03bd5531208cc48e10f WHIRLPOOL 76bff863a212de3a74696e83924f9b5d4c70c045b9d309b0d25267458228761eee4505e2f5b93ac037358f14bc704a41ae03970c7f2ba96192a738fec611dae8 |
| 24 |
DIST chromium-48.0.2564.10.tar.xz 432060420 SHA256 1902d75d49d46c32a8c33f6de53c9253a63a364b85eb4ada1e8a9ba7c0f523d0 SHA512 7753dc19a50c862211c10975b3ad64a0408e3645df7b0ea548f8437c4c5380ad0bb350920eb8c6791e0685ae7ec921c6be720e337a17dffe4b73c56b74a2bc9a WHIRLPOOL a9ccb2872ad639886288581e1c7d9244f16965ef924395531701289cc69c5a9dfdc4a25175151d27b150acc8e4398c8d91ca5f8f3e623c3c85c8b99d913c4f00 |
| 25 |
+DIST chromium-48.0.2564.23.tar.xz 1099898120 SHA256 e9a5eeaedb1975a93d37bc865d3122cf28b7e3a246c06ba19204edaefbce1266 SHA512 72b253f39b561e53c0ef2220402ae15e8d2cdd1af8eab4d5fa8480316919df9059dddf4f4c0d027f78fd0db924b7cbd23d29d406808d18fa047ccddffb6701b3 WHIRLPOOL c133e8e389b560efcc239e2f24bb3befd3fe8731bb2529aeee3f2ae04bf09e5d815ef805750c48dd549fb0b94c1ab77d94b03a0b8245cd537bdb204c79393761 |
| 26 |
|
| 27 |
diff --git a/www-client/chromium/chromium-48.0.2560.0.ebuild b/www-client/chromium/chromium-48.0.2564.23.ebuild |
| 28 |
similarity index 98% |
| 29 |
rename from www-client/chromium/chromium-48.0.2560.0.ebuild |
| 30 |
rename to www-client/chromium/chromium-48.0.2564.23.ebuild |
| 31 |
index 2f6e233..49ea972 100644 |
| 32 |
--- a/www-client/chromium/chromium-48.0.2560.0.ebuild |
| 33 |
+++ b/www-client/chromium/chromium-48.0.2564.23.ebuild |
| 34 |
@@ -190,12 +190,13 @@ pkg_setup() { |
| 35 |
} |
| 36 |
|
| 37 |
src_prepare() { |
| 38 |
- epatch "${FILESDIR}/${PN}-system-ffmpeg-r0.patch" |
| 39 |
+ epatch "${FILESDIR}/${PN}-system-ffmpeg-r1.patch" |
| 40 |
epatch "${FILESDIR}/${PN}-system-jinja-r7.patch" |
| 41 |
epatch "${FILESDIR}/${PN}-widevine-r1.patch" |
| 42 |
- epatch "${FILESDIR}/${PN}-werror-r0.patch" |
| 43 |
epatch "${FILESDIR}/${PN}-last-commit-position-r0.patch" |
| 44 |
epatch "${FILESDIR}/${PN}-snapshot-toolchain-r0.patch" |
| 45 |
+ epatch "${FILESDIR}/${PN}-rpath-r0.patch" |
| 46 |
+ epatch "${FILESDIR}/${PN}-system-icu-r0.patch" |
| 47 |
|
| 48 |
epatch_user |
| 49 |
|
| 50 |
@@ -334,6 +335,9 @@ src_configure() { |
| 51 |
local myconf_gyp="" |
| 52 |
local myconf_gn="" |
| 53 |
|
| 54 |
+ # GN needs explicit config for Debug/Release as opposed to inferring it from build directory. |
| 55 |
+ myconf_gn+=" is_debug=false" |
| 56 |
+ |
| 57 |
# Never tell the build system to "enable" SSE2, it has a few unexpected |
| 58 |
# additions, bug #336871. |
| 59 |
myconf_gyp+=" -Ddisable_sse2=1" |
| 60 |
@@ -633,6 +637,10 @@ src_install() { |
| 61 |
doins out/Release/*.bin || die |
| 62 |
doins out/Release/*.pak || die |
| 63 |
|
| 64 |
+ if use gn; then |
| 65 |
+ doins out/Release/icudtl.dat || die |
| 66 |
+ fi |
| 67 |
+ |
| 68 |
doins -r out/Release/locales || die |
| 69 |
doins -r out/Release/resources || die |
| 70 |
|
| 71 |
|
| 72 |
diff --git a/www-client/chromium/files/chromium-system-icu-r0.patch b/www-client/chromium/files/chromium-system-icu-r0.patch |
| 73 |
new file mode 100644 |
| 74 |
index 0000000..e1e2135 |
| 75 |
--- /dev/null |
| 76 |
+++ b/www-client/chromium/files/chromium-system-icu-r0.patch |
| 77 |
@@ -0,0 +1,11 @@ |
| 78 |
+--- components/autofill/core/common/autofill_l10n_util.cc.orig 2015-12-07 11:46:37.738740329 +0000 |
| 79 |
++++ components/autofill/core/common/autofill_l10n_util.cc 2015-12-07 11:46:44.574878953 +0000 |
| 80 |
+@@ -22,7 +22,7 @@ |
| 81 |
+ // library. This could be due to a device-specific issue (has been seen in |
| 82 |
+ // the wild on Android devices). In the failure case, |collator_| will be |
| 83 |
+ // null. See http://crbug.com/558625. |
| 84 |
+- icu_54::UnicodeString name; |
| 85 |
++ icu::UnicodeString name; |
| 86 |
+ std::string locale_name; |
| 87 |
+ locale.getDisplayName(name).toUTF8String(locale_name); |
| 88 |
+ LOG(ERROR) << "Failed to initialize the ICU Collator for " |
Archives