[arch-commits] Commit in chromium/trunk (4 files)
Evangelos Foutras
foutrelis at archlinux.org
Wed Oct 17 04:48:36 UTC 2018
Date: Wednesday, October 17, 2018 @ 04:48:35
Author: foutrelis
Revision: 336779
upgpkg: chromium 70.0.3538.67-1
New upstream release.
Added:
chromium/trunk/include-stdint.h-in-pdfium_mem_buffer_file_write.h.patch
Modified:
chromium/trunk/PKGBUILD
Deleted:
chromium/trunk/fix-cfi-icall-failure-with-use_system_libjpeg-true.patch
chromium/trunk/only-disable-cfi-icall-when-use_system_libjpeg-true.patch
-----------------------------------------------------------+
PKGBUILD | 21 ++--
fix-cfi-icall-failure-with-use_system_libjpeg-true.patch | 52 ------------
include-stdint.h-in-pdfium_mem_buffer_file_write.h.patch | 30 ++++++
only-disable-cfi-icall-when-use_system_libjpeg-true.patch | 34 -------
4 files changed, 42 insertions(+), 95 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-10-17 04:08:44 UTC (rev 336778)
+++ PKGBUILD 2018-10-17 04:48:35 UTC (rev 336779)
@@ -4,7 +4,7 @@
# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
pkgname=chromium
-pkgver=69.0.3497.100
+pkgver=70.0.3538.67
pkgrel=1
_launcher_ver=6
pkgdesc="A web browser built for speed, simplicity, and security"
@@ -23,15 +23,13 @@
install=chromium.install
source=(https://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$pkgver.tar.xz
chromium-launcher-$_launcher_ver.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v$_launcher_ver.tar.gz
- fix-cfi-icall-failure-with-use_system_libjpeg-true.patch
- only-disable-cfi-icall-when-use_system_libjpeg-true.patch
+ include-stdint.h-in-pdfium_mem_buffer_file_write.h.patch
chromium-widevine-r2.patch
chromium-system-icu.patch
chromium-skia-harmony.patch)
-sha256sums=('e3391560e73e25fb4afc3f2dd5616607e2dbfc58aa88251a2c5d6b7096fe9e35'
+sha256sums=('e956c2031f634300ada8c09e0777f0c560f4798963f144edaaec8d43e1e30e37'
'04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1'
- '97b421bc60a4abdf37de2d88a51b973e9f68fb44d1eccd464adfb3d9f5d71478'
- '9cae9ded6497afd15ad72d963897425ab6c7f28941bb3c3948e7996610a0d180'
+ 'cd1e87bf3618b7897c5caf7b0f4213cfa5ce917acb0613ecd2ab3f830f0cbfbb'
'02c69bb3954087db599def7f5b6d65cf8f7cf2ed81dfbdaa4bb7b51863b4df15'
'c4f2d1bed9034c02b8806f00c2e8165df24de467803855904bff709ceaf11af5'
'feca54ab09ac0fc9d0626770a6b899a6ac5a12173c7d0c1005bc3964ec83e7b3')
@@ -78,10 +76,15 @@
sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
tools/generate_shim_headers/generate_shim_headers.py
- # 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/893950
+ sed -i -e 's/\<xmlMalloc\>/malloc/' -e 's/\<xmlFree\>/free/' \
+ third_party/blink/renderer/core/xml/*.cc \
+ third_party/blink/renderer/core/xml/parser/xml_document_parser.cc \
+ third_party/libxml/chromium/libxml_utils.cc
+ # https://crbug.com/879900
+ patch -Np1 -i ../include-stdint.h-in-pdfium_mem_buffer_file_write.h.patch
+
# https://crbug.com/skia/6663#c10
patch -Np4 -i ../chromium-skia-harmony.patch
Deleted: fix-cfi-icall-failure-with-use_system_libjpeg-true.patch
===================================================================
--- fix-cfi-icall-failure-with-use_system_libjpeg-true.patch 2018-10-17 04:08:44 UTC (rev 336778)
+++ fix-cfi-icall-failure-with-use_system_libjpeg-true.patch 2018-10-17 04:48:35 UTC (rev 336779)
@@ -1,52 +0,0 @@
-From db82db1b609f30d144d45477f55697818bcd363c Mon Sep 17 00:00:00 2001
-From: Vlad Tsyrklevich <vtsyrklevich at chromium.org>
-Date: Tue, 31 Jul 2018 01:03:22 +0000
-Subject: [PATCH] Fix cfi-icall failure with use_system_libjpeg=true
-
-JPEGImageReader::AllocateSampleArray() can call the function pointer
-(*info_.mem->alloc_sarray) which can be set by the systems non-CFI
-enabled libjpeg DSO when chromium is built with use_system_libjpeg=true.
-Disable cfi-icall for that method.
-
-Bug: 866290
-Change-Id: I6d9bbf08c514d6d5f48ad34c3802c63419ed1223
-Reviewed-on: https://chromium-review.googlesource.com/1155927
-Reviewed-by: Kentaro Hara <haraken at chromium.org>
-Commit-Queue: Vlad Tsyrklevich <vtsyrklevich at chromium.org>
-Cr-Commit-Position: refs/heads/master@{#579270}
----
- .../renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc | 2 +-
- third_party/blink/renderer/platform/wtf/compiler.h | 2 ++
- 2 files changed, 3 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 a1e440f6eed5..fd4e72ba053c 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,7 @@ class JPEGImageReader final {
- IntSize UvSize() const { return uv_size_; }
-
- private:
-- JSAMPARRAY AllocateSampleArray() {
-+ NO_SANITIZE_CFI_ICALL JSAMPARRAY AllocateSampleArray() {
- // Some output color spaces don't need the sample array: don't allocate in that
- // case.
- #if defined(TURBO_JPEG_RGB_SWIZZLE)
-diff --git a/third_party/blink/renderer/platform/wtf/compiler.h b/third_party/blink/renderer/platform/wtf/compiler.h
-index 51595afdc955..5225a70309d6 100644
---- a/third_party/blink/renderer/platform/wtf/compiler.h
-+++ b/third_party/blink/renderer/platform/wtf/compiler.h
-@@ -57,8 +57,10 @@
- #if defined(__clang__)
- #define NO_SANITIZE_UNRELATED_CAST \
- __attribute__((no_sanitize("cfi-unrelated-cast", "vptr")))
-+#define NO_SANITIZE_CFI_ICALL __attribute__((no_sanitize("cfi-icall")))
- #else
- #define NO_SANITIZE_UNRELATED_CAST
-+#define NO_SANITIZE_CFI_ICALL
- #endif
-
- #endif /* WTF_Compiler_h */
---
-2.18.0
-
Added: include-stdint.h-in-pdfium_mem_buffer_file_write.h.patch
===================================================================
--- include-stdint.h-in-pdfium_mem_buffer_file_write.h.patch (rev 0)
+++ include-stdint.h-in-pdfium_mem_buffer_file_write.h.patch 2018-10-17 04:48:35 UTC (rev 336779)
@@ -0,0 +1,30 @@
+From e3ad3deb6a6e79284f3748fa7410311d87df91c5 Mon Sep 17 00:00:00 2001
+From: Henrique Nakashima <hnakashima at chromium.org>
+Date: Tue, 4 Sep 2018 16:49:51 +0000
+Subject: [PATCH] IWYU: stdint.h in pdfium_mem_buffer_file_write.h for uint8_t
+
+Bug: 879900
+Change-Id: I9c15d1c280a23c53d31f2d72c9d0d1db79eab886
+Reviewed-on: https://chromium-review.googlesource.com/1204410
+Reviewed-by: Lei Zhang <thestig at chromium.org>
+Commit-Queue: Henrique Nakashima <hnakashima at chromium.org>
+Cr-Commit-Position: refs/heads/master@{#588547}
+---
+ pdf/pdfium/pdfium_mem_buffer_file_write.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/pdf/pdfium/pdfium_mem_buffer_file_write.h b/pdf/pdfium/pdfium_mem_buffer_file_write.h
+index 03c54bb63800..82e82d23684d 100644
+--- a/pdf/pdfium/pdfium_mem_buffer_file_write.h
++++ b/pdf/pdfium/pdfium_mem_buffer_file_write.h
+@@ -6,6 +6,7 @@
+ #define PDF_PDFIUM_PDFIUM_MEM_BUFFER_FILE_WRITE_H_
+
+ #include <stddef.h>
++#include <stdint.h>
+
+ #include <vector>
+
+--
+2.19.0
+
Deleted: only-disable-cfi-icall-when-use_system_libjpeg-true.patch
===================================================================
--- only-disable-cfi-icall-when-use_system_libjpeg-true.patch 2018-10-17 04:08:44 UTC (rev 336778)
+++ only-disable-cfi-icall-when-use_system_libjpeg-true.patch 2018-10-17 04:48:35 UTC (rev 336779)
@@ -1,34 +0,0 @@
-From 20f81a066ffdf6bd30fb4b696b8b3e101368e2f6 Mon Sep 17 00:00:00 2001
-From: Vlad Tsyrklevich <vtsyrklevich at chromium.org>
-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 <haraken at chromium.org>
-Commit-Queue: Vlad Tsyrklevich <vtsyrklevich at chromium.org>
-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
-
More information about the arch-commits
mailing list