From: "Paweł Hajdan" <phajdan.jr@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/, www-client/chromium/files/
Date: Thu, 2 Jun 2016 20:14:40 +0000 (UTC) [thread overview]
Message-ID: <1464898306.07791dc9cfbb9d792bed87e4e7b75f2c13ea8d40.phajdan.jr@gentoo> (raw)
commit: 07791dc9cfbb9d792bed87e4e7b75f2c13ea8d40
Author: Pawel Hajdan, Jr <phajdan.jr <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 2 20:11:46 2016 +0000
Commit: Paweł Hajdan <phajdan.jr <AT> gentoo <DOT> org>
CommitDate: Thu Jun 2 20:11:46 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07791dc9
www-client/chromium: dev channel bump (52.0.2743.19)
Package-Manager: portage-2.2.26
www-client/chromium/Manifest | 2 +-
....2723.2.ebuild => chromium-52.0.2743.19.ebuild} | 49 ++++++++-------
.../chromium/files/chromium-system-jinja-r9.patch | 71 ++++++++++++++++++++++
3 files changed, 100 insertions(+), 22 deletions(-)
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index cbf4841..0213d4a 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,4 +1,4 @@
DIST chromium-50.0.2661.102.tar.xz 531505652 SHA256 12135ef890c2bd13b653a06e2a44e8f251a65fe9e91404c792d27e346c5d57c6 SHA512 277311b77df7331b996a1b08c2591c7407a57ba4ee9c93d82eaea63db7ffd1551647e04c64c5e460c58862ff2363d59a674043a41d6b7f05ff4b2b85f18c7e7e WHIRLPOOL 183c6e8dd0e195bc027a685c4064a0aaceaf880fae62b89b664a4cd1e1aedf9510961ce7b6c3e515f47222545bc695a5876a6ed4c8580ce599d1139cb3fd20f7
DIST chromium-51.0.2704.63.tar.xz 448628724 SHA256 b243e46e0ebaf8f60d1c37a0d99f1fdd80e1597667be4776a1862bb004e4eee9 SHA512 d85b6adcf2be5082ec8dc51f62849b3a2d84104d225188b7c5441cd3f9bb1e639b8d9b8cfb069b4a42d2f44128111649982fd20ca99b4f4ed5208c2c2c1a9560 WHIRLPOOL 0b3047c1c38386dbc20ef8fd6992e3c1cfc4e92986f5cbbd3e640671763ff5023427d0d8b5a6a6f6604aaeea4e2fa57e4b3f88d8e47e20684e5c774e8407c8fb
-DIST chromium-52.0.2723.2.tar.xz 466192080 SHA256 b463bca13a37f474e2d34e85d138d595e2e091e845f9bdc69c1090931de353a3 SHA512 fe7de4db588115e1f6155577c0dc721e8b54db5bd67a2c6dc495f75569d3a78060b9f7343c70ed5e04814b021f7031790da7a5486b25bbe41b11a256eb0cd163 WHIRLPOOL e7a911da45c7bdc8b887f27f14fda933e3c56ddea07f5af1c89f32a39c83511f06f2e7d30a7762fa90ca1fef4684e82ee06cc08fb2ef6e7a882fbba255e8d9f9
DIST chromium-52.0.2743.10.tar.xz 457933176 SHA256 9c27e642590a86123bc6abd4d61528927eb982c1ed22f5a7bb22bfad815d7cad SHA512 60302b834702434bff11966dcd5c7a6b7d1c1178a0ca5d65d58051ec0cafd6be301c8f2741298a48c1607466bcec6eb4f5d254480cce25ea3e5742a58d51bd93 WHIRLPOOL b9546216019aa7119f36ce42d873f6882cf3d1198e82134aa5ca4614959f365c7c1b4cf6d500c6637bf4cbe0b08923d1462c22c0a2115854da797c0af0c14ffb
+DIST chromium-52.0.2743.19.tar.xz 457854724 SHA256 e4149f479bea32142214b07b14912a011278917077e97819fb17fa83540eac16 SHA512 d29638959b8f36e70ce60bffc65b58878e5d607959062847b625d9d6acccfba14e96fbc0cd757b28283dd90bbc1ab336f8da65d4564df26bd86e260aa92cfd7c WHIRLPOOL f48864c796f6a98731de5253daf3d281d6613ada18528358dba9c1de9e86cc14a42f6bd60a5c05c3ddfb826a6eb371c1e5353b9b8e206b24d379225bb439fdbd
diff --git a/www-client/chromium/chromium-52.0.2723.2.ebuild b/www-client/chromium/chromium-52.0.2743.19.ebuild
similarity index 96%
rename from www-client/chromium/chromium-52.0.2723.2.ebuild
rename to www-client/chromium/chromium-52.0.2743.19.ebuild
index f390988..1ac904b 100644
--- a/www-client/chromium/chromium-52.0.2723.2.ebuild
+++ b/www-client/chromium/chromium-52.0.2743.19.ebuild
@@ -23,7 +23,7 @@ IUSE="cups gn gnome gnome-keyring gtk3 +hangouts hidpi hotwording kerberos neon
RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
# TODO: bootstrapped gn binary hangs when using tcmalloc with portage's sandbox.
-REQUIRED_USE="gn? ( kerberos !system-ffmpeg !tcmalloc )"
+REQUIRED_USE="gn? ( !tcmalloc )"
# Native Client binaries are compiled with different set of flags, bug #452066.
QA_FLAGS_IGNORED=".*\.nexe"
@@ -81,7 +81,6 @@ RDEPEND="
dev-libs/libxslt:=
media-libs/flac:=
>=media-libs/harfbuzz-0.9.41:=[icu(+)]
- >=media-libs/libjpeg-turbo-1.2.0-r1:=
>=media-libs/libwebp-0.4.0:=
sys-libs/zlib:=[minizip]
)"
@@ -189,11 +188,13 @@ pkg_setup() {
src_prepare() {
epatch "${FILESDIR}/${PN}-system-ffmpeg-r2.patch"
- epatch "${FILESDIR}/${PN}-system-jinja-r8.patch"
+ epatch "${FILESDIR}/${PN}-system-jinja-r9.patch"
epatch "${FILESDIR}/${PN}-widevine-r1.patch"
epatch "${FILESDIR}/${PN}-last-commit-position-r0.patch"
epatch "${FILESDIR}/${PN}-snapshot-toolchain-r1.patch"
- epatch "${FILESDIR}/${PN}-gn-r1.patch"
+ epatch "${FILESDIR}/${PN}-pdfium-r0.patch"
+ epatch "${FILESDIR}/${PN}-system-zlib-r0.patch"
+ epatch "${FILESDIR}/${PN}-linker-warnings-r0.patch"
epatch_user
@@ -205,23 +206,10 @@ src_prepare() {
conditional_bundled_libraries+="
base/third_party/libevent
third_party/adobe
- third_party/ffmpeg
- third_party/flac
- third_party/harfbuzz-ng
- third_party/icu
- third_party/jinja2
- third_party/libjpeg_turbo
- third_party/libpng
- third_party/libwebp
- third_party/libxml
- third_party/libxslt
- third_party/markupsafe
- third_party/snappy
third_party/speech-dispatcher
third_party/usb_ids
third_party/xdg-utils
- third_party/yasm
- third_party/zlib
+ third_party/yasm/run_yasm.py
"
fi
@@ -280,6 +268,7 @@ src_prepare() {
'third_party/libXNVCtrl' \
'third_party/libaddressinput' \
'third_party/libjingle' \
+ 'third_party/libjpeg_turbo' \
'third_party/libphonenumber' \
'third_party/libpng' \
'third_party/libsecret' \
@@ -288,8 +277,8 @@ src_prepare() {
'third_party/libusb' \
'third_party/libvpx' \
'third_party/libvpx/source/libvpx/third_party/x86inc' \
- 'third_party/libxml/chromium' \
'third_party/libwebm' \
+ 'third_party/libxml/chromium' \
'third_party/libyuv' \
'third_party/lss' \
'third_party/lzma_sdk' \
@@ -308,6 +297,8 @@ src_prepare() {
'third_party/pdfium/third_party/lcms2-2.6' \
'third_party/pdfium/third_party/libjpeg' \
'third_party/pdfium/third_party/libopenjpeg20' \
+ 'third_party/pdfium/third_party/libpng16' \
+ 'third_party/pdfium/third_party/libtiff' \
'third_party/pdfium/third_party/zlib_v128' \
'third_party/polymer' \
'third_party/protobuf' \
@@ -355,6 +346,7 @@ src_configure() {
# Use system-provided libraries.
# TODO: use_system_hunspell (upstream changes needed).
# TODO: use_system_icu (bug #576370).
+ # TODO: use_system_libjpeg (bug #584518).
# TODO: use_system_libpng (bug #578212).
# TODO: use_system_libsrtp (bug #459932).
# TODO: use_system_libusb (http://crbug.com/266149).
@@ -371,7 +363,6 @@ src_configure() {
-Duse_system_harfbuzz=1
-Duse_system_jsoncpp=1
-Duse_system_libevent=1
- -Duse_system_libjpeg=1
-Duse_system_libwebp=1
-Duse_system_libxml=1
-Duse_system_libxslt=1
@@ -382,6 +373,21 @@ src_configure() {
-Duse_system_xdg_utils=1
-Duse_system_zlib=1"
+ local gn_system_libraries="
+ flac
+ harfbuzz-ng
+ libevent
+ libwebp
+ libxml
+ libxslt
+ snappy
+ yasm
+ zlib"
+ if use system-ffmpeg; then
+ gn_system_libraries+=" ffmpeg"
+ fi
+ build/linux/unbundle/replace_gn_files.py --system-libraries ${gn_system_libraries} || die
+
# Needed for system icu - we don't need additional data files.
# myconf_gyp+=" -Dicu_use_data_file_flag=0"
@@ -407,8 +413,9 @@ src_configure() {
$(gyp_use tcmalloc use_allocator tcmalloc none)
$(gyp_use widevine enable_widevine)"
- myconf_gn+=" use_cups=$(usex cups true false)"
myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
+ myconf_gn+=" use_cups=$(usex cups true false)"
+ myconf_gn+=" use_kerberos=$(usex kerberos true false)"
# Use explicit library dependencies instead of dlopen.
# This makes breakages easier to detect by revdep-rebuild.
diff --git a/www-client/chromium/files/chromium-system-jinja-r9.patch b/www-client/chromium/files/chromium-system-jinja-r9.patch
new file mode 100644
index 0000000..1de9083
--- /dev/null
+++ b/www-client/chromium/files/chromium-system-jinja-r9.patch
@@ -0,0 +1,71 @@
+--- third_party/WebKit/Source/bindings/scripts/scripts.gyp.orig 2014-08-19 09:55:10.330972228 +0000
++++ third_party/WebKit/Source/bindings/scripts/scripts.gyp 2014-08-19 09:55:26.387286232 +0000
+@@ -54,7 +54,6 @@
+ 'actions': [{
+ 'action_name': 'cache_jinja_templates',
+ 'inputs': [
+- '<@(jinja_module_files)',
+ 'code_generator_v8.py',
+ '<@(code_generator_template_files)',
+ ],
+--- third_party/WebKit/Source/build/scripts/scripts.gypi.orig 2014-08-19 10:00:00.216521733 +0000
++++ third_party/WebKit/Source/build/scripts/scripts.gypi 2014-08-19 10:00:11.464735099 +0000
+@@ -2,10 +2,6 @@
+ {
+ 'variables': {
+ 'scripts_for_in_files': [
+- # jinja2/__init__.py contains version string, so sufficient as
+- # dependency for whole jinja2 package
+- '<(DEPTH)/third_party/jinja2/__init__.py',
+- '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep
+ 'hasher.py',
+ 'in_file.py',
+ 'in_generator.py',
+--- third_party/WebKit/Source/bindings/scripts/scripts.gypi.orig 2014-08-19 10:53:02.824618979 +0000
++++ third_party/WebKit/Source/bindings/scripts/scripts.gypi 2014-08-19 10:53:20.784957370 +0000
+@@ -12,9 +12,6 @@
+ '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep
+ ],
+ 'idl_lexer_parser_files': [
+- # PLY (Python Lex-Yacc)
+- '<(DEPTH)/third_party/ply/lex.py',
+- '<(DEPTH)/third_party/ply/yacc.py',
+ # Web IDL lexer/parser (base parser)
+ '<(DEPTH)/tools/idl_parser/idl_lexer.py',
+ '<(DEPTH)/tools/idl_parser/idl_node.py',
+--- third_party/WebKit/Source/platform/inspector_protocol/protocol.gyp.orig 2016-03-23 15:10:41.522637837 +0000
++++ third_party/WebKit/Source/platform/inspector_protocol/protocol.gyp 2016-03-23 15:10:56.938953740 +0000
+@@ -6,9 +6,6 @@
+ 'variables': {
+ 'blink_platform_output_dir': '<(SHARED_INTERMEDIATE_DIR)/blink/platform',
+ 'jinja_module_files': [
+- # jinja2/__init__.py contains version string, so sufficient for package
+- '<(DEPTH)/third_party/jinja2/__init__.py',
+- '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep
+ ],
+ },
+
+--- third_party/WebKit/Source/build/scripts/scripts.gni.orig 2016-06-02 09:54:28.510152077 +0000
++++ third_party/WebKit/Source/build/scripts/scripts.gni 2016-06-02 09:54:50.966612510 +0000
+@@ -9,10 +9,6 @@
+ _scripts_dir = "//third_party/WebKit/Source/build/scripts"
+
+ scripts_for_in_files = [
+- # jinja2/__init__.py contains version string, so sufficient as
+- # dependency for whole jinja2 package
+- "//third_party/jinja2/__init__.py",
+- "//third_party/markupsafe/__init__.py", # jinja2 dep
+ "$_scripts_dir/hasher.py",
+ "$_scripts_dir/in_file.py",
+ "$_scripts_dir/in_generator.py",
+--- third_party/WebKit/Source/bindings/scripts/BUILD.gn.orig 2016-06-02 10:03:01.100658943 +0000
++++ third_party/WebKit/Source/bindings/scripts/BUILD.gn 2016-06-02 10:03:13.240907715 +0000
+@@ -36,7 +36,7 @@
+ action("cached_jinja_templates") {
+ script = "code_generator_v8.py"
+
+- inputs = jinja_module_files + [ "code_generator_v8.py" ] +
++ inputs = [ "code_generator_v8.py" ] +
+ code_generator_template_files
+
+ # Dummy file to track dependency.
next reply other threads:[~2016-06-02 20:14 UTC|newest]
Thread overview: 140+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-02 20:14 Paweł Hajdan [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-03-25 11:21 [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/, www-client/chromium/files/ Matt Jolly
2025-02-14 12:02 Matt Jolly
2025-02-13 10:59 Matt Jolly
2025-02-06 23:43 Matt Jolly
2024-12-06 6:02 Matt Jolly
2024-08-08 2:14 Matt Jolly
2024-08-01 8:40 Matt Jolly
2024-07-29 22:43 Matt Jolly
2024-04-11 9:27 Matt Jolly
2023-06-10 5:31 Sam James
2023-05-05 23:27 Mike Gilbert
2023-04-20 17:43 Mike Gilbert
2023-04-13 21:23 Mike Gilbert
2023-01-25 11:17 Stephan Hartmann
2023-01-18 17:29 Stephan Hartmann
2022-12-17 22:05 Stephan Hartmann
2022-10-09 11:48 Stephan Hartmann
2022-10-06 9:12 Stephan Hartmann
2022-09-22 18:17 Stephan Hartmann
2022-08-21 13:04 Stephan Hartmann
2022-06-28 6:53 Stephan Hartmann
2022-06-14 17:01 Stephan Hartmann
2022-06-05 13:13 Stephan Hartmann
2022-06-01 21:06 Stephan Hartmann
2022-04-13 12:42 Stephan Hartmann
2022-04-08 12:28 Stephan Hartmann
2022-04-05 8:15 Stephan Hartmann
2022-03-06 8:29 Stephan Hartmann
2022-03-06 7:59 Stephan Hartmann
2022-02-15 18:45 Stephan Hartmann
2022-01-15 8:48 Stephan Hartmann
2022-01-12 19:56 Stephan Hartmann
2021-12-07 21:20 Stephan Hartmann
2021-11-24 8:06 Stephan Hartmann
2021-10-10 11:16 Stephan Hartmann
2021-09-25 7:47 Stephan Hartmann
2021-09-18 11:15 Stephan Hartmann
2021-08-03 21:08 Stephan Hartmann
2021-06-26 15:45 Stephan Hartmann
2021-04-17 12:38 Stephan Hartmann
2021-03-05 21:34 Stephan Hartmann
2021-02-20 11:43 Stephan Hartmann
2021-02-10 12:13 Stephan Hartmann
2021-01-22 8:59 Stephan Hartmann
2021-01-21 11:28 Stephan Hartmann
2021-01-10 21:36 Stephan Hartmann
2020-12-03 19:26 Stephan Hartmann
2020-11-08 12:34 Stephan Hartmann
2020-10-08 6:21 Stephan Hartmann
2020-09-24 16:38 Stephan Hartmann
2020-07-18 13:37 Mike Gilbert
2020-06-29 20:55 Mike Gilbert
2020-06-28 2:21 Mike Gilbert
2020-06-01 17:34 Mike Gilbert
2020-05-12 19:08 Mike Gilbert
2020-05-01 15:32 Mike Gilbert
2020-05-01 15:31 Mike Gilbert
2020-04-04 3:15 Mike Gilbert
2020-03-24 13:48 Mike Gilbert
2020-02-27 16:22 Mike Gilbert
2020-02-16 17:16 Mike Gilbert
2020-01-23 20:58 Mike Gilbert
2019-11-22 20:09 Mike Gilbert
2019-10-27 14:40 Mike Gilbert
2019-10-20 16:26 Mike Gilbert
2019-10-15 20:38 Mike Gilbert
2019-10-08 17:50 Mike Gilbert
2019-10-01 20:19 Mike Gilbert
2019-09-29 21:24 Mike Gilbert
2019-09-25 16:20 Mike Gilbert
2019-09-15 22:51 Mike Gilbert
2019-08-23 14:08 Mike Gilbert
2019-08-15 15:02 Mike Gilbert
2019-08-13 15:19 Mike Gilbert
2019-07-17 14:39 Mike Gilbert
2019-07-03 17:44 Mike Gilbert
2019-06-25 14:58 Mike Gilbert
2019-06-16 23:35 Mike Gilbert
2019-06-15 17:48 Mike Gilbert
2019-05-28 20:45 Mike Gilbert
2019-05-28 4:01 Mike Gilbert
2019-04-18 21:35 Pacho Ramos
2019-03-17 20:51 Mike Gilbert
2019-02-15 20:57 Mike Gilbert
2019-02-10 6:29 Mike Gilbert
2018-12-28 2:40 Jason A. Donenfeld
2018-11-05 3:30 Mike Gilbert
2018-10-15 4:59 Mike Gilbert
2018-09-30 21:28 Mike Gilbert
2018-07-22 4:46 Mike Gilbert
2018-06-15 17:39 Mike Gilbert
2018-06-10 2:48 Mike Gilbert
2018-06-09 18:21 Mike Gilbert
2018-05-09 17:12 Mike Gilbert
2018-05-06 17:29 Mike Gilbert
2018-04-25 21:02 Mike Gilbert
2018-04-23 16:14 Mike Gilbert
2018-03-09 21:03 Mike Gilbert
2018-02-09 17:06 Mike Gilbert
2017-12-24 22:11 Mike Gilbert
2017-12-23 17:45 Mike Gilbert
2017-12-16 23:24 Mike Gilbert
2017-12-16 14:07 Mike Gilbert
2017-11-13 18:19 Mike Gilbert
2017-11-12 17:49 Mike Gilbert
2017-09-30 16:26 Paweł Hajdan
2017-09-20 9:38 Paweł Hajdan
2017-09-18 15:33 Paweł Hajdan
2017-09-07 12:44 Paweł Hajdan
2017-08-22 22:08 Paweł Hajdan
2017-08-19 11:17 Paweł Hajdan
2017-08-09 16:19 Paweł Hajdan
2017-08-09 14:04 Mike Gilbert
2017-07-19 19:04 Paweł Hajdan
2017-05-24 7:07 Paweł Hajdan
2017-05-05 18:27 Paweł Hajdan
2017-04-28 15:45 Paweł Hajdan
2017-04-08 17:22 Paweł Hajdan
2017-03-29 16:27 Paweł Hajdan
2017-03-14 22:34 Mike Gilbert
2017-03-08 15:33 Paweł Hajdan
2017-02-18 14:35 Paweł Hajdan
2016-12-23 21:24 Mike Gilbert
2016-12-11 18:01 Mike Gilbert
2016-11-08 5:47 Mike Gilbert
2016-10-24 17:18 Mike Gilbert
2016-09-29 1:50 Mike Gilbert
2016-09-26 1:13 Mike Gilbert
2016-09-15 3:44 Mike Gilbert
2016-09-09 22:40 Paweł Hajdan
2016-08-24 10:23 Paweł Hajdan
2016-08-20 11:50 Paweł Hajdan
2016-08-10 20:33 Paweł Hajdan
2016-06-29 20:19 Paweł Hajdan
2016-04-20 20:06 Paweł Hajdan
2016-03-24 23:36 Paweł Hajdan
2016-01-07 20:39 Paweł Hajdan
2015-09-30 20:29 Paweł Hajdan
2015-09-11 16:31 Mike Gilbert
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1464898306.07791dc9cfbb9d792bed87e4e7b75f2c13ea8d40.phajdan.jr@gentoo \
--to=phajdan.jr@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox