From 07791dc9cfbb9d792bed87e4e7b75f2c13ea8d40 Mon Sep 17 00:00:00 2001 From: "Pawel Hajdan, Jr" Date: Thu, 2 Jun 2016 22:11:46 +0200 Subject: [PATCH] www-client/chromium: dev channel bump (52.0.2743.19) Package-Manager: portage-2.2.26 --- www-client/chromium/Manifest | 2 +- ....2.ebuild => chromium-52.0.2743.19.ebuild} | 49 +++++++------ .../files/chromium-system-jinja-r9.patch | 71 +++++++++++++++++++ 3 files changed, 100 insertions(+), 22 deletions(-) rename www-client/chromium/{chromium-52.0.2723.2.ebuild => chromium-52.0.2743.19.ebuild} (96%) create mode 100644 www-client/chromium/files/chromium-system-jinja-r9.patch diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index cbf48415540d..0213d4a40287 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 f39098844657..1ac904be2e05 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 000000000000..1de9083f307c --- /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. -- 2.26.2