Merge pull request #10013 from suvari/master

chromium-browser: version bump to 97.0.4692.77

network/web/chromium-browser/actions.py

@@ -37,14 +37,13 @@ def setup():
     opt = 'custom_toolchain="//build/toolchain/linux/unbundle:default" \
            host_toolchain="//build/toolchain/linux/unbundle:default" \
            use_sysroot=false \
-           enable_nacl=true \
+           enable_nacl=false \
            enable_nacl_nonsfi=false \
            rtc_use_pipewire=true \
            use_custom_libcxx=true \
            clang_use_chrome_plugins=true \
            is_official_build=true \
            fieldtrial_testing_like_official_build=true \
-           clang_use_chrome_plugins=false \
            fatal_linker_warnings=false \
            treat_warnings_as_errors=false \
            use_gnome_keyring=false\
@@ -54,9 +53,7 @@ def setup():
            linux_use_bundled_binutils=false \
            is_debug=false \
            ffmpeg_branding="Chrome" \
-           google_default_client_secret="0ZChLK6AxeA3Isu96MkwqDR4" \
            google_api_key="AIzaSyDwr302FpOSkGRpLlUpPThNTDPbXcIn_FM" \
-           google_default_client_id="413772536636.apps.googleusercontent.com" \
            remove_webcore_debug_symbols=true \
            proprietary_codecs=true \
            link_pulseaudio=true \
@@ -93,7 +90,7 @@ def setup():
     pisitools.ldflags.add(" -fuse-ld=lld")
     shelltools.export("CPPFLAGS", "-D__DATE__=  -D__TIME__=  -D__TIMESTAMP__=")
     
-    shelltools.system("/usr/bin/python3 build/download_nacl_toolchains.py --packages nacl_x86_newlib,pnacl_newlib,pnacl_translator sync --extract")
+    #shelltools.system("/usr/bin/python3 build/download_nacl_toolchains.py --packages nacl_x86_newlib,pnacl_newlib,pnacl_translator sync --extract")
     shelltools.system("/usr/bin/python3 tools/update_pgo_profiles.py --target=linux update --gs-url-base=chromium-optimization-profiles/pgo_profiles")
     shelltools.system("/usr/bin/python3 tools/gn/bootstrap/bootstrap.py --gn-gen-args '%s'"% opt)
     shelltools.system("out/Release/gn gen out/Release --args='%s'"% opt)
@@ -111,7 +108,7 @@ def install():
 
     #should be checked should for the missing folder "out/Release"
     for vla in ["*.pak", "*.json", "chrome", "locales", "resources", "icudtl.dat", "mksnapshot", "chromedriver", "snapshot_blob.bin", "character_data_generator", \
-			    "libEGL.so", "libGLESv2.so", "libVk*.so", "v8_context_snapshot.bin", "MEIPreload", "nacl_helper", "nacl_helper_bootstrap", "nacl_irt_x86_64.nexe", "chrome_crashpad_handler"]:
+			    "libEGL.so", "libGLESv2.so", "libVk*.so", "v8_context_snapshot.bin", "MEIPreload", "chrome_crashpad_handler"]:
         pisitools.insinto("/usr/lib/chromium-browser", "%s" % vla)
 	
     pisitools.insinto("/usr/lib/chromium-browser", "chrome_sandbox", "chrome-sandbox")

network/web/chromium-browser/files/fix-tag-dragging-in-KWin.patch

@@ -0,0 +1,35 @@
+From 52d0ad25ea695da44195e49f36e69fa81b55e670 Mon Sep 17 00:00:00 2001
+From: Tom Anderson <thomasanderson@chromium.org>
+Date: Wed, 5 Jan 2022 21:11:03 +0000
+Subject: [PATCH] [X11] Fix tag dragging in KWin
+
+R=sky
+
+Bug: 1279532
+Change-Id: Iac166803e2149eef234045d922b630f0019c8073
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3355376
+Auto-Submit: Thomas Anderson <thomasanderson@chromium.org>
+Reviewed-by: Scott Violet <sky@chromium.org>
+Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
+Cr-Commit-Position: refs/heads/main@{#955869}
+---
+ ui/platform_window/x11/x11_topmost_window_finder.cc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/ui/platform_window/x11/x11_topmost_window_finder.cc b/ui/platform_window/x11/x11_topmost_window_finder.cc
+index 50e75e17f0a..2e16393487b 100644
+--- a/ui/platform_window/x11/x11_topmost_window_finder.cc
++++ b/ui/platform_window/x11/x11_topmost_window_finder.cc
+@@ -68,9 +68,9 @@ bool EnumerateAllWindows(ShouldStopIteratingCallback should_stop_iterating,
+ 
+ void EnumerateTopLevelWindows(
+     ui::ShouldStopIteratingCallback should_stop_iterating) {
+-  // Some WMs parent 'top-level' windows in unnamed actual top-level windows
+-  // (ion WM), so extend the search depth to all children of top-level windows.
+-  const int kMaxSearchDepth = 1;
++  // WMs may reparent toplevel windows inside their own containers, so extend
++  // the search to all grandchildren of all toplevel windows.
++  const int kMaxSearchDepth = 2;
+   ui::EnumerateAllWindows(should_stop_iterating, kMaxSearchDepth);
+ }
+ 

network/web/chromium-browser/files/fix-tag-dragging-in-Mutter.patch

@@ -0,0 +1,46 @@
+From 3806f28918ea23291749ff4775339075a5f394e8 Mon Sep 17 00:00:00 2001
+From: Tom Anderson <thomasanderson@chromium.org>
+Date: Thu, 6 Jan 2022 00:59:40 +0000
+Subject: [PATCH] [X11] Fix tag dragging in Mutter
+
+We used to use a BFS to find the target window for tag dragging, but
+this causes windows underneath (like the window for the desktop
+wallpaper) to take precedence over nested windows.
+
+This CL switches to a DFS.
+
+R=sky
+
+Bug: 1279532
+Change-Id: Ib569e9270be60bcb4fff088517dfe295697608b0
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3355470
+Reviewed-by: Scott Violet <sky@chromium.org>
+Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
+Auto-Submit: Thomas Anderson <thomasanderson@chromium.org>
+Cr-Commit-Position: refs/heads/main@{#955976}
+---
+ ui/platform_window/x11/x11_topmost_window_finder.cc | 11 ++---------
+ 1 file changed, 2 insertions(+), 9 deletions(-)
+
+diff --git a/ui/platform_window/x11/x11_topmost_window_finder.cc b/ui/platform_window/x11/x11_topmost_window_finder.cc
+index 2e16393487b..e20bf0abf0e 100644
+--- a/ui/platform_window/x11/x11_topmost_window_finder.cc
++++ b/ui/platform_window/x11/x11_topmost_window_finder.cc
+@@ -44,15 +44,8 @@ bool EnumerateChildren(ShouldStopIteratingCallback should_stop_iterating,
+   for (iter = windows.rbegin(); iter != windows.rend(); iter++) {
+     if (IsWindowNamed(*iter) && should_stop_iterating.Run(*iter))
+       return true;
+-  }
+-
+-  // If we're at this point, we didn't find the window we're looking for at the
+-  // current level, so we need to recurse to the next level.  We use a second
+-  // loop because the recursion and call to XQueryTree are expensive and is only
+-  // needed for a small number of cases.
+-  if (++depth <= max_depth) {
+-    for (iter = windows.rbegin(); iter != windows.rend(); iter++) {
+-      if (EnumerateChildren(should_stop_iterating, *iter, max_depth, depth))
++    if (depth < max_depth) {
++      if (EnumerateChildren(should_stop_iterating, *iter, max_depth, depth + 1))
+         return true;
+     }
+   }

network/web/chromium-browser/files/patches/chromium-95-BitstreamReader-namespace.patch

@@ -1,41 +0,0 @@
-From c23f09d436b566934d02c26a19e3cf5d31545855 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Sat, 4 Sep 2021 17:02:00 +0000
-Subject: [PATCH] GCC: fix template specialization in webrtc::BitstreamReader
-
-GCC complains that explicit specialization in non-namespace scope
-is happening for webrtc::BitstreamReader::Read(). However, specialization
-for bool isn't used because std::is_unsigned<bool>::value returns true.
-Add std::is_same for bool check and enable second specialization only
-for bool types.
-
----
- third_party/webrtc/rtc_base/bitstream_reader.h | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/third_party/webrtc/rtc_base/bitstream_reader.h b/third_party/webrtc/rtc_base/bitstream_reader.h
-index 8c0f66f..cd8537f 100644
---- a/third_party/webrtc/rtc_base/bitstream_reader.h
-+++ b/third_party/webrtc/rtc_base/bitstream_reader.h
-@@ -61,14 +61,16 @@ class BitstreamReader {
-   // Reads unsigned integer of fixed width.
-   template <typename T,
-             typename std::enable_if<std::is_unsigned<T>::value &&
-+                                    !std::is_same<T, bool>::value &&
-                                     sizeof(T) <= 8>::type* = nullptr>
-   ABSL_MUST_USE_RESULT T Read() {
-     return rtc::dchecked_cast<T>(ReadBits(sizeof(T) * 8));
-   }
- 
-   // Reads single bit as boolean.
--  template <>
--  ABSL_MUST_USE_RESULT bool Read<bool>() {
-+  template <typename T,
-+            typename std::enable_if<std::is_same<T, bool>::value>::type* = nullptr>
-+  ABSL_MUST_USE_RESULT bool Read() {
-     return ReadBit() != 0;
-   }
- 
--- 
-2.32.0
-

network/web/chromium-browser/files/patches/chromium-95-libyuv-aarch64.patch

@@ -1,30 +0,0 @@
-diff --git a/third_party/libyuv/source/row_neon64.cc b/third_party/libyuv/source/row_neon64.cc
-index 350c964..2aab413 100644
---- a/third_party/libyuv/source/row_neon64.cc
-+++ b/third_party/libyuv/source/row_neon64.cc
-@@ -1835,7 +1835,7 @@ void ARGBToAB64Row_NEON(const uint8_t* src_argb,
-       : "+r"(src_argb),          // %0
-         "+r"(dst_ab64),          // %1
-         "+r"(width)              // %2
--      : "m"(kShuffleARGBToABGR)  // %3
-+      : "Q"(kShuffleARGBToABGR)  // %3
-       : "cc", "memory", "v0", "v1", "v2", "v3", "v4");
- }
- 
-@@ -1859,7 +1859,7 @@ void AR64ToARGBRow_NEON(const uint16_t* src_ar64,
-       : "+r"(src_ar64),          // %0
-         "+r"(dst_argb),          // %1
-         "+r"(width)              // %2
--      : "m"(kShuffleAR64ToARGB)  // %3
-+      : "Q"(kShuffleAR64ToARGB)  // %3
-       : "cc", "memory", "v0", "v1", "v2", "v3", "v4");
- }
- 
-@@ -1883,7 +1883,7 @@ void AB64ToARGBRow_NEON(const uint16_t* src_ab64,
-       : "+r"(src_ab64),          // %0
-         "+r"(dst_argb),          // %1
-         "+r"(width)              // %2
--      : "m"(kShuffleAB64ToARGB)  // %3
-+      : "Q"(kShuffleAB64ToARGB)  // %3
-       : "cc", "memory", "v0", "v1", "v2", "v3", "v4");
- }

network/web/chromium-browser/files/patches/chromium-95-quiche-include.patch

@@ -1,25 +0,0 @@
-From a9d986203bcfbaab84f270c1dc6c3abb4c450ee1 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Fri, 17 Sep 2021 14:57:33 +0000
-Subject: [PATCH] IWYU: add stddef.h for size_t in WindowManager
-
----
- net/third_party/quiche/src/http2/adapter/window_manager.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/net/third_party/quiche/src/http2/adapter/window_manager.h b/net/third_party/quiche/src/http2/adapter/window_manager.h
-index f15982d..5a7701e 100644
---- a/net/third_party/quiche/src/http2/adapter/window_manager.h
-+++ b/net/third_party/quiche/src/http2/adapter/window_manager.h
-@@ -1,6 +1,8 @@
- #ifndef QUICHE_HTTP2_ADAPTER_WINDOW_MANAGER_H_
- #define QUICHE_HTTP2_ADAPTER_WINDOW_MANAGER_H_
- 
-+#include <stddef.h>
-+
- #include <functional>
- 
- #include "common/platform/api/quiche_export.h"
--- 
-2.32.0
-

network/web/chromium-browser/files/patches/chromium-97-Point-constexpr.patch

@@ -0,0 +1,27 @@
+From 9850414c0425aebf038faf418f331df2d6ad573b Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Fri, 5 Nov 2021 08:53:26 +0000
+Subject: [PATCH] GCC: make gfx::Point::operator== constexpr
+
+blink::IntRect::operator== is constexpr. Therefore,
+gfx::Point::operator== needs to be constexpr as well.
+---
+ ui/gfx/geometry/point.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ui/gfx/geometry/point.h b/ui/gfx/geometry/point.h
+index 71c5a5b..55b3220 100644
+--- a/ui/gfx/geometry/point.h
++++ b/ui/gfx/geometry/point.h
+@@ -95,7 +95,7 @@ class GEOMETRY_EXPORT Point {
+   int y_;
+ };
+ 
+-inline bool operator==(const Point& lhs, const Point& rhs) {
++constexpr bool operator==(const Point& lhs, const Point& rhs) {
+   return lhs.x() == rhs.x() && lhs.y() == rhs.y();
+ }
+ 
+-- 
+2.32.0
+

network/web/chromium-browser/files/patches/chromium-97-ScrollView-reference.patch

@@ -0,0 +1,23 @@
+From ce58517e546f3f3433931609683b5b4e455bbb7f Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Fri, 5 Nov 2021 15:48:05 +0000
+Subject: [PATCH] GCC: fix undefined reference to ScrollView::SetContents()
+
+---
+ ui/views/controls/scroll_view.h | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/ui/views/controls/scroll_view.h b/ui/views/controls/scroll_view.h
+index 3bd5a8bf..f850728c 100644
+--- a/ui/views/controls/scroll_view.h
++++ b/ui/views/controls/scroll_view.h
+@@ -386,6 +386,9 @@
+   ScrollViewCallbackList on_contents_scroll_ended_;
+ };
+ 
++// Required for WebAppUrlHandlerIntentPickerView
++template View* ScrollView::SetContents<View>(std::unique_ptr<View> a_view);
++
+ BEGIN_VIEW_BUILDER(VIEWS_EXPORT, ScrollView, View)
+ VIEW_BUILDER_VIEW_TYPE_PROPERTY(View, Contents)
+ VIEW_BUILDER_PROPERTY(ui::LayerType, ContentsLayerType)

network/web/chromium-browser/files/patches/chromium-97-compiler.patch

@@ -1,17 +1,17 @@
-From f4d0b0eb899005b4b8b6388e1d8bb82cc0018fc8 Mon Sep 17 00:00:00 2001
+From 307a0f63dd9b118f4b8470ed3d7567e81fdb7a6d Mon Sep 17 00:00:00 2001
 From: Mike Gilbert <floppym@gentoo.org>
-Date: Sat, 4 Sep 2021 15:13:20 +0000
+Date: Tue, 2 Nov 2021 11:27:25 +0000
 Subject: [PATCH] Disable various compiler configs
 
 ---
- build/config/compiler/BUILD.gn | 105 ++++++---------------------------
+ build/config/compiler/BUILD.gn | 98 ++++++----------------------------
- 1 file changed, 17 insertions(+), 88 deletions(-)
+ 1 file changed, 17 insertions(+), 81 deletions(-)
 
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 219a2be..7565c83 100644
+index 2656f80..221e6db 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -292,8 +292,6 @@ config("compiler") {
+@@ -296,8 +296,6 @@ config("compiler") {
  
    configs += [
      # See the definitions below.
@@ -20,11 +20,11 @@ index 219a2be..7565c83 100644
      ":compiler_codegen",
      ":compiler_deterministic",
    ]
-@@ -531,31 +529,6 @@ config("compiler") {
+@@ -538,24 +536,6 @@ config("compiler") {
      ldflags += [ "-Wl,-z,keep-text-section-prefix" ]
    }
  
--  if (is_clang && !is_nacl && !use_xcode_clang) {
+-  if (is_clang && !is_nacl && !use_xcode_clang && current_os != "zos") {
 -    cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ]
 -
 -    # TODO(hans): Remove this once Clang generates better optimized debug info
@@ -40,19 +40,12 @@ index 219a2be..7565c83 100644
 -        ldflags += [ "-Wl,-mllvm,-instcombine-lower-dbg-declare=0" ]
 -      }
 -    }
--
--    # TODO(crbug.com/1235145): Investigate why/if this should be needed.
--    if (is_win) {
--      cflags += [ "/clang:-ffp-contract=off" ]
--    } else {
--      cflags += [ "-ffp-contract=off" ]
--    }
 -  }
 -
    # C11/C++11 compiler flags setup.
    # ---------------------------
    if (is_linux || is_chromeos || is_android || (is_nacl && is_clang) ||
-@@ -1246,45 +1219,6 @@ config("compiler_deterministic") {
+@@ -1246,45 +1226,6 @@ config("compiler_deterministic") {
      }
    }
  
@@ -98,7 +91,7 @@ index 219a2be..7565c83 100644
    # Tells the compiler not to use absolute paths when passing the default
    # paths to the tools it invokes. We don't want this because we don't
    # really need it and it can mess up the goma cache entries.
-@@ -1704,7 +1638,7 @@ config("chromium_code") {
+@@ -1562,7 +1503,7 @@ config("chromium_code") {
        defines = [ "_HAS_NODISCARD" ]
      }
    } else {
@@ -107,7 +100,7 @@ index 219a2be..7565c83 100644
      if (treat_warnings_as_errors) {
        cflags += [ "-Werror" ]
  
-@@ -1713,10 +1647,6 @@ config("chromium_code") {
+@@ -1571,10 +1512,6 @@ config("chromium_code") {
        # well.
        ldflags = [ "-Werror" ]
      }
@@ -118,7 +111,7 @@ index 219a2be..7565c83 100644
  
      # In Chromium code, we define __STDC_foo_MACROS in order to get the
      # C99 macros on Mac and Linux.
-@@ -1725,15 +1655,6 @@ config("chromium_code") {
+@@ -1583,15 +1520,6 @@ config("chromium_code") {
        "__STDC_FORMAT_MACROS",
      ]
  
@@ -134,7 +127,7 @@ index 219a2be..7565c83 100644
      if (is_mac) {
        cflags_objc = [ "-Wobjc-missing-property-synthesis" ]
        cflags_objcc = [ "-Wobjc-missing-property-synthesis" ]
-@@ -2101,7 +2022,8 @@ config("default_stack_frames") {
+@@ -1959,7 +1887,8 @@ config("default_stack_frames") {
  }
  
  # Default "optimization on" config.
@@ -144,7 +137,7 @@ index 219a2be..7565c83 100644
    if (is_win) {
      if (chrome_pgo_phase != 2) {
        # Favor size over speed, /O1 must be before the common flags.
-@@ -2141,7 +2063,8 @@ config("optimize") {
+@@ -1999,7 +1928,8 @@ config("optimize") {
  }
  
  # Turn off optimizations.
@@ -154,7 +147,7 @@ index 219a2be..7565c83 100644
    if (is_win) {
      cflags = [
        "/Od",  # Disable optimization.
-@@ -2181,7 +2104,8 @@ config("no_optimize") {
+@@ -2039,7 +1969,8 @@ config("no_optimize") {
  # Turns up the optimization level. On Windows, this implies whole program
  # optimization and link-time code generation which is very expensive and should
  # be used sparingly.
@@ -164,7 +157,7 @@ index 219a2be..7565c83 100644
    if (is_nacl && is_nacl_irt) {
      # The NaCl IRT is a special case and always wants its own config.
      # Various components do:
-@@ -2214,7 +2138,8 @@ config("optimize_max") {
+@@ -2072,7 +2003,8 @@ config("optimize_max") {
  #
  # TODO(crbug.com/621335) - rework how all of these configs are related
  # so that we don't need this disclaimer.
@@ -174,7 +167,7 @@ index 219a2be..7565c83 100644
    if (is_nacl && is_nacl_irt) {
      # The NaCl IRT is a special case and always wants its own config.
      # Various components do:
-@@ -2240,7 +2165,8 @@ config("optimize_speed") {
+@@ -2098,7 +2030,8 @@ config("optimize_speed") {
    }
  }
  
@@ -184,7 +177,7 @@ index 219a2be..7565c83 100644
    cflags = [ "-O1" ] + common_optimize_on_cflags
    rustflags = [ "-Copt-level=1" ]
    ldflags = common_optimize_on_ldflags
-@@ -2360,7 +2286,8 @@ config("win_pdbaltpath") {
+@@ -2218,7 +2151,8 @@ config("win_pdbaltpath") {
  }
  
  # Full symbols.
@@ -194,7 +187,7 @@ index 219a2be..7565c83 100644
    if (is_win) {
      if (is_clang) {
        cflags = [ "/Z7" ]  # Debug information in the .obj files.
-@@ -2474,7 +2401,8 @@ config("symbols") {
+@@ -2337,7 +2271,8 @@ config("symbols") {
  # Minimal symbols.
  # This config guarantees to hold symbol for stack trace which are shown to user
  # when crash happens in unittests running on buildbot.
@@ -204,7 +197,7 @@ index 219a2be..7565c83 100644
    if (is_win) {
      # Functions, files, and line tables only.
      cflags = []
-@@ -2546,7 +2474,8 @@ config("minimal_symbols") {
+@@ -2407,7 +2342,8 @@ config("minimal_symbols") {
  # This configuration contains function names only. That is, the compiler is
  # told to not generate debug information and the linker then just puts function
  # names in the final debug information.

network/web/chromium-browser/pspec.xml

@@ -13,7 +13,7 @@
         <IsA>app:gui</IsA>
         <Summary>A WebKit powered web browser</Summary>
         <Description>Chromium-browser is an open-source web browser, powered by WebKit.</Description>
-        <Archive type="tarxz" sha1sum="a44be99fbc55ff5e29f79017bcb9f4e0e665a10f">http://gsdview.appspot.com/chromium-browser-official/chromium-95.0.4638.54.tar.xz</Archive>
+        <Archive type="tarxz" sha1sum="7fc6b55e015a4746bac5fd2e10e2c7673ae5b627">http://gsdview.appspot.com/chromium-browser-official/chromium-97.0.4692.77.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>alsa-lib-devel</Dependency>
             <Dependency>at-spi2-atk-devel</Dependency>
@@ -104,26 +104,21 @@
         <Patches>
             <!--        Arch Patches               -->
             <Patch level="0">unexpire-accelerated-video-decode-flag.patch</Patch>
-            <Patch level="1">maldoca-depend-on-zlib-instead-of-headers-only.patch</Patch>
+            <Patch level="1">fix-tag-dragging-in-KWin.patch</Patch>
-            <Patch level="1">ozone-x11-fix-VA-API.patch</Patch>
+            <Patch level="1">fix-tag-dragging-in-Mutter.patch</Patch>
-<!--             <Patch level="1">replace-blacklist-with-ignorelist.patch</Patch> -->
-<!--             <Patch level="1">add-a-TODO-about-a-missing-pnacl-flag.patch</Patch> -->
-<!--             <Patch level="1">use-ffile-compilation-dir.patch</Patch> -->
-            <Patch level="1">pipewire-do-not-typecheck-the-portal-session_handle.patch</Patch>
             <Patch level="1">sql-make-VirtualCursor-standard-layout-type.patch</Patch>
             <Patch level="1">use-oauth2-client-switches-as-default.patch</Patch>
             <!--        Other Patches               -->
             <Patch level="1">chromium-91-java-only-allowed-in-android-builds.patch</Patch>
             <Patch level="1">chromium-buildname.patch</Patch>
             <Patch level="1">wayland-egl.patch</Patch>
-            <Patch level="1">chromium-92-EnumTable-crash.patch</Patch>
+<!--             <Patch level="1">chromium-92-EnumTable-crash.patch</Patch> -->
             <!-- Chromium Patchset -->
             <!-- Source: https://github.com/stha09/chromium-patches -->
             <Patch level="1">patches/chromium-78-protobuf-RepeatedPtrField-export.patch</Patch>
-            <Patch level="1">patches/chromium-95-BitstreamReader-namespace.patch</Patch>
+            <Patch level="1">patches/chromium-97-Point-constexpr.patch</Patch>
-            <Patch level="1">patches/chromium-95-compiler.patch</Patch>
+            <Patch level="1">patches/chromium-97-ScrollView-reference.patch</Patch>
-            <Patch level="1">patches/chromium-95-libyuv-aarch64.patch</Patch>
+            <Patch level="1">patches/chromium-97-compiler.patch</Patch>
-            <Patch level="1">patches/chromium-95-quiche-include.patch</Patch>
         </Patches>
     </Source>
 
@@ -204,7 +199,14 @@
         </AdditionalFiles>
     </Package>
 
-    <History>
+    <History>		
+        <Update release="26">
+            <Date>2022-01-11</Date>
+            <Version>97.0.4692.77</Version>
+            <Comment>Version Bump</Comment>
+            <Name>İdris Kalp</Name>
+            <Email>idriskalp@gmail.com</Email>
+        </Update>
         <Update release="25">
             <Date>2021-10-21</Date>
             <Version>95.0.4638.54</Version>

x11/server/xorg-server/pspec.xml

@@ -62,15 +62,11 @@
             <Dependency>wayland-protocols-devel</Dependency>
             <Dependency>libglvnd-devel</Dependency>
             <Dependency>xkeyboard-config</Dependency>
-
             <Dependency>libxcvt-devel</Dependency>
         </BuildDependencies>
         <Patches>
-<!--             <Patch level="1">nvidia-add-modulepath-support.patch</Patch> -->
-<!--             <Patch level="1">xserver-autobind-hotplug.patch</Patch> -->
             <Patch level="1">xorg-server-1.12-unloadsubmodule.patch</Patch>
             <Patch level="1">xorg-server-1.18-support-multiple-Files-sections.patch</Patch>
-<!--             <Patch level="1">xorg-server-1.19.4-sysmacros.patch</Patch> -->
         </Patches>
     </Source>
 
@@ -100,6 +96,9 @@
         <Conflicts>
             <Package>xorg-server-common</Package>
         </Conflicts>
+        <Replaces>
+            <Package>xorg-server-common</Package>
+        </Replaces>
         <IsA>app:console</IsA>
         <RuntimeDependencies>
             <Dependency>libbsd</Dependency>
@@ -142,7 +141,6 @@
             <Path fileType="man">/usr/share/man/man4/inputtestdrv.4</Path>
             <Path fileType="man">/usr/share/man/man1/Xorg.wrap.1</Path>
             <Path fileType="man">/usr/share/man/man5/Xwrapper.config.5</Path>
-
             <Path fileType="data">/etc/X11/fontpath.d</Path>
             <Path fileType="doc">/usr/share/doc</Path>
             <Path fileType="data">/var/lib/xkb</Path>
@@ -301,6 +299,13 @@
     </Package>
 
     <History>
+        <Update release="25">
+            <Date>2022-01-11</Date>
+            <Version>21.1.3</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="24">
             <Date>2022-01-03</Date>
             <Version>21.1.3</Version>

x11/server/xorg-server/translations.xml

@@ -10,15 +10,10 @@
         <Description xml:lang="pl">X serwer to główna aplikacja, która umożliwia interfejs graficzny.</Description>
     </Source>
 
-    <Package>
+<!--     <Package>
-        <Name>xorg-server-common</Name>
-        <Summary xml:lang="tr">X sunucuları için ortak dosyalar</Summary>
-    </Package>
-
-    <Package>
         <Name>xorg-server-xdmx</Name>
         <Summary xml:lang="tr">Dağıtık, çok başlı X sunucusu</Summary>
-    </Package>
+    </Package>-->
 
     <Package>
         <Name>xorg-server-xephyr</Name>
@@ -30,18 +25,18 @@
         <Summary xml:lang="tr">Sanal framebuffer X sunucusu</Summary>
     </Package>
 
-    <Package>
+<!--     <Package>
         <Name>xorg-server-xvnc</Name>
         <Summary xml:lang="tr">X pencere sistemi için VNC sunucusu</Summary>
-    </Package>
+    </Package> -->
    
-    <Package>
+<!--     <Package>
         <Name>xorg-server-Xwayland</Name>
         <Summary xml:lang="tr">X pencere sistemini wayland altında çalıştırın</Summary>
-    </Package>
+    </Package> -->
 
     <Package>
         <Name>xorg-server-devel</Name>
         <Summary xml:lang="tr">X sunucusu için sürücü geliştirmede kullanılan başlık ve kitaplık dosyaları</Summary>
     </Package>
-</PISI>
+</PISI>