From b58288b7fb97f2dde216da38bbc5a83217aec0bc Mon Sep 17 00:00:00 2001
From: Than Ngo <than@redhat.com>
Date: Sun, 7 Jul 2024 11:19:11 +0200
Subject: [PATCH] fixed rhbz#2293202, chromium Wayland UI regression

---
 chromium-browser.sh |  1 -
 chromium.conf       | 22 ++++++++++++++++------
 chromium.spec       |  5 ++++-
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/chromium-browser.sh b/chromium-browser.sh
index 26f6a7c5..4ed62f5b 100755
--- a/chromium-browser.sh
+++ b/chromium-browser.sh
@@ -39,7 +39,6 @@ CHROMIUM_DISTRO_FLAGS=" --enable-plugins \
                         --enable-extensions \
                         --enable-user-scripts \
                         --enable-printing \
-                        --enable-gpu-rasterization \
                         --enable-sync \
                         --auto-ssl-client-auth @@EXTRA_FLAGS@@"
 
diff --git a/chromium.conf b/chromium.conf
index 267f62ee..62cecce8 100644
--- a/chromium.conf
+++ b/chromium.conf
@@ -1,17 +1,25 @@
 # system wide chromium flags
 
+ARCH="$(arch)"
+
 # GRAPHIC_DRIVER=[amd|intel|nvidia|default]
 GRAPHIC_DRIVER=default
 
 # WEB_DARKMODE=[on|off]
 WEB_DARKMODE=off
 
+# NATIVE_WAYLAND=[on|off]
+NATIVE_WAYLAND=off
+
 CHROMIUM_FLAGS=""
-CHROMIUM_FLAGS+=" --enable-native-gpu-memory-buffers"
-CHROMIUM_FLAGS+=" --enable-gpu-memory-buffer-video-frames"
-CHROMIUM_FLAGS+=" --enable-zero-copy"
-CHROMIUM_FLAGS+=" --ignore-gpu-blocklist --disable-gpu-driver-bug-workaround"
-CHROMIUM_FLAGS+=" --enable-chrome-browser-cloud-management"
+if [ "$NATIVE_WAYLAND" == "off" ] ; then
+   CHROMIUM_FLAGS+=" --enable-native-gpu-memory-buffers"
+   CHROMIUM_FLAGS+=" --enable-gpu-memory-buffer-video-frames"
+   CHROMIUM_FLAGS+=" --enable-zero-copy"
+   CHROMIUM_FLAGS+=" --ignore-gpu-blocklist --disable-gpu-driver-bug-workaround"
+   CHROMIUM_FLAGS+=" --enable-chrome-browser-cloud-management"
+   CHROMIUM_FLAGS+=" --enable-gpu-rasterization"
+fi
 
 FEATURES=""
 
@@ -45,4 +53,6 @@ if [ "$WEB_DARKMODE" == "on" ] ; then
    FEATURES+=",$darktype"
 fi
 
-CHROMIUM_FLAGS+=" --enable-features=$FEATURES"
+if [ "$ARCH" == "x86_64" ] ; then
+   CHROMIUM_FLAGS+=" --enable-features=$FEATURES"
+fi
diff --git a/chromium.spec b/chromium.spec
index 8f1e924b..5c6a9edb 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -311,7 +311,7 @@
 
 Name:	chromium%{chromium_channel}
 Version: 126.0.6478.126
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A WebKit (Blink) powered web browser that Google doesn't want you to use
 Url: http://www.chromium.org/Home
 License: BSD-3-Clause AND LGPL-2.1-or-later AND Apache-2.0 AND IJG AND MIT AND GPL-2.0-or-later AND ISC AND OpenSSL AND (MPL-1.1 OR GPL-2.0-only OR LGPL-2.0-only)
@@ -2131,6 +2131,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
 %endif
 
 %changelog
+* Sun Jul 07 2024 Than Ngo <than@redhat.com> - 126.0.6478.126-2
+- fixed rhbz#2293202, chromium Wayland UI regression
+
 * Tue Jun 25 2024 Than Ngo <than@redhat.com> - 126.0.6478.126-1
 - update to 126.0.6478.126
   * High CVE-2024-6290: Use after free in Dawn