110.0-1

4 files changed, 45 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6222fe7673fa..c5f4d5f610fb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = firefox-appmenu
 	pkgdesc = Firefox from extra with appmenu patch
-	pkgver = 108.0.2
+	pkgver = 110.0
 	pkgrel = 1
 	url = https://www.mozilla.org/firefox/
 	arch = x86_64
@@ -44,15 +44,15 @@ pkgbase = firefox-appmenu
 	optdepends = speech-dispatcher: Text-to-Speech
 	optdepends = hunspell-en_US: Spell checking, American English
 	optdepends = xdg-desktop-portal: Screensharing with Wayland
-	provides = firefox=108.0.2
+	provides = firefox=110.0
 	conflicts = firefox
 	options = !emptydirs
 	options = !makeflags
 	options = !strip
 	options = !lto
 	options = !debug
-	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/110.0/source/firefox-110.0.source.tar.xz
+	source = https://archive.mozilla.org/pub/firefox/releases/110.0/source/firefox-110.0.source.tar.xz.asc
 	source = 0001-libwebrtc-screen-cast-sync.patch
 	source = firefox.desktop
 	source = identity-icons-brand.svg
@@ -60,13 +60,13 @@ pkgbase = firefox-appmenu
 	source = unity-menubar.patch
 	source = fix_csd_window_buttons.patch
 	validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353
-	sha256sums = 42e6d6b27ad0694a4fc9dd736888ad36c99eb2dbcce96e134584805d644ca300
+	sha256sums = d3882492190e4fdcfa142772cf35de5403effb011d24357b315d643ed9168a39
 	sha256sums = SKIP
-	sha256sums = 5c164f6dfdf2d97f3f317e417aaa2e6ae46a9b3a160c3162d5073fe39d203286
+	sha256sums = 43c83101b7ad7dba6f5fffeb89b70a661a547d506a031ea2beada42ccf04eec7
 	sha256sums = 34514a657d6907a159594c51e674eeb81297c431ec26a736417c2fdb995c2c0c
 	sha256sums = a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9
 	sha256sums = 46724a625f51c358abaee488a7ce75673078e96ba009459339120b8dd11dec25
-	sha256sums = 84c03a4eb5dcc1bb9e2cfc343e0b98bbbc8dc791647747082d3f50ba638de965
+	sha256sums = 2c3d1a778fa07a15a21232b84c6c598330d5a38cfe8f0ec602aee66ac204b8e0
 	sha256sums = e08d0bc5b7e562f5de6998060e993eddada96d93105384960207f7bdf2e1ed6e
 
 pkgname = firefox-appmenu
diff --git a/0001-libwebrtc-screen-cast-sync.patch b/0001-libwebrtc-screen-cast-sync.patch
index 708072656a97..4ac6b9a7cbc9 100644
--- a/0001-libwebrtc-screen-cast-sync.patch
+++ b/0001-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 c11efdb615d0..4ee5259bb41a 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;
  }
diff --git a/PKGBUILD b/PKGBUILD
index e45317443902..bda6a3cbc7b1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=firefox-appmenu
 _pkgname=firefox
-pkgver=108.0.2
+pkgver=110.0
 pkgrel=1
 pkgdesc="Firefox from extra with appmenu patch"
 arch=(x86_64)
@@ -34,13 +34,13 @@ source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-
         fix-wayland-build.patch
         unity-menubar.patch
         fix_csd_window_buttons.patch)
-sha256sums=('42e6d6b27ad0694a4fc9dd736888ad36c99eb2dbcce96e134584805d644ca300'
+sha256sums=('d3882492190e4fdcfa142772cf35de5403effb011d24357b315d643ed9168a39'
             'SKIP'
-            '5c164f6dfdf2d97f3f317e417aaa2e6ae46a9b3a160c3162d5073fe39d203286'
+            '43c83101b7ad7dba6f5fffeb89b70a661a547d506a031ea2beada42ccf04eec7'
             '34514a657d6907a159594c51e674eeb81297c431ec26a736417c2fdb995c2c0c'
             'a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9'
             '46724a625f51c358abaee488a7ce75673078e96ba009459339120b8dd11dec25'
-            '84c03a4eb5dcc1bb9e2cfc343e0b98bbbc8dc791647747082d3f50ba638de965'
+            '2c3d1a778fa07a15a21232b84c6c598330d5a38cfe8f0ec602aee66ac204b8e0'
             'e08d0bc5b7e562f5de6998060e993eddada96d93105384960207f7bdf2e1ed6e')
 validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release@mozilla.com>
 
diff --git a/unity-menubar.patch b/unity-menubar.patch
index 2340c3360488..f4336b9169f9 100644
--- a/unity-menubar.patch
+++ b/unity-menubar.patch
@@ -3254,7 +3254,7 @@
 +                          nullptr, 0, loadGroup, this, nullptr, nullptr,
 +                          nsIRequest::LOAD_NORMAL, nullptr,
 +                          nsIContentPolicy::TYPE_IMAGE, EmptyString(),
-+                          false, false, getter_AddRefs(mImageRequest));
++                          false, false, 0, getter_AddRefs(mImageRequest));
 +    }
 +}
 +
@@ -5099,13 +5099,13 @@
 --- a/xpcom/ds/StaticAtoms.py
 +++ b/xpcom/ds/StaticAtoms.py
 @@ -7,6 +7,7 @@
- from Atom import Atom, InheritingAnonBoxAtom, NonInheritingAnonBoxAtom
- from Atom import PseudoElementAtom
+     PseudoElementAtom,
+ )
  from HTMLAtoms import HTML_PARSER_ATOMS
 +from NativeMenuAtoms import NATIVE_MENU_ATOMS
- import sys
  
  # Static atom definitions, used to generate nsGkAtomList.h.
+ #
 @@ -2529,7 +2530,7 @@ STATIC_ATOMS = [
      InheritingAnonBoxAtom("AnonBox_mozSVGForeignContent", ":-moz-svg-foreign-content"),
      InheritingAnonBoxAtom("AnonBox_mozSVGText", ":-moz-svg-text"),