Updated to 60.0.3112.78-1

1 files changed, 23 insertions, 31 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 7dbd12290933..7c5b6755e961 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,17 +7,18 @@
 # 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
 declare -rgA _system_libs=(
-  #[ffmpeg]=ffmpeg     # https://crbug.com/731766
+  #[ffmpeg]=ffmpeg           # https://crbug.com/731766
   [flac]=flac
   [harfbuzz-ng]=harfbuzz-icu
-  #[icu]=icu           # Enable again when upstream supports ICU 59
+  #[icu]=icu                 # Enable again when upstream supports ICU 59
   [libdrm]=
   [libjpeg]=libjpeg
   [libpng]=libpng
-  #[libvpx]=libvpx     # https://bugs.gentoo.org/show_bug.cgi?id=611394
+  #[libvpx]=libvpx           # https://bugs.gentoo.org/611394
   [libwebp]=libwebp
-  [libxml]=libxml2
+  #[libxml]=libxml2          # https://bugs.gentoo.org/616818
   [libxslt]=libxslt
+  [opus]=opus
   [re2]=re2
   [snappy]=snappy
   [yasm]=
@@ -26,20 +27,20 @@ declare -rgA _system_libs=(
 
 pkgname=chromium-gtk2
 _pkgname=chromium
-pkgver=59.0.3071.115
+pkgver=60.0.3112.78
 pkgrel=1
 _launcher_ver=5
-_freetype_rev=5a3490e054bda8a318ebde482
 pkgdesc="A web browser built for speed, simplicity, and security (GTK2 version)"
 arch=('i686' 'x86_64')
 url="https://www.chromium.org/Home"
 license=('BSD')
 depends=('gtk2' 'nss' 'alsa-lib' 'xdg-utils' 'libxss' 'libcups' 'libgcrypt'
-         'ttf-font' 'systemd' 'dbus' 'libpulse' 'pciutils' 'desktop-file-utils'
-         'hicolor-icon-theme' 'json-glib')
+         'ttf-font' 'systemd' 'dbus' 'libpulse' 'pciutils' 'json-glib'
+         'desktop-file-utils' 'hicolor-icon-theme')
 depends+=(${_system_libs[@]})
 makedepends=('python2' 'gperf' 'yasm' 'mesa' 'ninja' 'nodejs' 'git')
-optdepends=('kdialog: needed for file dialogs in KDE'
+optdepends=('pepper-flash: support for Flash content'
+            'kdialog: needed for file dialogs in KDE'
             'gnome-keyring: for storing passwords in GNOME keyring'
             'kwallet: for storing passwords in KWallet')
 provides=($_pkgname)
@@ -47,31 +48,26 @@ conflicts=($_pkgname)
 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
-        chromium-freetype2::git+https://chromium.googlesource.com/chromium/src/third_party/freetype2#commit=$_freetype_rev
         chromium.desktop
-        chromium-system-ffmpeg-r6.patch
-        0001-ClientNativePixmapFactoryDmabuf-uses-ioctl-instead-o.patch
-        0001-Fix-kernel-version-condition-for-including-dma-buf.h.patch
+        chromium-gn-bootstrap-r8.patch
         0001-Clip-FreeType-glyph-bitmap-to-mask.patch
         chromium-blink-gcc7.patch
         chromium-v8-gcc7.patch
-        chromium-widevine.patch)
-sha256sums=('37cbc9955ae3b25cd4e9851a82ea97a0035021cc90658902938ad1c20f263170'
+        chromium-widevine.patch
+        issue2961473002_1_10001.diff)
+sha256sums=('a82db2aa1b9348b619c01894db565eba686780de0e6fa9e83a8f406d06ce03ea'
             '4dc3428f2c927955d9ae117f2fb24d098cc6dd67adb760ac9c82b522ec8b0587'
-            'SKIP'
             '028a748a5c275de9b8f776f97909f999a8583a4b77fd1cd600b4fc5c0c3e91e9'
-            '2fc21f48b95f9f2c2bd8576742fcf8028a8877c6b6e96c04d88184915982234e'
-            '9c081c84a4f85dbef82a9edf34cf0b1e8377c563874fd9c1b4efddf1476748f9'
-            '42eb6ada30d5d507f2bda2d2caece37e397e7086bc0d430db776fad143562fb6'
+            '06345804c00d9618dad98a2dc04f31ef19912cdf6e9d6e577ef7ffb1fa57003f'
             'e60aa0ff01f8bee67e45fde7bbe932901194984673ec4b10ea82bba1bace0cd7'
             'f94310a7ba9b8b777adfb4442bcc0a8f0a3d549b2cf4a156066f8e2e28e2f323'
             '46dacc4fa52652b7d99b8996d6a97e5e3bac586f879aefb9fb95020d2c4e5aec'
-            'd6fdcb922e5a7fbe15759d39ccc8ea4225821c44d98054ce0f23f9d1f00c9808')
+            'd6fdcb922e5a7fbe15759d39ccc8ea4225821c44d98054ce0f23f9d1f00c9808'
+            'b40cea8b8da16a0f18e02887e866934415e5c534e8f29d104f013fc19a756495')
 
-# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+# Google API keys (see https://www.chromium.org/developers/how-tos/api-keys)
 # Note: These are for Arch Linux use ONLY. For your own distribution, please
-# get your own set of keys. Feel free to contact foutrelis@archlinux.org for
-# more information.
+# get your own set of keys.
 _google_api_key=AIzaSyDwr302FpOSkGRpLlUpPThNTDPbXcIn_FM
 _google_default_client_id=413772536636.apps.googleusercontent.com
 _google_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4
@@ -79,19 +75,12 @@ _google_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4
 prepare() {
   cd "$srcdir/$_pkgname-$pkgver"
 
-  # https://groups.google.com/a/chromium.org/d/msg/chromium-packagers/wuInaKJkosg/kMfIV_7wDgAJ
-  mv "$srcdir/chromium-freetype2" third_party/freetype/src
-
   # Enable support for the Widevine CDM plugin
   # libwidevinecdm.so is not included, but can be copied over from Chrome
   # (Version string doesn't seem to matter so let's go with "Pinkie Pie")
   sed "s/@WIDEVINE_VERSION@/Pinkie Pie/" ../chromium-widevine.patch |
     patch -Np1
 
-  # https://bugs.chromium.org/p/chromium/issues/detail?id=707604
-  patch -Np1 -i ../0001-ClientNativePixmapFactoryDmabuf-uses-ioctl-instead-o.patch
-  patch -Np1 -i ../0001-Fix-kernel-version-condition-for-including-dma-buf.h.patch
-
   # https://bugs.chromium.org/p/skia/issues/detail?id=6663
   patch -Np1 -d third_party/skia <../0001-Clip-FreeType-glyph-bitmap-to-mask.patch
 
@@ -102,7 +91,10 @@ prepare() {
   patch -Np1 -i ../chromium-v8-gcc7.patch
 
   # Fixes from Gentoo
-  patch -Np1 -i ../chromium-system-ffmpeg-r6.patch
+  patch -Np1 -i ../chromium-gn-bootstrap-r8.patch
+
+  # Reverse https://chromium.googlesource.com/chromium/src/+/8d1845c2267b05df565fa33e3c5e2b0e242a21cc%5E%21/
+  patch -Rp1 -i ../issue2961473002_1_10001.diff
 
   # Use Python 2
   find . -name '*.py' -exec sed -i -r 's|/usr/bin/python$|&2|g' {} +