Date: Wednesday, August 1, 2018 @ 10:21:52 Author: foutrelis Revision: 330142
upgpkg: chromium 68.0.3440.84-1 New upstream release. Added: chromium/trunk/only-disable-cfi-icall-when-use_system_libjpeg-true.patch Modified: chromium/trunk/PKGBUILD -----------------------------------------------------------+ PKGBUILD | 7 +- only-disable-cfi-icall-when-use_system_libjpeg-true.patch | 34 ++++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-08-01 10:00:30 UTC (rev 330141) +++ PKGBUILD 2018-08-01 10:21:52 UTC (rev 330142) @@ -5,7 +5,7 @@ # Contributor: Daniel J Griffiths <[email protected]> pkgname=chromium -pkgver=68.0.3440.75 +pkgver=68.0.3440.84 pkgrel=1 _launcher_ver=6 pkgdesc="A web browser built for speed, simplicity, and security" @@ -27,6 +27,7 @@ x11-fix-mixup-between-DIP-pixel-coordinates.patch blink-disable-XML-catalogs-at-runtime.patch fix-cfi-icall-failure-with-use_system_libjpeg-true.patch + only-disable-cfi-icall-when-use_system_libjpeg-true.patch chromium-cors-string-r0.patch chromium-ffmpeg-r1.patch chromium-libjpeg-r0.patch @@ -33,11 +34,12 @@ chromium-libwebp-shim-r0.patch chromium-widevine-r2.patch chromium-skia-harmony.patch) -sha256sums=('dc17783267853bdc0fb726363d2b8e30a0bf43b6cc2c768e1f37c92e8eb59541' +sha256sums=('1031d167ae18d8a37f9291ff0e9a3dca2337c0fc1031f2c243d0327b14ecc9d9' '04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1' 'e2c2754536243a60fa70541bbd4121715eccd83caa8f1fb1873bd994cd81f871' '98a5c41cf9687c52ee380d2b683c95387334c76254479c347bdb733646dab815' '97b421bc60a4abdf37de2d88a51b973e9f68fb44d1eccd464adfb3d9f5d71478' + '9cae9ded6497afd15ad72d963897425ab6c7f28941bb3c3948e7996610a0d180' 'f4141e48a25a1403250e9040c18936a16250ab707064dd54103066f40c7db41c' 'aa885330bc4180b78d915f9dfdfc3210038a0acab7b16735ea9828ab6a633bde' '6b8fc570607631d3558e99a82e92c11eeae9c960ebb0a83c13d46344d4b6adca' @@ -95,6 +97,7 @@ # https://crbug.com/866290 patch -Np1 -i ../fix-cfi-icall-failure-with-use_system_libjpeg-true.patch + patch -Np1 -i ../only-disable-cfi-icall-when-use_system_libjpeg-true.patch # https://crbug.com/skia/6663#c10 patch -Np4 -i ../chromium-skia-harmony.patch Added: only-disable-cfi-icall-when-use_system_libjpeg-true.patch =================================================================== --- only-disable-cfi-icall-when-use_system_libjpeg-true.patch (rev 0) +++ only-disable-cfi-icall-when-use_system_libjpeg-true.patch 2018-08-01 10:21:52 UTC (rev 330142) @@ -0,0 +1,34 @@ +From 20f81a066ffdf6bd30fb4b696b8b3e101368e2f6 Mon Sep 17 00:00:00 2001 +From: Vlad Tsyrklevich <[email protected]> +Date: Tue, 31 Jul 2018 23:21:09 +0000 +Subject: [PATCH] Only disable cfi-icall when use_system_libjpeg=true + +Bug: 866290 +Change-Id: Ic5d175b3b854665f50781650406d599d09ee9849 +Reviewed-on: https://chromium-review.googlesource.com/1157136 +Reviewed-by: Kentaro Hara <[email protected]> +Commit-Queue: Vlad Tsyrklevich <[email protected]> +Cr-Commit-Position: refs/heads/master@{#579614} +--- + .../platform/image-decoders/jpeg/jpeg_image_decoder.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/third_party/blink/renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc b/third_party/blink/renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc +index fd4e72ba053c..afa90d83efee 100644 +--- a/third_party/blink/renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc ++++ b/third_party/blink/renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc +@@ -643,7 +643,10 @@ class JPEGImageReader final { + IntSize UvSize() const { return uv_size_; } + + private: +- NO_SANITIZE_CFI_ICALL JSAMPARRAY AllocateSampleArray() { ++#if defined(USE_SYSTEM_LIBJPEG) ++ NO_SANITIZE_CFI_ICALL ++#endif ++ JSAMPARRAY AllocateSampleArray() { + // Some output color spaces don't need the sample array: don't allocate in that + // case. + #if defined(TURBO_JPEG_RGB_SWIZZLE) +-- +2.18.0 +
