summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorsL1pKn072019-07-30 22:32:24 +0200
committersL1pKn072019-07-30 22:32:24 +0200
commit9016301168092fdc18c239068af667b67a832732 (patch)
tree74d6bebbb058b8ace0df8b0c63f839846d40b427
parentcdf95985250245286bd0036e78d500eb09ea1717 (diff)
downloadaur-9016301168092fdc18c239068af667b67a832732.tar.gz
update patch
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD6
-rw-r--r--chromium-skia-harmony-r1.patch15
3 files changed, 5 insertions, 20 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 24b5041ea17..85fda0fb4d6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -45,7 +45,7 @@ pkgbase = chromium-dev
source = chromium-dev.svg
source = enable-vaapi.patch
source = chromium-widevine-r4.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/chromium-widevine.patch?h=packages/chromium
- source = chromium-skia-harmony-r1.patch
+ source = chromium-skia-harmony-r2.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/chromium-skia-harmony.patch?h=packages/chromium
source = vaapi.diff.base64::https://chromium-review.googlesource.com/changes/chromium%2Fsrc~1713435/revisions/1/patch?download
source = memory.diff.base64::https://chromium-review.googlesource.com/changes/chromium%2Fsrc~1713037/revisions/1/patch?download
source = system_harfbuzz.diff.base64::https://chromium-review.googlesource.com/changes/chromium%2Fsrc~1715288/revisions/1/patch?download
@@ -54,7 +54,7 @@ pkgbase = chromium-dev
sha256sums = dd2b5c4191e468972b5ea8ddb4fa2e2fa3c2c94c79fc06645d0efc0e63ce7ee1
sha256sums = 3cf77d5c90f46fa25f51a6c355f637395e2af84d584350fca406ebf5c3866e76
sha256sums = d081f2ef8793544685aad35dea75a7e6264a2cb987ff3541e6377f4a3650a28b
- sha256sums = 0dd2fea50a93b26debce63c762c0291737b61816ba5b127ef923999494142b78
+ sha256sums = 771292942c0901092a402cc60ee883877a99fb804cb54d568c8c6c94565a48e1
sha256sums = 43810f59d73d6660b1b52989e15a02a3103ac2ab8f8561716cb67e0e0acce109
sha256sums = d8bec3a727488ab3d0d2a5215537075aa63cd244052a1ac2c37c402fc4f31265
sha256sums = c02a9701382b47391f7cd77529e5bf69a06461b503b50f64c60b8e16760a22aa
diff --git a/PKGBUILD b/PKGBUILD
index a21907008ee..38f5f0ce817 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -82,7 +82,7 @@ source=(
'enable-vaapi.patch' # Use Saikrishna Arcot patch again :https://raw.githubusercontent.com/saiarcot895/chromium-ubuntu-build/a996c32c7ae7b369799b528daddb7be3c8b67de4/debian/patches/enable_vaapi_on_linux_2.diff'
# Patch from crbug.com (chromium bugtracker), chromium-review.googlesource.com / Gerrit or Arch chromium package.
'chromium-widevine-r4.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/chromium-widevine.patch?h=packages/chromium'
- 'chromium-skia-harmony-r1.patch'
+ 'chromium-skia-harmony-r2.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/chromium-skia-harmony.patch?h=packages/chromium'
'vaapi.diff.base64::https://chromium-review.googlesource.com/changes/chromium%2Fsrc~1713435/revisions/1/patch?download' # https://chromium-review.googlesource.com/c/chromium/src/+/1713435
'memory.diff.base64::https://chromium-review.googlesource.com/changes/chromium%2Fsrc~1713037/revisions/1/patch?download' # https://chromium-review.googlesource.com/c/chromium/src/+/1713037
'system_harfbuzz.diff.base64::https://chromium-review.googlesource.com/changes/chromium%2Fsrc~1715288/revisions/1/patch?download' # https://chromium-review.googlesource.com/c/chromium/src/+/1715288
@@ -98,7 +98,7 @@ sha256sums=(
'3cf77d5c90f46fa25f51a6c355f637395e2af84d584350fca406ebf5c3866e76'
# Patch from crbug (chromium bugtracker) or Arch chromium package
'd081f2ef8793544685aad35dea75a7e6264a2cb987ff3541e6377f4a3650a28b'
- '0dd2fea50a93b26debce63c762c0291737b61816ba5b127ef923999494142b78'
+ '771292942c0901092a402cc60ee883877a99fb804cb54d568c8c6c94565a48e1'
'43810f59d73d6660b1b52989e15a02a3103ac2ab8f8561716cb67e0e0acce109'
'd8bec3a727488ab3d0d2a5215537075aa63cd244052a1ac2c37c402fc4f31265'
'c02a9701382b47391f7cd77529e5bf69a06461b503b50f64c60b8e16760a22aa'
@@ -507,7 +507,7 @@ prepare() {
# # Patch from crbug.com (chromium bugtracker), chromium-review.googlesource.com / Gerrit or Arch chromium package.
# https://crbug.com/skia/6663#c10.
- patch -p0 -i "${srcdir}/chromium-skia-harmony-r1.patch"
+ patch -p0 -i "${srcdir}/chromium-skia-harmony-r2.patch"
# https://crbug.com/473866.
patch -p1 -i "${srcdir}/chromium-widevine-r4.patch"
diff --git a/chromium-skia-harmony-r1.patch b/chromium-skia-harmony-r1.patch
deleted file mode 100644
index 4a3eb356f88..00000000000
--- a/chromium-skia-harmony-r1.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- third_party/skia/src/ports/SkFontHost_FreeType.cpp.orig 2019-01-20 10:54:56.415239030 +0000
-+++ third_party/skia/src/ports/SkFontHost_FreeType.cpp 2019-01-20 10:55:05.695307733 +0000
-@@ -121,9 +121,9 @@ public:
- : fGetVarDesignCoordinates(nullptr)
- , fGetVarAxisFlags(nullptr)
- , fLibrary(nullptr)
-- , fIsLCDSupported(false)
-- , fLightHintingIsYOnly(false)
-- , fLCDExtra(0)
-+ , fIsLCDSupported(true)
-+ , fLightHintingIsYOnly(false)
-+ , fLCDExtra(2)
- {
- if (FT_New_Library(&gFTMemory, &fLibrary)) {
- return;