PKGBUILD+Patches: Upgrade to extra/chromium and ungoogled-chromium re…

…lease 120.0.6099.224-1

And re-include ozone wayland vaapi patches

See #255

0001-adjust-buffer-format-order.patch

@@ -0,0 +1,65 @@
+From 44a44adecbc97242371cf67f8bbd5553c95fa123 Mon Sep 17 00:00:00 2001
+From: Yaowei Zhou <[email protected]>
+Date: Wed, 18 Jan 2023 17:00:50 +0800
+Subject: [PATCH] Adjust the order of wayland drm and zwp dma buf in WaylandBufferFactory
+
+Adjust the order as buffer format implementation of zwp dma buffer from
+Mutter, which will cause inconsistent with gbm support format list of
+GPU process.
+
+Bug: N/A
+Change-Id: Ice63c52fbd6eff0a099c35c0943e24c1fd1a1d70
+---
+
+diff --git a/ui/ozone/platform/wayland/host/wayland_buffer_factory.cc b/ui/ozone/platform/wayland/host/wayland_buffer_factory.cc
+index 2376d77..7d6c032e 100644
+--- a/ui/ozone/platform/wayland/host/wayland_buffer_factory.cc
++++ b/ui/ozone/platform/wayland/host/wayland_buffer_factory.cc
+@@ -25,13 +25,13 @@
+     uint32_t planes_count,
+     wl::OnRequestBufferCallback callback) const {
+   DCHECK(SupportsDmabuf());
+-  if (wayland_zwp_dmabuf_) {
++  if (wayland_drm_) {
++    wayland_drm_->CreateBuffer(fd, size, strides, offsets, modifiers, format,
++                               planes_count, std::move(callback));
++  } else if (wayland_zwp_dmabuf_) {
+     wayland_zwp_dmabuf_->CreateBuffer(fd, size, strides, offsets, modifiers,
+                                       format, planes_count,
+                                       std::move(callback));
+-  } else if (wayland_drm_) {
+-    wayland_drm_->CreateBuffer(fd, size, strides, offsets, modifiers, format,
+-                               planes_count, std::move(callback));
+   } else {
+     // This method must never be called if neither zwp_linux_dmabuf or wl_drm
+     // are supported.
+@@ -52,10 +52,11 @@
+ wl::BufferFormatsWithModifiersMap
+ WaylandBufferFactory::GetSupportedBufferFormats() const {
+ #if defined(WAYLAND_GBM)
+-  if (wayland_zwp_dmabuf_)
+-    return wayland_zwp_dmabuf_->supported_buffer_formats();
+-  else if (wayland_drm_)
++  if (wayland_drm_) {
+     return wayland_drm_->supported_buffer_formats();
++  } else if (wayland_zwp_dmabuf_) {
++    return wayland_zwp_dmabuf_->supported_buffer_formats();
++  }
+ #endif
+   return {};
+ }
+@@ -71,10 +72,11 @@
+
+ bool WaylandBufferFactory::CanCreateDmabufImmed() const {
+ #if defined(WAYLAND_GBM)
+-  if (wayland_zwp_dmabuf_)
+-    return wayland_zwp_dmabuf_->CanCreateBufferImmed();
+-  else if (wayland_drm_)
++  if (wayland_drm_) {
+     return wayland_drm_->CanCreateBufferImmed();
++  } else if (wayland_zwp_dmabuf_) {
++    return wayland_zwp_dmabuf_->CanCreateBufferImmed();
++  }
+ #endif
+   return false;
+ }

0001-enable-linux-unstable-deb-target.patch

@@ -0,0 +1,33 @@
+From 22fe045deac0551720d7292022f443b22703f336 Mon Sep 17 00:00:00 2001
+From: Yaowei Zhou <[email protected]>
+Date: Thu, 20 Apr 2023 14:37:26 +0800
+Subject: [PATCH] Enable "linux:unstable_deb" build target when using the chromium minigbm
+
+Bug: N/A
+Change-Id: Ic37059be0f0719895acdba756292aed71820feba
+---
+
+diff --git a/third_party/minigbm/BUILD.gn b/third_party/minigbm/BUILD.gn
+index 739e278..50bf5d8 100644
+--- a/third_party/minigbm/BUILD.gn
++++ b/third_party/minigbm/BUILD.gn
+@@ -58,7 +58,7 @@
+     }
+   }
+
+-  shared_library("minigbm") {
++  static_library("minigbm") {
+     sources = [
+       "src/amdgpu.c",
+       "src/dri.c",
+@@ -89,8 +89,8 @@
+     }
+
+     # Clients need this to pick up the shared library correctly.
+-    all_dependent_configs =
+-        [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
++    #all_dependent_configs =
++    #    [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
+   }
+
+   # This target is used for Chromecast build, which expects the resulting lib

0001-ozone-wayland-implement-text_input_manager-fixes.patch

@@ -0,0 +1,42 @@
+
+ui/ozone/platform/wayland/host/zwp_text_input_wrapper.h
+
+# https://github.com/chromium/chromium/commit/de30ba3f21f824be05443d5820b988d226780d68
+Support offset of surrounding text in Lacros wayland client.
+
+# https://github.com/chromium/chromium/commit/71bba2b7ae8117fdf053563a864d6cff018d7e94
+Support large size surrounding text in Lacros.
+
+---
+diff --git a/ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v3.cc b/ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v3.cc
+index a3ce6e4..83f2c58 100644
+--- a/ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v3.cc
++++ b/ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v3.cc
+@@ -147,6 +147,14 @@ void ZWPTextInputWrapperV3::SetSurroundingText(
+   zwp_text_input_v3_commit(obj_.get());
+ }
+
++bool ZWPTextInputWrapperV3::HasAdvancedSurroundingTextSupport() const {
++	return false;
++}
++
++void ZWPTextInputWrapperV3::SetSurroundingTextOffsetUtf16(
++    uint32_t offset_utf16) {
++}
++
+ void ZWPTextInputWrapperV3::ResetPendingState() {
+   commit_string_.clear();
+   delete_surrounding_text_before_length_ = 0;
+diff --git a/ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v3.h b/ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v3.h
+index 204d7e3..5d03a1d 100644
+--- a/ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v3.h
++++ b/ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v3.h
+@@ -45,6 +45,8 @@ class ZWPTextInputWrapperV3 : public ZWPTextInputWrapper {
+   void SetCursorRect(const gfx::Rect& rect) override;
+   void SetSurroundingText(const std::string& text,
+                           const gfx::Range& selection_range) override;
++  bool HasAdvancedSurroundingTextSupport() const override;
++  void SetSurroundingTextOffsetUtf16(uint32_t offset_utf16) override;
+   void SetContentType(TextInputType type,
+                       TextInputMode mode,
+                       uint32_t flags,