summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorseppiofish <seppia@seppia.net>2019-11-20 21:51:52 +0100
committerseppiofish <seppia@seppia.net>2019-11-20 21:51:52 +0100
commitcaba52511ca0b35190b690854920f4f44205a8d5 (patch)
treeaefcf1a2ea388f298b186f8e0dcf84a63d213306
parentd56d6a774618f1daba86628a1a45d2847e310c53 (diff)
downloadungoogled-chromium-caba52511ca0b35190b690854920f4f44205a8d5.tar.gz
ungoogled-chromium-caba52511ca0b35190b690854920f4f44205a8d5.tar.bz2
ungoogled-chromium-caba52511ca0b35190b690854920f4f44205a8d5.zip
Update to version 78.0.3904.108-1
Updated PKGBUILD and removed temporary icu patch since it has been included in official archlinux patchset.
-rw-r--r--.SRCINFO18
-rw-r--r--PKGBUILD19
-rw-r--r--icu65.patch64
3 files changed, 15 insertions, 86 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1ab144a..4a7172b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = ungoogled-chromium
pkgdesc = A lightweight approach to removing Google web service dependency
- pkgver = 78.0.3904.97
- pkgrel = 2
+ pkgver = 78.0.3904.108
+ pkgrel = 1
url = https://github.com/Eloston/ungoogled-chromium
arch = x86_64
license = BSD
@@ -59,16 +59,14 @@ pkgbase = ungoogled-chromium
optdepends = libva-vdpau-driver: for hardware video acceleration with NVIDIA GPUs
provides = chromium
conflicts = chromium
- source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-78.0.3904.97.tar.xz
+ source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-78.0.3904.108.tar.xz
source = chromium-launcher-6.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v6.tar.gz
- source = https://github.com/Eloston/ungoogled-chromium/archive/78.0.3904.97-2.tar.gz
- source = https://github.com/ungoogled-software/ungoogled-chromium-archlinux/archive/f2914b4d0e0a062da92f1434780dd168b12678db.tar.gz
- source = icu65.patch
- sha256sums = d1f49ab9f4f973536166f587114553c21a29977bdc350dd407a89d34e22a9d07
+ source = https://github.com/Eloston/ungoogled-chromium/archive/78.0.3904.108-1.tar.gz
+ source = https://github.com/ungoogled-software/ungoogled-chromium-archlinux/archive/49fbab5ba7a4224c2f0c7bff79b1b77c6f721fec.tar.gz
+ sha256sums = f9c53839f306d2973de27723360024f7904101d426b9e7e9cdb56e8bcc775b0e
sha256sums = 04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1
- sha256sums = 75f20b8bd35f64aeb4b079044f536e494dccbfa6ef6e4d5450dd3abf6abec368
- sha256sums = 781bc4f83298286c45fcc941484cbe23cf913a7149bf7233181922f8d58cd833
- sha256sums = 1de9bdbfed482295dda45c7d4e323cee55a34e42f66b892da1c1a778682b7a41
+ sha256sums = 80d069f27dcf90c984011b6d570c921948b17602f0f34016e46a159562acf710
+ sha256sums = 455fedaa1cde8ac9269b0a357a1b12d200fb2f11f8fa8f6e4e9247a015e455cf
pkgname = ungoogled-chromium
diff --git a/PKGBUILD b/PKGBUILD
index f66ca49..da3afc4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,9 +3,9 @@
# Derived from official Chromium and Inox PKGBUILDS and ungoogled-chromium buildkit
pkgname=ungoogled-chromium
-pkgver=78.0.3904.97
-_rev=2
-_archver=f2914b4d0e0a062da92f1434780dd168b12678db
+pkgver=78.0.3904.108
+_rev=1
+_archver=49fbab5ba7a4224c2f0c7bff79b1b77c6f721fec
pkgrel=${_rev}
_launcher_ver=6
pkgdesc="A lightweight approach to removing Google web service dependency"
@@ -29,13 +29,11 @@ conflicts=('chromium')
source=(https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$pkgver.tar.xz
chromium-launcher-$_launcher_ver.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v$_launcher_ver.tar.gz
https://github.com/Eloston/ungoogled-chromium/archive/$pkgver-$pkgrel.tar.gz
- https://github.com/ungoogled-software/ungoogled-chromium-archlinux/archive/${_archver}.tar.gz
- icu65.patch)
-sha256sums=('d1f49ab9f4f973536166f587114553c21a29977bdc350dd407a89d34e22a9d07'
+ https://github.com/ungoogled-software/ungoogled-chromium-archlinux/archive/${_archver}.tar.gz)
+sha256sums=('f9c53839f306d2973de27723360024f7904101d426b9e7e9cdb56e8bcc775b0e'
'04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1'
- '75f20b8bd35f64aeb4b079044f536e494dccbfa6ef6e4d5450dd3abf6abec368'
- '781bc4f83298286c45fcc941484cbe23cf913a7149bf7233181922f8d58cd833'
- '1de9bdbfed482295dda45c7d4e323cee55a34e42f66b892da1c1a778682b7a41')
+ '80d069f27dcf90c984011b6d570c921948b17602f0f34016e46a159562acf710'
+ '455fedaa1cde8ac9269b0a357a1b12d200fb2f11f8fa8f6e4e9247a015e455cf')
# Possible replacements are listed in build/linux/unbundle/replace_gn_files.py
# Keys are the names in the above script; values are the dependencies in Arch
@@ -73,9 +71,6 @@ prepare() {
cd "$srcdir/chromium-$pkgver"
- # https://crbug.com/1014272
- patch -Np1 -i ../icu65.patch
-
msg2 'Pruning binaries'
python "$_utils/prune_binaries.py" ./ "$_ungoogled_repo/pruning.list"
msg2 'Applying patches'
diff --git a/icu65.patch b/icu65.patch
deleted file mode 100644
index 811d562..0000000
--- a/icu65.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 5679c3c191ed62b62d8db22f1657a296ee9bfe8e Mon Sep 17 00:00:00 2001
-From: Frank Tang <ftang@chromium.org>
-Date: Wed, 30 Oct 2019 22:49:47 +0000
-Subject: [PATCH] Update ICU to 65.1 from 64 and fix broken tests
-
-ICU 65-1 release note
-http://site.icu-project.org/download/65
-
-CLDR 36 release blog
-http://blog.unicode.org/2019/10/unicode-cldr-version-36-languagelocale.html
-
-Most of the test expectation change is due to CLDR 36 update
-of Grapheme Cluster for Indic languages
-See the following for related changes in ICU 65.1 in this area:
-https://unicode-org.atlassian.net/browse/CLDR-10994
-https://unicode-org.atlassian.net/browse/ICU-13637
-https://github.com/unicode-org/cldr/blob/master/common/properties/segments/readme.txt
-
-Bug: chromium:1014272, chromium:1017047
-Change-Id: I9fc6d4620bf2a4c189940d06d8c79893502db3dd
-Cq-Include-Trybots: luci.chromium.try:linux_layout_tests_layout_ng_disabled
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1866059
-Reviewed-by: Jungshik Shin <jshin@chromium.org>
-Reviewed-by: Doug Turner <dougt@chromium.org>
-Reviewed-by: Michael Wasserman <msw@chromium.org>
-Reviewed-by: Kent Tamura <tkent@chromium.org>
-Reviewed-by: Trent Apted <tapted@chromium.org>
-Reviewed-by: Mason Freed <masonfreed@chromium.org>
-Commit-Queue: Frank Tang <ftang@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#711027}
----
- third_party/blink/renderer/core/dom/document.cc | 2 +-
- ui/gfx/render_text_harfbuzz.cc | 5 ++++-
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc
-index 511aac29086..f188cf548a6 100644
---- a/third_party/blink/renderer/core/dom/document.cc
-+++ b/third_party/blink/renderer/core/dom/document.cc
-@@ -6191,7 +6191,7 @@ static ParseQualifiedNameResult ParseQualifiedNameInternal(
-
- for (unsigned i = 0; i < length;) {
- UChar32 c;
-- U16_NEXT(characters, i, length, c)
-+ U16_NEXT(characters, i, length, c);
- if (c == ':') {
- if (saw_colon)
- return ParseQualifiedNameResult(kQNMultipleColons);
-diff --git a/ui/gfx/render_text_harfbuzz.cc b/ui/gfx/render_text_harfbuzz.cc
-index 50e86af6b97..0339ff3ff8e 100644
---- a/ui/gfx/render_text_harfbuzz.cc
-+++ b/ui/gfx/render_text_harfbuzz.cc
-@@ -971,7 +971,10 @@ RangeF TextRunHarfBuzz::GetGraphemeBounds(RenderTextHarfBuzz* render_text,
- ++total;
- }
- }
-- DCHECK_GT(total, 0);
-+ // With ICU 65.1, DCHECK_GT() below fails.
-+ // See https://crbug.com/1017047 for more details.
-+ //
-+ // DCHECK_GT(total, 0);
-
- // It's possible for |text_index| to point to a diacritical mark, at the end
- // of |chars|. In this case all the grapheme boundaries come before it. Just