Update to 60.0.3100.0

1 files changed, 41 insertions, 21 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 3bcc5f6116ff..d73071ae6620 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,7 +18,7 @@ _enable_vaapi=0  # Patch for VAAPI HW acceleration NOTE: don't work in some grap
 ## -- Package and components information -- ##
 ##############################################
 pkgname=chromium-dev
-pkgver=60.0.3095.5
+pkgver=60.0.3100.0
 _launcher_ver=3
 pkgrel=1
 pkgdesc="The open-source project behind Google Chrome (Dev Channel)"
@@ -82,10 +82,12 @@ source=( #"https://gsdview.appspot.com/chromium-browser-official/chromium-${pkgv
         'chromium-dev.svg'
         'BUILD.gn'
         # Patch form Gentoo
-        'https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-FORTIFY_SOURCE.patch'
+        'https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-FORTIFY_SOURCE-r1.patch'
         'https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/skia-avx2.patch'
         'https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-system-ffmpeg-r6.patch'
         'https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-system-opus-r1.patch'
+        'https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-system-libpng-r1.patch'
+        'https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-system-libwebp-r1.patch'
         # Misc Patches
 #         "enable_vaapi_on_linux_${pkgver}.diff::https://raw.githubusercontent.com/saiarcot895/chromium-ubuntu-build/25539edd06a0ac9bf4010c4ad9b936d349ebc974/debian/patches/enable_vaapi_on_linux.diff"
 #         "specify-max-resolution_${pkgver}.patch::https://raw.githubusercontent.com/saiarcot895/chromium-ubuntu-build/25539edd06a0ac9bf4010c4ad9b936d349ebc974/debian/patches/specify-max-resolution.patch"
@@ -100,10 +102,13 @@ sha256sums=( #"$(curl -sL https://gsdview.appspot.com/chromium-browser-official/
             'dd2b5c4191e468972b5ea8ddb4fa2e2fa3c2c94c79fc06645d0efc0e63ce7ee1'
             'c7d9974834fc3803b5f1a1d310ff391306964caaabc807a62f8e5c3d38526ee6'
             # Patch form Gentoo
-            'ffc664a90b68600de2d80a4064df25ec6f34fb4443e96ef2f0741ccb49d90a4b'
+            'b34b698059a8e10aa1a4b26f41599c3a62cfd39b59d6269bcfe939e7ff7ad39a'
             'aa10f5797fe28858533ceeb0fa903f37e744ed4133c889eac60f5094e4b6a596'
             '2fc21f48b95f9f2c2bd8576742fcf8028a8877c6b6e96c04d88184915982234e'
             'ee7947cf63064d108c10f92db9b8dc772283757f27d7030b34520e9884c9ea67'
+            '72162373321acdc3d1fc4ab4d14a05f8103e066579e364a18c2e7ee3f66db9bf'
+            '71321092ee15738386d839312dba32aa407682a38ea158c9b13b3dca3114bb78'
+
             # Misc Patches
 #             '14377408f34e2d97b7cd5219e8363fbda249faa5534e30d9226cdf308915b9ad'
 #             'f98818c933042ce61f3940d7c8880f3edc0f300d7e0a92a6ab7c5c7fd0bf8709'
@@ -228,7 +233,6 @@ _keeplibs=(
   'third_party/libsecret'
   'third_party/libsrtp'
   'third_party/libudev'
-  'third_party/libusb'
   'third_party/libva'
   'third_party/libvpx'
   'third_party/libvpx/source/libvpx/third_party/x86inc'
@@ -340,7 +344,6 @@ _use_system=(
   'libjpeg'
   'libpng'
 #  'libsrtp' # https://bugs.gentoo.org/459932
-#  'libusb' # https://crbug.com/266149
 #  'libvpx'
   'libwebp'
 #  'libxml' # https://bugs.gentoo.org/616818
@@ -397,10 +400,12 @@ prepare() {
 
   msg2 "Patching the sources"
   # Patch sources from Gentoo.
-  patch -p1 -i "${srcdir}/chromium-FORTIFY_SOURCE.patch"
+  patch -p1 -i "${srcdir}/chromium-FORTIFY_SOURCE-r1.patch"
   patch -p1 -i "${srcdir}/skia-avx2.patch"
   patch -p1 -i "${srcdir}/chromium-system-ffmpeg-r6.patch"
   patch -p1 -i "${srcdir}/chromium-system-opus-r1.patch"
+  patch -p1 -i "${srcdir}/chromium-system-libpng-r1.patch"
+  patch -p1 -i "${srcdir}/chromium-system-libwebp-r1.patch"
 
   # Misc Patches:
   if [ "${_enable_vaapi}" = 1 ]; then
@@ -539,27 +544,42 @@ package() {
   ln -sf /usr/lib/chromium-dev/chromedriver "${pkgdir}/usr/bin/chromedriver-dev"
 
   # Install libs.
-  install -Dm755 libclearkeycdm.so "${pkgdir}/usr/lib/chromium-dev/libclearkeycdm.so"
-  install -Dm755 libwidevinecdmadapter.so "${pkgdir}/usr/lib/chromium-dev/libwidevinecdmadapter.so"
+  _libs=(
+    'libEGL.so'
+    'libGLESv2.so'
+    'libVkLayer_core_validation.so'
+    'libVkLayer_object_tracker.so'
+    'libVkLayer_parameter_validation.so'
+    'libVkLayer_swapchain.so'
+    'libVkLayer_threading.so'
+    'libVkLayer_unique_objects.so'
+    'libclearkeycdm.so'
+    'libosmesa.so'
+    'libwidevinecdmadapter.so'
+  )
+  for i in "${_libs[@]}"; do
+    install -Dm755 "${i}" "${pkgdir}/usr/lib/chromium-dev/${i}"
+  done
+
   install -Dm644 natives_blob.bin "${pkgdir}/usr/lib/chromium-dev/natives_blob.bin"
   install -Dm644 snapshot_blob.bin "${pkgdir}/usr/lib/chromium-dev/snapshot_blob.bin"
-  install -Dm644 swiftshader/libEGL.so "${pkgdir}/usr/lib/chromium-dev/swiftshader/libEGL.so"
-  install -Dm644 swiftshader/libGLESv2.so "${pkgdir}/usr/lib/chromium-dev/swiftshader/libGLESv2.so"
+  install -Dm755 swiftshader/libEGL.so "${pkgdir}/usr/lib/chromium-dev/swiftshader/libEGL.so"
+  install -Dm755 swiftshader/libGLESv2.so "${pkgdir}/usr/lib/chromium-dev/swiftshader/libGLESv2.so"
 
   # Install Resources.
   _resources=(
-    'chrome_100_percent'
-    'chrome_200_percent'
-    'keyboard_resources'
-    'mus_app_resources_100'
-    'mus_app_resources_200'
-    'mus_app_resources_strings'
-    'resources'
-    'views_mus_resources'
-    'headless_lib'
+    'chrome_100_percent.pak'
+    'chrome_200_percent.pak'
+    'keyboard_resources.pak'
+    'mus_app_resources_100.pak'
+    'mus_app_resources_200.pak'
+    'mus_app_resources_strings.pak'
+    'resources.pak'
+    'views_mus_resources.pak'
+    'headless_lib.pak'
   )
   for i in "${_resources[@]}"; do
-    install -Dm644 "${i}.pak" "${pkgdir}/usr/lib/chromium-dev/${i}.pak"
+    install -Dm644 "${i}" "${pkgdir}/usr/lib/chromium-dev/${i}"
   done
   find resources -type f -name "*" -exec install -Dm644 '{}' "${pkgdir}/usr/lib/chromium-dev/{}" \;
 
@@ -601,7 +621,7 @@ package() {
       strip $STRIP_BINARIES "${pkgdir}/usr/lib/chromium-dev/"nacl_helper{,_bootstrap,_nonsfi}
     fi
     strip $STRIP_BINARIES "${pkgdir}/usr/lib/chromium-dev/"{chromium-dev,chrome-sandbox,chromedriver}
-    strip $STRIP_SHARED "${pkgdir}/usr/lib/chromium-dev/"lib{widevinecdmadapter,clearkeycdm}.so
+    strip $STRIP_SHARED "${pkgdir}/usr/lib/chromium-dev/"lib*.so
   fi
 
   # Try to fix libpng errors. (second attemp)