From 5f6ecb3cd45067466e5cfba336afbcbd2789ff72 Mon Sep 17 00:00:00 2001 From: Rasmus Thomsen Date: Tue, 30 Oct 2018 14:40:21 +0100 Subject: [PATCH] chromium: update to 70.0.3538.77. [ci skip] --- .../patches/chromium-fix_harfbuzz_2.patch | 82 ++++++++++++++++--- srcpkgs/chromium/template | 4 +- 2 files changed, 71 insertions(+), 15 deletions(-) diff --git a/srcpkgs/chromium/patches/chromium-fix_harfbuzz_2.patch b/srcpkgs/chromium/patches/chromium-fix_harfbuzz_2.patch index 277e9c0618..95678c1292 100644 --- a/srcpkgs/chromium/patches/chromium-fix_harfbuzz_2.patch +++ b/srcpkgs/chromium/patches/chromium-fix_harfbuzz_2.patch @@ -1,10 +1,25 @@ -Source: Tom Briden -Upstream: No -Reason: Fix building against harfbuzz[>=2.0.0] +From 7ae38170a117e909bb28e1470842b68de3501197 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Sun, 21 Oct 2018 10:06:53 -0400 +Subject: [PATCH] blink: add 'const' modifier for harfbuzz hb_codepoint_t + pointers ---- third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc 2018-10-23 10:44:18.808106392 +0100 -+++ third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc 2018-10-23 10:44:59.552246024 +0100 -@@ -138,7 +138,7 @@ +This resolves a build failure against harfbuzz 2.0. + +Based on a patch by Alexandre Fierreira. + +Bug: https://bugs.gentoo.org/669034 +--- + .../renderer/platform/fonts/shaping/harfbuzz_face.cc | 2 +- + .../renderer/platform/fonts/skia/skia_text_metrics.cc | 9 +++++++-- + .../renderer/platform/fonts/skia/skia_text_metrics.h | 2 +- + 3 files changed, 9 insertions(+), 4 deletions(-) + +diff --git a/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc b/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc +index 8e7d91ca371f..e279a5876cb3 100644 +--- third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc ++++ third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc +@@ -139,7 +139,7 @@ static hb_position_t HarfBuzzGetGlyphHorizontalAdvance(hb_font_t* hb_font, static void HarfBuzzGetGlyphHorizontalAdvances(hb_font_t* font, void* font_data, unsigned count, @@ -13,12 +28,53 @@ Reason: Fix building against harfbuzz[>=2.0.0] unsigned int glyph_stride, hb_position_t* first_advance, unsigned int advance_stride, -@@ -146,7 +146,7 @@ - HarfBuzzFontData* hb_font_data = - reinterpret_cast(font_data); - SkiaTextMetrics(&hb_font_data->paint_) -- .GetGlyphWidthForHarfBuzz(count, first_glyph, glyph_stride, first_advance, -+ .GetGlyphWidthForHarfBuzz(count, (hb_codepoint_t*)first_glyph, glyph_stride, first_advance, - advance_stride); +diff --git a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc b/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc +index 77ec6209fab9..9f9070921448 100644 +--- third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc ++++ third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc +@@ -18,6 +18,11 @@ T* advance_by_byte_size(T* p, unsigned byte_size) { + return reinterpret_cast(reinterpret_cast(p) + byte_size); } ++template ++T* advance_by_byte_size_const(T* p, unsigned byte_size) { ++ return reinterpret_cast(reinterpret_cast(p) + byte_size); ++} ++ + } // namespace + + SkiaTextMetrics::SkiaTextMetrics(const SkPaint* paint) : paint_(paint) { +@@ -39,7 +44,7 @@ void SkiaTextMetrics::GetGlyphWidthForHarfBuzz(hb_codepoint_t codepoint, + } + + void SkiaTextMetrics::GetGlyphWidthForHarfBuzz(unsigned count, +- hb_codepoint_t* glyphs, ++ const hb_codepoint_t* glyphs, + unsigned glyph_stride, + hb_position_t* advances, + unsigned advance_stride) { +@@ -48,7 +53,7 @@ void SkiaTextMetrics::GetGlyphWidthForHarfBuzz(unsigned count, + // array that copy them to a regular array. + Vector glyph_array(count); + for (unsigned i = 0; i < count; +- i++, glyphs = advance_by_byte_size(glyphs, glyph_stride)) { ++ i++, glyphs = advance_by_byte_size_const(glyphs, glyph_stride)) { + glyph_array[i] = *glyphs; + } + Vector sk_width_array(count); +diff --git a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h b/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h +index 787d8af0375a..3bc4407c641b 100644 +--- third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h ++++ third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h +@@ -19,7 +19,7 @@ class SkiaTextMetrics final { + + void GetGlyphWidthForHarfBuzz(hb_codepoint_t, hb_position_t* width); + void GetGlyphWidthForHarfBuzz(unsigned count, +- hb_codepoint_t* first_glyph, ++ const hb_codepoint_t* first_glyph, + unsigned glyph_stride, + hb_position_t* first_advance, + unsigned advance_stride); +-- +2.19.1 + diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template index ecfa1dcece..ee716015e1 100644 --- a/srcpkgs/chromium/template +++ b/srcpkgs/chromium/template @@ -1,14 +1,14 @@ # Template file for 'chromium' pkgname=chromium # See http://www.chromium.org/developers/calendar for the latest version -version=70.0.3538.67 +version=70.0.3538.77 revision=1 short_desc="Google's attempt at creating a safer, faster, and more stable browser" maintainer="Rasmus Thomsen " homepage="https://www.chromium.org/" license="BSD-3-Clause" distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz" -checksum=e956c2031f634300ada8c09e0777f0c560f4798963f144edaaec8d43e1e30e37 +checksum=c914f86c4c8375b719eca89ea89dbec4ae3d09df3f758d5f7c91d4914d290449 only_for_archs="i686 x86_64 x86_64-musl" lib32disabled=yes