upgpkg: ungoogled-chromium-ozone 83.0.4103.97-1

upstream release

2 files changed, 37 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1ff9ed09a1b4..ea1aee8dda3d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ungoogled-chromium-ozone
 	pkgdesc = A lightweight approach to removing Google web service dependency with patches for wayland support via Ozone
-	pkgver = 83.0.4103.61
+	pkgver = 83.0.4103.97
 	pkgrel = 1
 	url = https://github.com/ungoogled-software/ungoogled-chromium-archlinux
 	install = chromium.install
@@ -58,7 +58,7 @@ pkgbase = ungoogled-chromium-ozone
 	optdepends = kwallet: for storing passwords in KWallet on KDE desktops
 	provides = chromium
 	conflicts = chromium
-	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-83.0.4103.61.tar.xz
+	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-83.0.4103.97.tar.xz
 	source = chromium-launcher-6.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v6.tar.gz
 	source = chromium-drirc-disable-10bpc-color-configs.conf
 	source = vdpau-support.patch
@@ -73,9 +73,9 @@ pkgbase = ungoogled-chromium-ozone
 	source = v8-remove-soon-to-be-removed-getAllFieldPositions.patch
 	source = chromium-83-gcc-10.patch
 	source = chromium-skia-harmony.patch
-	source = ungoogled-chromium-83.0.4103.61-1.zip::https://github.com/Eloston/ungoogled-chromium/archive/83.0.4103.61-1.zip
+	source = ungoogled-chromium-83.0.4103.97-1.zip::https://github.com/Eloston/ungoogled-chromium/archive/83.0.4103.97-1.zip
 	source = fix-vaapi-ozone-build.patch
-	sha256sums = 4961f20c4ee6a94490e823f1b1c4128147068f1ce9cfc509e81815f2101405bc
+	sha256sums = 12c405f61284cfc78f8c2b6600f3c1ae61a83b639c41087bb4f74fcaab036f83
 	sha256sums = 04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1
 	sha256sums = babda4f5c1179825797496898d77334ac067149cac03d797ab27ac69671a7feb
 	sha256sums = 0ec6ee49113cc8cc5036fa008519b94137df6987bf1f9fbffb2d42d298af868a
@@ -90,7 +90,7 @@ pkgbase = ungoogled-chromium-ozone
 	sha256sums = e042024423027ad3ef729a7e4709bdf9714aea49d64cfbbf46a645a05703abc2
 	sha256sums = 3e5ba8c0a70a4bc673deec0c61eb2b58f05a4c784cbdb7c8118be1eb6580db6d
 	sha256sums = 771292942c0901092a402cc60ee883877a99fb804cb54d568c8c6c94565a48e1
-	sha256sums = 8ee91b78a23942478ba93faa751181a8c0d74785592b098d68a3aada43520c28
+	sha256sums = 7a9a1e02ee4ac42beec03ba59cbae0334632f2e56e729c7adc95279f5a84a36b
 	sha256sums = 4e7f98b093518cc402448bdc2e35deec5cd047c0dad5bcc7b1ff2e5ba7da98aa
 
 pkgname = ungoogled-chromium-ozone
diff --git a/PKGBUILD b/PKGBUILD
index 541234e2b56e..632d83d1d61b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,10 +5,10 @@
 # Contributor: Evangelos Foutras <evangelos@foutrelis.com>
 
 pkgname=ungoogled-chromium-ozone
-pkgver=83.0.4103.61
+pkgver=83.0.4103.97
 pkgrel=1
 _pkgname=ungoogled-chromium
-_ungoogled_ver=83.0.4103.61-1
+_ungoogled_ver=83.0.4103.97-1
 _launcher_ver=6
 pkgdesc="A lightweight approach to removing Google web service dependency with patches for wayland support via Ozone"
 arch=('x86_64')
@@ -43,7 +43,7 @@ source=(https://commondatastorage.googleapis.com/chromium-browser-official/chrom
         v8-remove-soon-to-be-removed-getAllFieldPositions.patch
         chromium-83-gcc-10.patch
         chromium-skia-harmony.patch)
-sha256sums=('4961f20c4ee6a94490e823f1b1c4128147068f1ce9cfc509e81815f2101405bc'
+sha256sums=('12c405f61284cfc78f8c2b6600f3c1ae61a83b639c41087bb4f74fcaab036f83'
             '04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1'
             'babda4f5c1179825797496898d77334ac067149cac03d797ab27ac69671a7feb'
             '0ec6ee49113cc8cc5036fa008519b94137df6987bf1f9fbffb2d42d298af868a'
@@ -60,7 +60,7 @@ sha256sums=('4961f20c4ee6a94490e823f1b1c4128147068f1ce9cfc509e81815f2101405bc'
             '771292942c0901092a402cc60ee883877a99fb804cb54d568c8c6c94565a48e1')
 source+=($_pkgname-$_ungoogled_ver.zip::https://github.com/Eloston/ungoogled-chromium/archive/$_ungoogled_ver.zip
          fix-vaapi-ozone-build.patch)
-sha256sums+=('8ee91b78a23942478ba93faa751181a8c0d74785592b098d68a3aada43520c28'
+sha256sums+=('7a9a1e02ee4ac42beec03ba59cbae0334632f2e56e729c7adc95279f5a84a36b'
              '4e7f98b093518cc402448bdc2e35deec5cd047c0dad5bcc7b1ff2e5ba7da98aa')
 
 # Possible replacements are listed in build/linux/unbundle/replace_gn_files.py
@@ -202,7 +202,6 @@ build() {
     'linux_use_bundled_binutils=false'
     'use_custom_libcxx=false'
     'use_vaapi=true'
-    'enable_swiftshader=false'
     'use_ozone=true'
     'ozone_platform_wayland=true'
     'ozone_platform_x11=true'
@@ -258,22 +257,41 @@ package() {
   install -Dm644 chrome/app/resources/manpage.1.in \
     "$pkgdir/usr/share/man/man1/chromium.1"
   sed -i \
-    -e "s/@@MENUNAME@@/Chromium/g" \
-    -e "s/@@PACKAGE@@/chromium/g" \
-    -e "s/@@USR_BIN_SYMLINK_NAME@@/chromium/g" \
+    -e 's/@@MENUNAME@@/Chromium/g' \
+    -e 's/@@PACKAGE@@/chromium/g' \
+    -e 's/@@USR_BIN_SYMLINK_NAME@@/chromium/g' \
     "$pkgdir/usr/share/applications/chromium.desktop" \
     "$pkgdir/usr/share/man/man1/chromium.1"
 
-  cp \
-    out/Release/{chrome_{100,200}_percent,resources}.pak \
-    out/Release/{*.bin,chromedriver} \
-    "$pkgdir/usr/lib/chromium/"
-  install -Dm644 -t "$pkgdir/usr/lib/chromium/locales" out/Release/locales/*.pak
+  install -Dm644 chrome/installer/linux/common/chromium-browser/chromium-browser.appdata.xml \
+    "$pkgdir/usr/share/metainfo/chromium.appdata.xml"
+  sed -i \
+    -e 's/chromium-browser\.desktop/chromium.desktop/' \
+    -e '/<update_contact>/d' \
+    -e '/<p>/N;/<p>\n.*\(We invite\|Chromium supports Vorbis\)/,/<\/p>/d' \
+    "$pkgdir/usr/share/metainfo/chromium.appdata.xml"
+
+  local toplevel_files=(
+    chrome_100_percent.pak
+    chrome_200_percent.pak
+    resources.pak
+    v8_context_snapshot.bin
+
+    # ANGLE
+    libEGL.so
+    libGLESv2.so
+
+    chromedriver
+  )
 
   if [[ -z ${_system_libs[icu]+set} ]]; then
-    cp out/Release/icudtl.dat "$pkgdir/usr/lib/chromium/"
+    toplevel_files+=(icudtl.dat)
   fi
 
+  cp "${toplevel_files[@]/#/out/Release/}" "$pkgdir/usr/lib/chromium/"
+  install -Dm644 -t "$pkgdir/usr/lib/chromium/locales" out/Release/locales/*.pak
+  install -Dm755 -t "$pkgdir/usr/lib/chromium/swiftshader" out/Release/swiftshader/*.so
+
   for size in 24 48 64 128 256; do
     install -Dm644 "chrome/app/theme/chromium/product_logo_$size.png" \
       "$pkgdir/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png"