uppkg -> 96.0.4664.110-2

4 files changed, 53 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0c6e54e5f4f4..211339a19ac8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ungoogled-chromium-xdg
 	pkgdesc = A lightweight approach to removing Google web service dependency - without creating a useless ~/.pki directory
 	pkgver = 96.0.4664.110
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/Eloston/ungoogled-chromium
 	arch = x86_64
 	license = BSD
@@ -60,6 +60,7 @@ pkgbase = ungoogled-chromium-xdg
 	source = unexpire-accelerated-video-decode-flag.patch
 	source = use-oauth2-client-switches-as-default.patch
 	source = xdg-basedir.patch
+	source = no-omnibox-suggestion-autocomplete.patch
 	source = ungoogled-chromium-xdg-96.0.4664.110-1.tar.gz::https://github.com/Eloston/ungoogled-chromium/archive/96.0.4664.110-1.tar.gz
 	source = chromium-drirc-disable-10bpc-color-configs.conf
 	source = wayland-egl.patch
@@ -72,7 +73,8 @@ pkgbase = ungoogled-chromium-xdg
 	sha256sums = 56acb6e743d2ab1ed9f3eb01700ade02521769978d03ac43226dec94659b3ace
 	sha256sums = 2a97b26c3d6821b15ef4ef1369905c6fa3e9c8da4877eb9af4361452a425290b
 	sha256sums = e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711
-	sha256sums = c332af43f4afb120c749319f3f2b1bcb38715ac5d9dbb376475702bd9ef95686
+	sha256sums = cd844867b5b2197ad097662fee32579a7091dfba1d46cb438c4c7e696690440a
+	sha256sums = a0aae463d3190c358b018922aa25ef8b0d4dabf46d4e1a29437e983a2ea125c6
 	sha256sums = 4d851d62d67391b6ab9bb1267a92c9d0a8279fe7f7b86bdbf0c8cff7b9bbdad5
 	sha256sums = babda4f5c1179825797496898d77334ac067149cac03d797ab27ac69671a7feb
 	sha256sums = 34d08ea93cb4762cb33c7cffe931358008af32265fc720f2762f0179c3973574
diff --git a/PKGBUILD b/PKGBUILD
index 2413d7abfd9e..5ded184b4d75 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@
 
 pkgname=ungoogled-chromium-xdg
 pkgver=96.0.4664.110
-pkgrel=1
+pkgrel=2
 _launcher_ver=8
 _gcc_patchset=4
 pkgdesc="A lightweight approach to removing Google web service dependency - without creating a useless ~/.pki directory"
@@ -36,7 +36,8 @@ source=(https://commondatastorage.googleapis.com/chromium-browser-official/chrom
         chromium-94-ffmpeg-roll.patch
         unexpire-accelerated-video-decode-flag.patch
         use-oauth2-client-switches-as-default.patch
-        xdg-basedir.patch)
+        xdg-basedir.patch
+        no-omnibox-suggestion-autocomplete.patch)
 sha256sums=('36a99d29c2e93a9975be53648f2cd3ffa4ee43730f217a2e7ed88c1901a671e8'
             '213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a'
             '090af7eab39aade15a1786273f2497d6b4abfaef24279fbf97ce0dd1c38c69aa'
@@ -46,7 +47,8 @@ sha256sums=('36a99d29c2e93a9975be53648f2cd3ffa4ee43730f217a2e7ed88c1901a671e8'
             '56acb6e743d2ab1ed9f3eb01700ade02521769978d03ac43226dec94659b3ace'
             '2a97b26c3d6821b15ef4ef1369905c6fa3e9c8da4877eb9af4361452a425290b'
             'e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711'
-            'c332af43f4afb120c749319f3f2b1bcb38715ac5d9dbb376475702bd9ef95686')
+            'cd844867b5b2197ad097662fee32579a7091dfba1d46cb438c4c7e696690440a'
+            'a0aae463d3190c358b018922aa25ef8b0d4dabf46d4e1a29437e983a2ea125c6')
 provides=('chromium')
 conflicts=('chromium')
 source=(${source[@]}
@@ -115,6 +117,11 @@ prepare() {
   # move ~/.pki directory to ${XDG_DATA_HOME:-$HOME/.local}/share/pki
   patch -p1 -i ../xdg-basedir.patch
 
+  # You can now set '1' in the flag #omnibox-ui-max-autocomplete-matches to
+  # effectively disable autocompletion in the url bar (and therefore the so-
+  # called 'shoulder surfing').
+  patch -p1 -i ../no-omnibox-suggestion-autocomplete.patch
+
   # https://crbug.com/1207478
   patch -Np0 -i ../unexpire-accelerated-video-decode-flag.patch
 
diff --git a/no-omnibox-suggestion-autocomplete.patch b/no-omnibox-suggestion-autocomplete.patch
new file mode 100644
index 000000000000..a7ba4ce5f6f4
--- /dev/null
+++ b/no-omnibox-suggestion-autocomplete.patch
@@ -0,0 +1,29 @@
+# Add options '1' and '2' in the flag #omnibox-ui-max-autocomplete-matches.
+# Setting '1' effectively disables autocompletion in the url bar (called
+# 'omnibox' in chromium internally). This is way easier than diabling all
+# history internally, but still allowing to get rid of shoulder surfing.
+
+--- a/chrome/browser/about_flags.cc
++++ b/chrome/browser/about_flags.cc
+@@ -1254,6 +1254,10 @@
+     {"15", kMaxZeroSuggestMatches15, base::size(kMaxZeroSuggestMatches15),
+      nullptr}};
+ 
++const FeatureEntry::FeatureParam kOmniboxUIMaxAutocompleteMatches1[] = {
++    {OmniboxFieldTrial::kUIMaxAutocompleteMatchesParam, "1"}};
++const FeatureEntry::FeatureParam kOmniboxUIMaxAutocompleteMatches2[] = {
++    {OmniboxFieldTrial::kUIMaxAutocompleteMatchesParam, "2"}};
+ const FeatureEntry::FeatureParam kOmniboxUIMaxAutocompleteMatches3[] = {
+     {OmniboxFieldTrial::kUIMaxAutocompleteMatchesParam, "3"}};
+ const FeatureEntry::FeatureParam kOmniboxUIMaxAutocompleteMatches4[] = {
+@@ -1275,6 +1279,10 @@
+ 
+ const FeatureEntry::FeatureVariation
+     kOmniboxUIMaxAutocompleteMatchesVariations[] = {
++        {"1 matches", kOmniboxUIMaxAutocompleteMatches1,
++         base::size(kOmniboxUIMaxAutocompleteMatches1), nullptr},
++        {"2 matches", kOmniboxUIMaxAutocompleteMatches2,
++         base::size(kOmniboxUIMaxAutocompleteMatches2), nullptr},
+         {"3 matches", kOmniboxUIMaxAutocompleteMatches3,
+          base::size(kOmniboxUIMaxAutocompleteMatches3), nullptr},
+         {"4 matches", kOmniboxUIMaxAutocompleteMatches4,
diff --git a/xdg-basedir.patch b/xdg-basedir.patch
index cf3181577703..06df859a0cfd 100644
--- a/xdg-basedir.patch
+++ b/xdg-basedir.patch
@@ -1,6 +1,9 @@
-diff -ruN a/base/nix/xdg_util.cc b/base/nix/xdg_util.cc
---- a/base/nix/xdg_util.cc	2021-10-01 03:36:37.000000000 +0200
-+++ b/base/nix/xdg_util.cc	2021-10-11 23:38:26.553638013 +0200
+# Move ~/.pki directory to ${XDG_DATA_HOME:-$HOME/.local}/share/pki on linux
+# builds to follow the XDG Base Directory Specification. For details, refer to
+# https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
+
+--- a/base/nix/xdg_util.cc
++++ b/base/nix/xdg_util.cc
 @@ -29,6 +29,8 @@
  const char kXdgConfigHomeEnvVar[] = "XDG_CONFIG_HOME";
  const char kXdgCurrentDesktopEnvVar[] = "XDG_CURRENT_DESKTOP";
@@ -11,9 +14,8 @@ diff -ruN a/base/nix/xdg_util.cc b/base/nix/xdg_util.cc
  FilePath GetXDGDirectory(Environment* env, const char* env_name,
                           const char* fallback_dir) {
 
-diff -ruN a/base/nix/xdg_util.h b/base/nix/xdg_util.h
---- a/base/nix/xdg_util.h	2021-10-11 23:57:48.607012470 +0200
-+++ b/base/nix/xdg_util.h	2021-10-12 00:04:46.457027239 +0200
+--- a/base/nix/xdg_util.h
++++ b/base/nix/xdg_util.h
 @@ -37,6 +37,12 @@
  // The XDG session type environment variable.
  BASE_EXPORT extern const char kXdgSessionTypeEnvVar[];
@@ -28,9 +30,8 @@ diff -ruN a/base/nix/xdg_util.h b/base/nix/xdg_util.h
  // |env_name| is the name of an environment variable that we want to use to get
  // a directory path. |fallback_dir| is the directory relative to $HOME that we
 
-diff -ruN a/crypto/nss_util.cc b/crypto/nss_util.cc
---- a/crypto/nss_util.cc	2021-10-01 03:36:49.000000000 +0200
-+++ b/crypto/nss_util.cc	2021-10-12 12:45:52.235119130 +0200
+--- a/crypto/nss_util.cc
++++ b/crypto/nss_util.cc
 @@ -30,6 +30,9 @@
  #include "build/chromeos_buildflags.h"
  #include "crypto/nss_crypto_module_delegate.h"