upgpkg: ungoogled-chromium 86.0.4240.111-2

3 files changed, 53 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a0e000b..63a9fb3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ungoogled-chromium
 	pkgdesc = A lightweight approach to removing Google web service dependency
-	pkgver = 86.0.4240.75
-	pkgrel = 1
+	pkgver = 86.0.4240.111
+	pkgrel = 2
 	url = https://github.com/Eloston/ungoogled-chromium
 	install = chromium.install
 	arch = x86_64
@@ -58,8 +58,8 @@ pkgbase = ungoogled-chromium
 	optdepends = kwallet: for storing passwords in KWallet on KDE desktops
 	provides = chromium
 	conflicts = chromium
-	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-86.0.4240.75.tar.xz
-	source = ungoogled-chromium-86.0.4240.80-1.tar.gz::https://github.com/Eloston/ungoogled-chromium/archive/86.0.4240.80-1.tar.gz
+	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-86.0.4240.111.tar.xz
+	source = ungoogled-chromium-86.0.4240.111-1.tar.gz::https://github.com/Eloston/ungoogled-chromium/archive/86.0.4240.111-1.tar.gz
 	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 = https://github.com/stha09/chromium-patches/releases/download/chromium-86-patchset-6/chromium-86-patchset-6.tar.xz
@@ -67,10 +67,11 @@ pkgbase = ungoogled-chromium
 	source = only-fall-back-to-the-i965-driver-if-we-re-on-iHD.patch
 	source = remove-dead-reloc-in-nonalloc-LD-flags.patch
 	source = check-for-enable-accelerated-video-decode-on-Linux.patch
+	source = xproto-fix-underflow-in-Fp1616ToDouble.patch
 	source = wayland-egl.patch
 	source = chromium-skia-harmony.patch
-	sha256sums = dd7a41eda5f984e44474d7e6fb25b5df88c1c924a1a3966189f037f7d325bcb5
-	sha256sums = 9bc0946f661942b182b12fdec024b12b337aa895f3c39a321916bafe297e97a1
+	sha256sums = f27bdb02ebf3c48abe054c73f1ae57e22a22535ea34f5edf8693ab8432a7c717
+	sha256sums = 4364e8b1d68e4a9e0694f09d41c0458b18e5683f043e29015aacb1ceecd3fb4e
 	sha256sums = 04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1
 	sha256sums = babda4f5c1179825797496898d77334ac067149cac03d797ab27ac69671a7feb
 	sha256sums = 6f9ab35fa2c9e6e34ec454b829b7b87adaebc10cacecd1ac1daa67035ee44aba
@@ -78,6 +79,7 @@ pkgbase = ungoogled-chromium
 	sha256sums = 7514c6c81a64a5457b66494a366fbb39005563eecc48d1a39033dd06aec4e300
 	sha256sums = 7cace84d7494190e7882d3e637820646ec8d64808f0a2128c515bd44991a3790
 	sha256sums = 03d03a39b2afa40083eb8ccb9616a51619f71da92348effc8ee289cbda10128b
+	sha256sums = 1ec617b362bf97cce4254debd04d8396f17dec0ae1071b52ec8c1c3d86dbd322
 	sha256sums = bf86923eaee5529ab9fb6148bd6c33a73c8746ab1b4ade0cd3b761109bc55826
 	sha256sums = 771292942c0901092a402cc60ee883877a99fb804cb54d568c8c6c94565a48e1
 
diff --git a/PKGBUILD b/PKGBUILD
index 08b5ea8..2ec46e6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,16 +9,16 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=ungoogled-chromium
-pkgver=86.0.4240.75
-pkgrel=1
+pkgver=86.0.4240.111
+pkgrel=2
 _launcher_ver=6
 _gcc_patchset=6
 _pkgname=$(echo $pkgname | cut -d\- -f1-2)
 _pkgver=$(echo $pkgver | cut -d\. -f1-4)
 # ungoogled chromium variables
-_uc_ver=86.0.4240.80-1
+_uc_ver=$pkgver-1
 _uc_usr=Eloston
-_uc_sum='9bc0946f661942b182b12fdec024b12b337aa895f3c39a321916bafe297e97a1'
+_uc_sum='4364e8b1d68e4a9e0694f09d41c0458b18e5683f043e29015aacb1ceecd3fb4e'
 _uc_url="$_pkgname-$_uc_ver.tar.gz::https://github.com/$_uc_usr/ungoogled-chromium/archive/$_uc_ver.tar.gz"
 pkgdesc="A lightweight approach to removing Google web service dependency"
 arch=('x86_64')
@@ -48,9 +48,10 @@ source=(https://commondatastorage.googleapis.com/chromium-browser-official/chrom
         only-fall-back-to-the-i965-driver-if-we-re-on-iHD.patch
         remove-dead-reloc-in-nonalloc-LD-flags.patch
         check-for-enable-accelerated-video-decode-on-Linux.patch
+        xproto-fix-underflow-in-Fp1616ToDouble.patch
         wayland-egl.patch
         chromium-skia-harmony.patch)
-sha256sums=('dd7a41eda5f984e44474d7e6fb25b5df88c1c924a1a3966189f037f7d325bcb5'
+sha256sums=('f27bdb02ebf3c48abe054c73f1ae57e22a22535ea34f5edf8693ab8432a7c717'
             $_uc_sum
             '04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1'
             'babda4f5c1179825797496898d77334ac067149cac03d797ab27ac69671a7feb'
@@ -59,6 +60,7 @@ sha256sums=('dd7a41eda5f984e44474d7e6fb25b5df88c1c924a1a3966189f037f7d325bcb5'
             '7514c6c81a64a5457b66494a366fbb39005563eecc48d1a39033dd06aec4e300'
             '7cace84d7494190e7882d3e637820646ec8d64808f0a2128c515bd44991a3790'
             '03d03a39b2afa40083eb8ccb9616a51619f71da92348effc8ee289cbda10128b'
+            '1ec617b362bf97cce4254debd04d8396f17dec0ae1071b52ec8c1c3d86dbd322'
             'bf86923eaee5529ab9fb6148bd6c33a73c8746ab1b4ade0cd3b761109bc55826'
             '771292942c0901092a402cc60ee883877a99fb804cb54d568c8c6c94565a48e1')
 
@@ -106,6 +108,7 @@ prepare() {
   patch -Np1 -i ../only-fall-back-to-the-i965-driver-if-we-re-on-iHD.patch
   #patch -Np1 -i ../remove-dead-reloc-in-nonalloc-LD-flags.patch
   patch -Np1 -i ../check-for-enable-accelerated-video-decode-on-Linux.patch
+  patch -Np1 -i ../xproto-fix-underflow-in-Fp1616ToDouble.patch
 
   # Fixes for building with libstdc++ instead of libc++
   patch -Np1 -i ../patches/chromium-86-nearby-include.patch
diff --git a/xproto-fix-underflow-in-Fp1616ToDouble.patch b/xproto-fix-underflow-in-Fp1616ToDouble.patch
new file mode 100644
index 0000000..8fcbd72
--- /dev/null
+++ b/xproto-fix-underflow-in-Fp1616ToDouble.patch
@@ -0,0 +1,37 @@
+From 5ade494a9966c7a9675af86dc42aca62fb4d806d Mon Sep 17 00:00:00 2001
+From: Tom Anderson <thomasanderson@chromium.org>
+Date: Wed, 21 Oct 2020 22:02:35 +0000
+Subject: [PATCH] [XProto] Fix underflow in Fp1616ToDouble
+
+x11::Input::Fp1616 should be treated as a signed integer, otherwise
+-1 will underflow to 65535.  When dragging a scrollbar, this would
+cause the scrollbar to snap to the bottom when the cursor is dragged
+above the window's y=0 coordinate.  Verified that the issue is fixed
+after this CL.
+
+BUG=1139623,1136352
+R=sky
+
+Change-Id: Ie318006ceadde9b9ce3e267fb453ddeba0e81da0
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2485620
+Auto-Submit: Thomas Anderson <thomasanderson@chromium.org>
+Commit-Queue: Scott Violet <sky@chromium.org>
+Reviewed-by: Scott Violet <sky@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#819538}
+---
+ ui/events/x/events_x_utils.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ui/events/x/events_x_utils.cc b/ui/events/x/events_x_utils.cc
+index 3010db5f40c..856dfb221e7 100644
+--- a/ui/events/x/events_x_utils.cc
++++ b/ui/events/x/events_x_utils.cc
+@@ -376,7 +376,7 @@ base::TimeTicks TimeTicksFromXEvent(const x11::Event& xev) {
+ 
+ // This is ported from libxi's FP1616toDBL in XExtInt.c
+ double Fp1616ToDouble(x11::Input::Fp1616 x) {
+-  auto x32 = static_cast<uint32_t>(x);
++  auto x32 = static_cast<int32_t>(x);
+   return x32 * 1.0 / (1 << 16);
+ }
+