upgpkg: ungoogled-chromium 105.0.5195.125-2

add patch and flac rebuild

3 files changed, 75 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8f70315..0224908 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ungoogled-chromium
 	pkgdesc = A lightweight approach to removing Google web service dependency
 	pkgver = 105.0.5195.125
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/ungoogled-software/ungoogled-chromium
 	arch = x86_64
 	license = BSD
@@ -71,6 +71,7 @@ pkgbase = ungoogled-chromium
 	source = ungoogled-chromium-105.0.5195.125-1.tar.gz::https://github.com/ungoogled-software/ungoogled-chromium/archive/105.0.5195.125-1.tar.gz
 	source = ozone-add-va-api-support-to-wayland.patch
 	source = remove-main-main10-profile-limit.patch
+	source = revert-mutter-wayland-regression.patch
 	source = chromium-drirc-disable-10bpc-color-configs.conf
 	sha256sums = 201b5c44668a415e3e05c0a806ab43a0904024340531332fc3ce39eb0cf10a66
 	sha256sums = 213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a
@@ -84,6 +85,7 @@ pkgbase = ungoogled-chromium
 	sha256sums = 1b5ae7912099d9a2a9aed97f3978e9c09bedb603313cb18204e2d64ecbe25d1f
 	sha256sums = e08a2c4c1e1059c767343ea7fbf3c77e18c8daebbb31f8019a18221d5da05293
 	sha256sums = 01ba9fd3f791960aa3e803de4a101084c674ce8bfbaf389953aacc6beedd66dc
+	sha256sums = 69522909a180a4dfcdde5ced5e43cd1c8055ca2d825da0c0ea9cad57030b3cfb
 	sha256sums = babda4f5c1179825797496898d77334ac067149cac03d797ab27ac69671a7feb
 
 pkgname = ungoogled-chromium
diff --git a/PKGBUILD b/PKGBUILD
index 981a6a8..9ca1ffb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@
 
 pkgname=ungoogled-chromium
 pkgver=105.0.5195.125
-pkgrel=1
+pkgrel=2
 _launcher_ver=8
 _gcc_patchset=1
 pkgdesc="A lightweight approach to removing Google web service dependency"
@@ -53,11 +53,13 @@ source=(${source[@]}
         $pkgname-$_uc_ver.tar.gz::https://github.com/$_uc_usr/ungoogled-chromium/archive/$_uc_ver.tar.gz
         ozone-add-va-api-support-to-wayland.patch
         remove-main-main10-profile-limit.patch
+        revert-mutter-wayland-regression.patch
         chromium-drirc-disable-10bpc-color-configs.conf)
 sha256sums=(${sha256sums[@]}
             '1b5ae7912099d9a2a9aed97f3978e9c09bedb603313cb18204e2d64ecbe25d1f'
             'e08a2c4c1e1059c767343ea7fbf3c77e18c8daebbb31f8019a18221d5da05293'
             '01ba9fd3f791960aa3e803de4a101084c674ce8bfbaf389953aacc6beedd66dc'
+            '69522909a180a4dfcdde5ced5e43cd1c8055ca2d825da0c0ea9cad57030b3cfb'
             'babda4f5c1179825797496898d77334ac067149cac03d797ab27ac69671a7feb')
  
 # Possible replacements are listed in build/linux/unbundle/replace_gn_files.py
@@ -138,6 +140,9 @@ prepare() {
   # Remove HEVC profile limits
   patch -Np1 -i ../remove-main-main10-profile-limit.patch
 
+  # Revert wayland commit surface after configure with same size
+  patch -Np1 -i ../revert-mutter-wayland-regression.patch
+
   # Ungoogled Chromium changes
   _ungoogled_repo="$srcdir/$pkgname-$_uc_ver"
   _utils="${_ungoogled_repo}/utils"
diff --git a/revert-mutter-wayland-regression.patch b/revert-mutter-wayland-regression.patch
new file mode 100644
index 0000000..e80e72c
--- /dev/null
+++ b/revert-mutter-wayland-regression.patch
@@ -0,0 +1,66 @@
+From ac7d143e1d9eca969b3f23a7fa9d022577ae6005 Mon Sep 17 00:00:00 2001
+From: Alexander Dunaev <adunaev@igalia.com>
+Date: Mon, 15 Aug 2022 11:12:21 +0000
+Subject: [PATCH] Revert "wayland: Commit surface after configure with same size"
+
+This reverts commit 32e27b753bfb2e99232c1bb303f07283ab248ea3.
+
+Reason for revert: this change caused a major regression on mutter Wayland compositor.
+
+Original change's description:
+> wayland: Commit surface after configure with same size
+>
+> The configure -> ack sequence doesn't take effect on the server side
+> until the associated surface is committed.
+>
+> Fixes a sync issue in TabDragging/* tests on lacros that reposition
+> windows during test setup, where lacros and exo have different screen
+> positions for a surface.
+>
+> Bug: 1336691, 1336706
+> Change-Id: I8d34f23ece4808bb56d8bc01712d4488bf472359
+> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3714566
+> Reviewed-by: Kramer Ge <fangzhoug@chromium.org>
+> Commit-Queue: River Gilhuly <rivr@chromium.org>
+> Cr-Commit-Position: refs/heads/main@{#1023916}
+
+Bug: 1336691, 1336706
+Change-Id: Ia88538e5645da5a65d0c1073c672f1f3bfbc4c54
+No-Presubmit: true
+No-Tree-Checks: true
+No-Try: true
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3831855
+Auto-Submit: Alexander Dunaev <adunaev@igalia.com>
+Commit-Queue: Maksim Sisov <msisov@igalia.com>
+Reviewed-by: Maksim Sisov <msisov@igalia.com>
+Cr-Commit-Position: refs/heads/main@{#1035020}
+---
+
+diff --git a/ui/ozone/platform/wayland/host/wayland_window.cc b/ui/ozone/platform/wayland/host/wayland_window.cc
+index f4e616b2..fb95e498 100644
+--- a/ui/ozone/platform/wayland/host/wayland_window.cc
++++ b/ui/ozone/platform/wayland/host/wayland_window.cc
+@@ -950,7 +950,7 @@
+     // window has been applied.
+     SetWindowGeometry(pending_bounds_dip_);
+     AckConfigure(serial);
+-    root_surface()->Commit();
++    connection()->ScheduleFlush();
+   } else if (!pending_configures_.empty() &&
+              pending_bounds_dip_.size() ==
+                  pending_configures_.back().bounds_dip.size()) {
+diff --git a/ui/ozone/platform/wayland/wayland_buffer_manager_unittest.cc b/ui/ozone/platform/wayland/wayland_buffer_manager_unittest.cc
+index 7a1a95d..58804a0 100644
+--- a/ui/ozone/platform/wayland/wayland_buffer_manager_unittest.cc
++++ b/ui/ozone/platform/wayland/wayland_buffer_manager_unittest.cc
+@@ -1112,9 +1112,7 @@
+     EXPECT_CALL(*xdg_surface, AckConfigure(_)).Times(1);
+     EXPECT_CALL(*mock_surface, Attach(_, _, _)).Times(1);
+     EXPECT_CALL(*mock_surface, Frame(_)).Times(1);
+-    // Commit() can be called a second time as part of the configure -> ack
+-    // sequence.
+-    EXPECT_CALL(*mock_surface, Commit()).Times(testing::Between(1, 2));
++    EXPECT_CALL(*mock_surface, Commit()).Times(1);
+ 
+     ActivateSurface(mock_surface->xdg_surface());
+     Sync();