🔖 Update version

4 files changed, 168 insertions, 101 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d982a5bc305c..42f7cb926ad0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,87 +1,79 @@
 pkgbase = cachy-browser
 	pkgdesc = Community-maintained fork of Firefox, focused on privacy, security and freedom.
-	pkgver = 108.0.2
+	pkgver = 109.0
 	pkgrel = 1
-	url = https://cachyos.org
 	install = cachy-browser.install
 	arch = x86_64
 	arch = x86_64_v3
 	groups = cachyos
-	license = MPL
 	license = GPL
 	license = LGPL
-	makedepends = unzip
-	makedepends = zip
+	license = MPL
+	makedepends = cbindgen
+	makedepends = clang
 	makedepends = diffutils
-	makedepends = yasm
-	makedepends = mesa
+	makedepends = dump_syms
 	makedepends = imake
 	makedepends = inetutils
-	makedepends = xorg-server-xvfb
-	makedepends = autoconf2.13
-	makedepends = rust
-	makedepends = clang
-	makedepends = llvm
 	makedepends = jack
-	makedepends = nodejs
-	makedepends = cbindgen
-	makedepends = nasm
-	makedepends = python-setuptools
-	makedepends = python-zstandard
-	makedepends = git
-	makedepends = binutils
 	makedepends = lld
-	makedepends = dump_syms
-	makedepends = wasi-compiler-rt>13
-	makedepends = wasi-libc>=1:0+258+30094b6
-	makedepends = wasi-libc++>13
-	makedepends = wasi-libc++abi>13
-	makedepends = pciutils
+	makedepends = llvm
+	makedepends = mesa
+	makedepends = nasm
+	makedepends = nodejs
+	makedepends = python
+	makedepends = rust
+	makedepends = unzip
+	makedepends = wasi-compiler-rt
+	makedepends = wasi-libc
+	makedepends = wasi-libc++
+	makedepends = wasi-libc++abi
+	makedepends = xorg-server-xvfb
+	makedepends = yasm
+	makedepends = zip
+	depends = dbus-glib
+	depends = ffmpeg
 	depends = gtk3
+	depends = icu
+	depends = libevent
+	depends = libjpeg
+	depends = libpulse
+	depends = libvpx
+	depends = libwebp
 	depends = libxt
 	depends = mime-types
-	depends = dbus-glib
-	depends = ffmpeg
 	depends = nss
 	depends = ttf-font
-	depends = libpulse
-	depends = aom
-	depends = harfbuzz
-	depends = graphite
-	depends = libvpx
-	depends = libjpeg
 	depends = zlib
-	depends = icu
-	depends = libevent
-	depends = pipewire
-	depends = dav1d
-	optdepends = networkmanager: Location detection via available WiFi networks
+	optdepends = hunspell-en_US: Spell checking, American English
 	optdepends = libnotify: Notification integration
+	optdepends = networkmanager: Location detection via available WiFi networks
 	optdepends = pulseaudio: Audio support
 	optdepends = speech-dispatcher: Text-to-Speech
-	optdepends = hunspell-en_US: Spell checking, American English
 	optdepends = xdg-desktop-portal: Screensharing with Wayland
+	options = !debug
 	options = !emptydirs
+	options = !lto
 	options = !makeflags
 	options = !strip
-	options = !lto
-	options = !debug
 	backup = usr/lib/cachy-browser/cachy.cfg
 	backup = usr/lib/cachy-browser/distribution/policies.json
-	source = https://archive.mozilla.org/pub/firefox/releases/108.0.2/source/firefox-108.0.2.source.tar.xz
-	source = https://archive.mozilla.org/pub/firefox/releases/108.0.2/source/firefox-108.0.2.source.tar.xz.asc
+	source = https://archive.mozilla.org/pub/firefox/releases/109.0/source/firefox-109.0.source.tar.xz
+	source = https://archive.mozilla.org/pub/firefox/releases/109.0/source/firefox-109.0.source.tar.xz.asc
 	source = cachy-browser.desktop
 	source = git+https://github.com/cachyos/cachyos-browser-settings.git
 	source = git+https://github.com/cachyos/cachyos-browser-common.git
 	source = match.patch
 	source = libwebrtc-screen-cast-sync.patch
+	source = 0002-Bug-1804973-Wayland-Check-size-for-valid-EGLWindows-.patch
 	validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353
-	sha256sums = 42e6d6b27ad0694a4fc9dd736888ad36c99eb2dbcce96e134584805d644ca300
+	sha256sums = 0678a03b572b5992fb85f0923a25b236acf81e5ea2c08e549b63a56076a69351
 	sha256sums = SKIP
 	sha256sums = c0786df2fd28409da59d0999083914a65e2097cda055c9c6c2a65825f156e29f
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = 1fbb1971a1d0d4c875b1af0f9681601909cfbe4fe0cc2c2f42c523c84c934499
-	sha256sums = 5c164f6dfdf2d97f3f317e417aaa2e6ae46a9b3a160c3162d5073fe39d203286
+	sha256sums = b1ce6936749ab1614bbce4fddc87058341ed207dde77af609fdc5ac83538517a
+	sha256sums = 34439dfb17371520e5e99444096ded97325ab2559b9039ae16055975d015ac51
 
 pkgname = cachy-browser
diff --git a/0002-Bug-1804973-Wayland-Check-size-for-valid-EGLWindows-.patch b/0002-Bug-1804973-Wayland-Check-size-for-valid-EGLWindows-.patch
new file mode 100644
index 000000000000..4735a44c7871
--- /dev/null
+++ b/0002-Bug-1804973-Wayland-Check-size-for-valid-EGLWindows-.patch
@@ -0,0 +1,25 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: stransky <stransky@redhat.com>
+Date: Thu, 15 Dec 2022 08:09:22 +0000
+Subject: [PATCH] Bug 1804973 [Wayland] Check size for valid EGLWindows only
+ r=emilio
+
+Differential Revision: https://phabricator.services.mozilla.com/D164651
+---
+ widget/gtk/MozContainerWayland.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/widget/gtk/MozContainerWayland.cpp b/widget/gtk/MozContainerWayland.cpp
+index 954c650af533..2a4a492077c3 100644
+--- a/widget/gtk/MozContainerWayland.cpp
++++ b/widget/gtk/MozContainerWayland.cpp
+@@ -704,6 +704,9 @@ bool moz_container_wayland_egl_window_needs_size_update(MozContainer* container,
+                                                         nsIntSize aSize,
+                                                         int aScale) {
+   MozContainerWayland* wl_container = &container->wl_container;
++  if (!wl_container->eglwindow) {
++    return false;
++  }
+   if (wl_container->buffer_scale != aScale) {
+     return true;
+   }
diff --git a/PKGBUILD b/PKGBUILD
index 1bbfe52b45ec..77bae0c5abb5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,47 +7,89 @@
 pkgname=cachy-browser
 _pkgname=Cachy
 __pkgname=cachy
-pkgver=108.0.2
+pkgver=109.0
 pkgrel=1
 pkgdesc="Community-maintained fork of Firefox, focused on privacy, security and freedom."
 arch=(x86_64 x86_64_v3)
-license=(MPL GPL LGPL)
-url="https://cachyos.org"
-depends=(gtk3 libxt mime-types dbus-glib
-         ffmpeg nss ttf-font libpulse
-         aom harfbuzz graphite
-         libvpx libjpeg zlib icu libevent pipewire dav1d)
-makedepends=(unzip zip diffutils yasm mesa imake inetutils xorg-server-xvfb
-             autoconf2.13 rust clang llvm jack nodejs cbindgen nasm
-             python-setuptools python-zstandard git binutils lld dump_syms
-             'wasi-compiler-rt>13' 'wasi-libc>=1:0+258+30094b6' 'wasi-libc++>13' 'wasi-libc++abi>13' pciutils) # pciutils: only to avoid some PGO warning
-optdepends=('networkmanager: Location detection via available WiFi networks'
-            'libnotify: Notification integration'
-            'pulseaudio: Audio support'
-            'speech-dispatcher: Text-to-Speech'
-            'hunspell-en_US: Spell checking, American English'
-            'xdg-desktop-portal: Screensharing with Wayland')
-backup=('usr/lib/cachy-browser/cachy.cfg'
-        'usr/lib/cachy-browser/distribution/policies.json')
+license=(
+  GPL
+  LGPL
+  MPL
+)
+depends=(
+  dbus-glib
+  ffmpeg
+  gtk3
+  icu
+  libevent
+  libjpeg
+  libpulse
+  libvpx
+  libwebp
+  libxt
+  mime-types
+  nss
+  ttf-font
+  zlib
+)
+makedepends=(
+  cbindgen
+  clang
+  diffutils
+  dump_syms
+  imake
+  inetutils
+  jack
+  lld
+  llvm
+  mesa
+  nasm
+  nodejs
+  python
+  rust
+  unzip
+  wasi-compiler-rt
+  wasi-libc
+  wasi-libc++
+  wasi-libc++abi
+  xorg-server-xvfb
+  yasm
+  zip
+)
+optdepends=(
+  'hunspell-en_US: Spell checking, American English'
+  'libnotify: Notification integration'
+  'networkmanager: Location detection via available WiFi networks'
+  'pulseaudio: Audio support'
+  'speech-dispatcher: Text-to-Speech'
+  'xdg-desktop-portal: Screensharing with Wayland'
+)
 groups=('cachyos')
-options=(!emptydirs !makeflags !strip !lto !debug)
-_arch_svn=https://git.archlinux.org/svntogit/packages.git/plain/trunk
-_common_tag="v${pkgver}-${pkgrel}"
-_settings_tag='1.4'
+options=(
+  !debug
+  !emptydirs
+  !lto
+  !makeflags
+  !strip
+)
 install=cachy-browser.install
+backup=('usr/lib/cachy-browser/cachy.cfg'
+        'usr/lib/cachy-browser/distribution/policies.json')
 source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc}
         $pkgname.desktop
         "git+https://github.com/cachyos/cachyos-browser-settings.git"
         "git+https://github.com/cachyos/cachyos-browser-common.git"
         "match.patch"
-        "libwebrtc-screen-cast-sync.patch")
-sha256sums=('42e6d6b27ad0694a4fc9dd736888ad36c99eb2dbcce96e134584805d644ca300'
+        "libwebrtc-screen-cast-sync.patch"
+        "0002-Bug-1804973-Wayland-Check-size-for-valid-EGLWindows-.patch")
+sha256sums=('0678a03b572b5992fb85f0923a25b236acf81e5ea2c08e549b63a56076a69351'
             'SKIP'
             'c0786df2fd28409da59d0999083914a65e2097cda055c9c6c2a65825f156e29f'
             'SKIP'
             'SKIP'
             '1fbb1971a1d0d4c875b1af0f9681601909cfbe4fe0cc2c2f42c523c84c934499'
-            '5c164f6dfdf2d97f3f317e417aaa2e6ae46a9b3a160c3162d5073fe39d203286')
+            'b1ce6936749ab1614bbce4fddc87058341ed207dde77af609fdc5ac83538517a'
+            '34439dfb17371520e5e99444096ded97325ab2559b9039ae16055975d015ac51')
 validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release@mozilla.com>
 
 prepare() {
@@ -213,10 +255,10 @@ END
     msg2 "Patch Devtools to bypass devtool detection"
     patch -Np1 -i ${_patches_dir}/devtools-bypass.patch
 
-    msg2 "KDE UNITY"
-    patch -Np1 -i ${_patches_dir}/librewolf/unity-menubar.patch
-    msg2 "mozilla-kde_after_unity"
-    patch -Np1 -i ${_patches_dir}/librewolf/mozilla-kde_after_unity.patch
+#    msg2 "KDE UNITY"
+#    patch -Np1 -i ${_patches_dir}/librewolf/unity-menubar.patch
+#    msg2 "mozilla-kde_after_unity"
+#    patch -Np1 -i ${_patches_dir}/librewolf/mozilla-kde_after_unity.patch
     msg2 "mozilla-nongnome-proxies"
     patch -Np1 -i ${_patches_dir}/kde/mozilla-nongnome-proxies.patch
     msg2  " some undesired requests (https://gitlab.com/librewolf-community/browser/common/-/issues/10)"
@@ -227,9 +269,10 @@ END
     # https://src.fedoraproject.org/rpms/firefox/blob/rawhide/f/libwebrtc-screen-cast-sync.patch
     msg2 "Arch patch"
     patch -Np1 -i ../libwebrtc-screen-cast-sync.patch
-
-    msg2 "Match to system libs"
-    patch -Np1 -i ../match.patch
+    # https://bugzilla.mozilla.org/show_bug.cgi?id=1804973
+    patch -Np1 -i ../0002-Bug-1804973-Wayland-Check-size-for-valid-EGLWindows-.patch
+#    msg2 "Match to system libs"
+#    patch -Np1 -i ../match.patch
 
     rm -f ${srcdir}/cachyos-browser-common/source_files/mozconfig
     cp -r ${srcdir}/cachyos-browser-common/source_files/browser ./
diff --git a/libwebrtc-screen-cast-sync.patch b/libwebrtc-screen-cast-sync.patch
index 708072656a97..76f109020276 100644
--- a/libwebrtc-screen-cast-sync.patch
+++ b/libwebrtc-screen-cast-sync.patch
@@ -21,7 +21,7 @@ Fixes: https://bugzilla.mozilla.org/show_bug.cgi?id=1790496
  third_party/gbm/gbm/gbm.h                     |  452 ++++++
  .../libpipewire => gbm/libgbm}/moz.build      |    4 +-
  third_party/gbm/libgbm/mozgbm.cpp             |   66 +
- .../desktop_capture_generic_gn/moz.build      |   45 +-
+ .../desktop_capture_gn/moz.build              |   48 +-
  .../desktop_capture_options.cc                |    4 +-
  .../desktop_capture/desktop_capture_options.h |    6 +-
  .../linux/wayland/base_capturer_pipewire.cc   |    2 +-
@@ -29,7 +29,7 @@ Fixes: https://bugzilla.mozilla.org/show_bug.cgi?id=1790496
  .../desktop_capture/window_capturer_linux.cc  |    8 -
  third_party/moz.build                         |    6 +
  .../pipewire/libpipewire/mozpipewire.cpp      |   49 +-
- 20 files changed, 5450 insertions(+), 33 deletions(-)
+ 20 files changed, 5453 insertions(+), 33 deletions(-)
  create mode 100644 third_party/drm/README
  create mode 100644 third_party/drm/drm/drm.h
  create mode 100644 third_party/drm/drm/drm_fourcc.h
@@ -43,7 +43,7 @@ Fixes: https://bugzilla.mozilla.org/show_bug.cgi?id=1790496
  create mode 100644 third_party/gbm/libgbm/mozgbm.cpp
 
 diff --git a/dom/media/webrtc/moz.build b/dom/media/webrtc/moz.build
-index ddf9321b58ea..af0f7ab64cc3 100644
+index b6e09dbb5c9a..ada0fcb4a5d9 100644
 --- a/dom/media/webrtc/moz.build
 +++ b/dom/media/webrtc/moz.build
 @@ -84,6 +84,8 @@ if CONFIG["MOZ_WEBRTC_SIGNALING"]:
@@ -5498,10 +5498,10 @@ index 000000000000..bc024a11c0b7
 +  }
 +  return gbm_device_destroy_fn(gbm);
 +}
-diff --git a/third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build b/third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build
-index 809899a92847..8869fae89703 100644
---- a/third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build
-+++ b/third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build
+diff --git a/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build b/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build
+index 8631744ab1bf..366ea67aa9ab 100644
+--- a/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build
++++ b/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build
 @@ -8,25 +8,28 @@
  if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
      CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
@@ -5532,14 +5532,15 @@ index 809899a92847..8869fae89703 100644
      "/third_party/libwebrtc/",
      "/third_party/libwebrtc/third_party/abseil-cpp/",
      "/third_party/pipewire/",
-@@ -240,7 +243,15 @@ if CONFIG["CPU_ARCH"] == "arm":
+@@ -242,7 +245,16 @@ if CONFIG["CPU_ARCH"] == "arm":
      DEFINES["_GNU_SOURCE"] = True
  
-     UNIFIED_SOURCES += [
+     SOURCES += [
 -        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/moz_base_capturer_pipewire.cc"
 +      "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc",
 +      "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc",
 +      "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc",
++      "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc",
 +      "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/scoped_glib.cc",
 +      "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc",
 +      "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc",
@@ -5549,15 +5550,15 @@ index 809899a92847..8869fae89703 100644
      ]
  
  if CONFIG["CPU_ARCH"] == "ppc64":
-@@ -295,27 +306,51 @@ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
+@@ -297,27 +309,53 @@ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
      DEFINES["_GNU_SOURCE"] = True
  
-     UNIFIED_SOURCES += [
+     SOURCES += [
 -        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/moz_base_capturer_pipewire.cc"
 +      "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc",
 +      "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc",
 +      "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc",
-+      "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/scoped_glib.cc",
++      "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc",
 +      "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc",
 +      "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc",
 +      "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc",
@@ -5571,11 +5572,12 @@ index 809899a92847..8869fae89703 100644
      DEFINES["WEBRTC_USE_PIPEWIRE"] = True
      DEFINES["_GNU_SOURCE"] = True
  
-     UNIFIED_SOURCES += [
+     SOURCES += [
 -        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/moz_base_capturer_pipewire.cc"
 +      "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc",
 +      "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc",
 +      "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc",
++      "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc",
 +      "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/scoped_glib.cc",
 +      "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc",
 +      "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc",
@@ -5590,11 +5592,12 @@ index 809899a92847..8869fae89703 100644
      DEFINES["WEBRTC_USE_PIPEWIRE"] = True
      DEFINES["_GNU_SOURCE"] = True
  
-     UNIFIED_SOURCES += [
+     SOURCES += [
 -        "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/moz_base_capturer_pipewire.cc"
 +      "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc",
 +      "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc",
 +      "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc",
++      "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/restore_token_manager.cc",
 +      "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/scoped_glib.cc",
 +      "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc",
 +      "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc",
@@ -5605,10 +5608,10 @@ index 809899a92847..8869fae89703 100644
  
  if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
 diff --git a/third_party/libwebrtc/modules/desktop_capture/desktop_capture_options.cc b/third_party/libwebrtc/modules/desktop_capture/desktop_capture_options.cc
-index 8bdc83b76218..ab7932195c85 100644
+index 767dbfefa543..22c59ef4cccd 100644
 --- a/third_party/libwebrtc/modules/desktop_capture/desktop_capture_options.cc
 +++ b/third_party/libwebrtc/modules/desktop_capture/desktop_capture_options.cc
-@@ -14,33 +14,33 @@
+@@ -17,31 +17,31 @@
  #elif defined(WEBRTC_WIN)
  #include "modules/desktop_capture/win/full_screen_win_application_handler.h"
  #endif
@@ -5617,8 +5620,6 @@ index 8bdc83b76218..ab7932195c85 100644
  #include "modules/desktop_capture/linux/wayland/shared_screencast_stream.h"
  #endif
  
- #include "rtc_base/ref_counted_object.h"
- 
  namespace webrtc {
  
  DesktopCaptureOptions::DesktopCaptureOptions() {}
@@ -5645,7 +5646,7 @@ index 8bdc83b76218..ab7932195c85 100644
  #endif
  #if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
 diff --git a/third_party/libwebrtc/modules/desktop_capture/desktop_capture_options.h b/third_party/libwebrtc/modules/desktop_capture/desktop_capture_options.h
-index 1605d30f82d1..eb5b8a2a8777 100644
+index 4d2a8da334da..bab39ccf5661 100644
 --- a/third_party/libwebrtc/modules/desktop_capture/desktop_capture_options.h
 +++ b/third_party/libwebrtc/modules/desktop_capture/desktop_capture_options.h
 @@ -17,7 +17,7 @@
@@ -5657,7 +5658,7 @@ index 1605d30f82d1..eb5b8a2a8777 100644
  #include "modules/desktop_capture/linux/wayland/shared_screencast_stream.h"
  #endif
  
-@@ -181,22 +181,20 @@ class RTC_EXPORT DesktopCaptureOptions {
+@@ -181,28 +181,26 @@ class RTC_EXPORT DesktopCaptureOptions {
    bool allow_pipewire() const { return allow_pipewire_; }
    void set_allow_pipewire(bool allow) { allow_pipewire_ = allow; }
  
@@ -5669,6 +5670,12 @@ index 1605d30f82d1..eb5b8a2a8777 100644
        rtc::scoped_refptr<SharedScreenCastStream> stream) {
      screencast_stream_ = stream;
    }
+ 
+   void set_width(uint32_t width) { width_ = width; }
+   uint32_t get_width() const { return width_; }
+ 
+   void set_height(uint32_t height) { height_ = height; }
+   uint32_t get_height() const { return height_; }
 -#endif
  #endif
  
@@ -5682,14 +5689,14 @@ index 1605d30f82d1..eb5b8a2a8777 100644
    // BaseCapturerPipeWire and MouseCursorMonitorPipeWire as cursor information
    // is sent together with screen content.
 diff --git a/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc b/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc
-index 75659a9eb9e2..32578411059b 100644
+index e9158bf0cccf..655ec50ce9d7 100644
 --- a/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc
 +++ b/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc
-@@ -105,7 +105,7 @@ bool BaseCapturerPipeWire::GetSourceList(SourceList* sources) {
+@@ -136,7 +136,7 @@ bool BaseCapturerPipeWire::GetSourceList(SourceList* sources) {
    // is often treated as a null/placeholder id, so we shouldn't use that.
    // TODO(https://crbug.com/1297671): Reconsider type of ID when plumbing
    // token that will enable stream re-use.
--  sources->push_back({1});
+-  sources->push_back({source_id_});
 +  sources->push_back({PIPEWIRE_ID, 0, PIPEWIRE_NAME});
    return true;
  }