Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package MozillaFirefox for openSUSE:Factory checked in at 2023-07-06 18:28:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/MozillaFirefox (Old) and /work/SRC/openSUSE:Factory/.MozillaFirefox.new.23466 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "MozillaFirefox" Thu Jul 6 18:28:06 2023 rev:402 rq:1097019 version:115.0 Changes: -------- --- /work/SRC/openSUSE:Factory/MozillaFirefox/MozillaFirefox.changes 2023-06-21 22:37:45.617613286 +0200 +++ /work/SRC/openSUSE:Factory/.MozillaFirefox.new.23466/MozillaFirefox.changes 2023-07-06 18:28:11.234966858 +0200 @@ -1,0 +2,113 @@ +Sun Jul 2 16:00:53 UTC 2023 - Wolfgang Rosenauer <w...@rosenauer.org> + +- Mozilla Firefox 115.0 + * Support for importing payment methods saved in Chrome-based browser + * Hardware video decoding is now enabled for Intel GPUs on Linux + * The Tab Manager dropdown now features close buttons, so tabs + can be closed more quickly + * Streamlined the user interface for importing data in from other browsers + * Users without platform support for H264 video decoding can now + fallback to Cisco's OpenH264 plugin for playback. + * Undo and redo are now available in Password fields + * Changed: On Linux, middle clicks on the new tab button will + now open the xclipboard contents in the new tab. If the + xclipboard content is a URL then that URL is opened, any + other text is opened with your default search provider. + * Changed: For users with a Firefox Colorways built-in theme, + the theme will be automatically migrated to the same theme + hosted on addons.mozilla.org for Firefox profiles that have + disabled add-ons auto-updates. This will allow users to keep + their Colorways theme when they are later removed from + Firefox installer files. + * Changed: Certain Firefox users may come across a message in + the extensions panel indicating that their add-ons are not + allowed on the site currently open. We have introduced a new + back-end feature to only allow some extensions monitored by + Mozilla to run on specific websites for various reasons, + including security concerns. + * HTML5: The builtin editor now behaves similarly to other + browsers with `contenteditable` and `designMode` when + splitting a node, e.g. typing Enter to split a paragraph, and + also when joining two nodes, e.g. typing Backspace at the + start of a paragraph to join the paragraph and the previous + one. + When a node is split, the builtin editor creates a new node + after the original one instead of before, i.e. creates the + right node instead of the left node. + Similarly, when two nodes are joined, the builtin editor + deletes the latter node and moves its children to the end of + the preceding node instead of deleting the former node and + moving its child to the start of the following node. + * HTML5: WebRTC application developers can now specify a target + in milliseconds of media for the jitter buffer to hold. + Altering the target value allows applications to control the + tradeoff between playout delay and the risk of running out of + audio or video frames due to network jitter. + * HTML5: Change array by copy provides additional methods on + `Array.prototype` and `TypedArray.prototype` to enable + changes on the array by returning a new copy of it with the + change. + * HTML5: The animation-composition property is now supported, + allowing a declarative way to define the composite operation + used when multiple animations affect the same property + simultaneously. + * HTML5: Added the URL.canParse() function to allow easy and + fast checking if URLs are valid and parseable. + * HTML5: IndexedDB is now also supported in private browsing + without memory limits thanks to encrypted storage on disk. + The temporary keys to decrypt the information are hold in RAM + only and all stored information is purged at the normal end + of a private browsing session from disk. + * HTML5: Supports conditions are now supported in CSS import + rules @import supports(...) + * Developer: In web development, we rely on third-party + libraries which you may not be interested in while debugging. + These can be ignored. Ignoring them means that breakpoints + will not get hit and they are skipped during stepping. + You can now choose to **Hide ignore-listed sources** in the + Developer Tools source tree + * Developer: We have introduced a new option, + `devtools.f12_enabled`, that can be utilized to prevent the + accidental use of the F12 key, which opens the DevTools + toolbox (bug). + * Enterprise: You can find information about policy updates and + enterprise specific bug fixes in the Firefox for Enterprise + 115 Release Notes. + MFSA 2023-22 (bsc#1212438) + * CVE-2023-3482 (bmo#1839464) + Block all cookies bypass for localstorage + * CVE-2023-37201 (bmo#1826002) + Use-after-free in WebRTC certificate generation + * CVE-2023-37202 (bmo#1834711) + Potential use-after-free from compartment mismatch in SpiderMonkey + * CVE-2023-37203 (bmo#291640) + Drag and Drop API may provide access to local system files + * CVE-2023-37204 (bmo#1832195) + Fullscreen notification obscured via option element + * CVE-2023-37205 (bmo#1704420) + URL spoofing in address bar using RTL characters + * CVE-2023-37206 (bmo#1813299) + Insufficient validation of symlinks in the FileSystem API + * CVE-2023-37207 (bmo#1816287) + Fullscreen notification obscured + * CVE-2023-37208 (bmo#1837675) + Lack of warning when opening Diagcab files + * CVE-2023-37209 (bmo#1837993) + Use-after-free in `NotifyOnHistoryReload` + * CVE-2023-37210 (bmo#1821886) + Full-screen mode exit prevention + * CVE-2023-37211 (bmo#1832306, bmo#1834862, bmo#1835886, + bmo#1836550, bmo#1837450) + Memory safety bugs fixed in Firefox 115, Firefox ESR 102.13, + and Thunderbird 102.13 + * CVE-2023-37212 (bmo#1750870, bmo#1825552, bmo#1826206, bmo#1827076, + bmo#1828690, bmo#1833503, bmo#1835710, bmo#1838587) + Memory safety bugs fixed in Firefox 115 +- Requires NSS 3.90 +- Add patches: + mozilla-rust-disable-future-incompat.patch + mozilla-bmo1775202.patch + mozilla-partial-revert-1768632.patch +- removed obsolete mozilla-buildfixes.patch + +------------------------------------------------------------------- Old: ---- firefox-114.0.2.source.tar.xz firefox-114.0.2.source.tar.xz.asc l10n-114.0.2.tar.xz mozilla-buildfixes.patch New: ---- firefox-115.0.source.tar.xz firefox-115.0.source.tar.xz.asc l10n-115.0.tar.xz mozilla-bmo1775202.patch mozilla-partial-revert-1768632.patch mozilla-rust-disable-future-incompat.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ --- /var/tmp/diff_new_pack.GCwA6D/_old 2023-07-06 18:28:24.259046817 +0200 +++ /var/tmp/diff_new_pack.GCwA6D/_new 2023-07-06 18:28:24.267046866 +0200 @@ -28,9 +28,9 @@ # orig_suffix b3 # major 69 # mainver %%major.99 -%define major 114 -%define mainver %major.0.2 -%define orig_version 114.0.2 +%define major 115 +%define mainver %major.0 +%define orig_version 115.0 %define orig_suffix %{nil} %define update_channel release %define branding 1 @@ -98,7 +98,8 @@ BuildRequires: fdupes BuildRequires: memory-constraints %if 0%{?suse_version} < 1550 && 0%{?sle_version} <= 150500 -BuildRequires: gcc11-c++ +BuildRequires: gcc12 +BuildRequires: gcc12-c++ %else BuildRequires: gcc-c++ %endif @@ -113,9 +114,9 @@ BuildRequires: libproxy-devel BuildRequires: makeinfo BuildRequires: mozilla-nspr-devel >= 4.35 -BuildRequires: mozilla-nss-devel >= 3.89.1 +BuildRequires: mozilla-nss-devel >= 3.90 BuildRequires: nasm >= 2.14 -BuildRequires: nodejs >= 10.22.1 +BuildRequires: nodejs >= 12.22.12 %if 0%{?sle_version} >= 120000 && 0%{?sle_version} < 150000 BuildRequires: libXtst-devel BuildRequires: python-libxml2 @@ -226,7 +227,9 @@ Patch19: mozilla-bmo531915.patch Patch20: one_swizzle_to_rule_them_all.patch Patch21: svg-rendering.patch -Patch22: mozilla-buildfixes.patch +Patch22: mozilla-partial-revert-1768632.patch +Patch23: mozilla-bmo1775202.patch +Patch24: mozilla-rust-disable-future-incompat.patch # Firefox/browser Patch101: firefox-kde.patch Patch102: firefox-branded-icons.patch @@ -347,12 +350,12 @@ export PYTHON3=/usr/bin/python3.9 %endif -# kdehelperversion=$(cat toolkit/xre/nsKDEUtils.cpp | grep '#define KMOZILLAHELPER_VERSION' | cut -d ' ' -f 3) if test "$kdehelperversion" != %{kde_helper_version}; then echo fix kde helper version in the .spec file exit 1 fi + # When doing only_print_mozconfig, this file isn't necessarily available, so skip it cp %{SOURCE4} .obsenv.sh %else @@ -373,8 +376,8 @@ export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system export CFLAGS="%{optflags}" %if 0%{?suse_version} < 1550 && 0%{?sle_version} <= 150500 -export CC=gcc-11 -export CXX=g++-11 +export CC=gcc-12 +export CXX=g++-12 %else %if 0%{?clang_build} == 0 export CC=gcc @@ -393,7 +396,7 @@ export LDFLAGS="\$LDFLAGS -fPIC -Wl,-z,relro,-z,now" %ifarch ppc64 ppc64le %if 0%{?clang_build} == 0 -export CFLAGS="\$CFLAGS -mminimal-toc" +#export CFLAGS="\$CFLAGS -mminimal-toc" %endif %endif %ifarch %ix86 ++++++ firefox-114.0.2.source.tar.xz -> firefox-115.0.source.tar.xz ++++++ /work/SRC/openSUSE:Factory/MozillaFirefox/firefox-114.0.2.source.tar.xz /work/SRC/openSUSE:Factory/.MozillaFirefox.new.23466/firefox-115.0.source.tar.xz differ: char 15, line 1 ++++++ firefox-branded-icons.patch ++++++ --- /var/tmp/diff_new_pack.GCwA6D/_old 2023-07-06 18:28:24.415047774 +0200 +++ /var/tmp/diff_new_pack.GCwA6D/_new 2023-07-06 18:28:24.419047799 +0200 @@ -2,15 +2,11 @@ # Parent e0751ad74e835e80041a61ea00c2a63bf6fbe2de # Parent fe7e6fdd75484993420740244f21b5b41d6e0fa1 -diff --git a/browser/branding/branding-common.mozbuild b/browser/branding/branding-common.mozbuild ---- a/browser/branding/branding-common.mozbuild -+++ b/browser/branding/branding-common.mozbuild -@@ -25,12 +25,15 @@ def FirefoxBranding(): - 'PrivateBrowsing_70.png', - 'VisualElements_150.png', - 'VisualElements_70.png', - ] - elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk': +Index: firefox-115.0/browser/branding/branding-common.mozbuild +=================================================================== +--- firefox-115.0.orig/browser/branding/branding-common.mozbuild ++++ firefox-115.0/browser/branding/branding-common.mozbuild +@@ -30,6 +30,9 @@ def FirefoxBranding(): FINAL_TARGET_FILES.chrome.icons.default += [ 'default128.png', 'default16.png', @@ -20,16 +16,11 @@ 'default32.png', 'default48.png', 'default64.png', - ] -diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in ---- a/browser/installer/package-manifest.in -+++ b/browser/installer/package-manifest.in -@@ -221,20 +221,23 @@ - @RESPATH@/browser/chrome/browser@JAREXT@ - @RESPATH@/browser/chrome/browser.manifest - @RESPATH@/chrome/pdfjs.manifest - @RESPATH@/chrome/pdfjs/* - @RESPATH@/chrome/toolkit@JAREXT@ +Index: firefox-115.0/browser/installer/package-manifest.in +=================================================================== +--- firefox-115.0.orig/browser/installer/package-manifest.in ++++ firefox-115.0/browser/installer/package-manifest.in +@@ -227,10 +227,13 @@ @RESPATH@/chrome/toolkit.manifest #ifdef MOZ_GTK @RESPATH@/browser/chrome/icons/default/default16.png @@ -43,9 +34,4 @@ #endif @RESPATH@/browser/features/* - ; [DevTools Startup Files] - @RESPATH@/browser/chrome/devtools-startup@JAREXT@ - @RESPATH@/browser/chrome/devtools-startup.manifest - - ; DevTools ++++++ firefox-kde.patch ++++++ --- /var/tmp/diff_new_pack.GCwA6D/_old 2023-07-06 18:28:24.431047872 +0200 +++ /var/tmp/diff_new_pack.GCwA6D/_new 2023-07-06 18:28:24.435047897 +0200 @@ -11,15 +11,11 @@ 4. Replace #ifndef with #ifdef in the line above (this hanges the button order from Gnome-style to KDE-style) 5. hg qrefresh -diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js ---- a/browser/components/preferences/main.js -+++ b/browser/components/preferences/main.js -@@ -296,16 +296,23 @@ var gMainPane = { - }, backoffTimes[this._backoffIndex + 1 < backoffTimes.length ? this._backoffIndex++ : backoffTimes.length - 1]); - }; - - window.setTimeout(() => { - window.requestIdleCallback(pollForDefaultBrowser); +Index: firefox-115.0/browser/components/preferences/main.js +=================================================================== +--- firefox-115.0.orig/browser/components/preferences/main.js ++++ firefox-115.0/browser/components/preferences/main.js +@@ -293,6 +293,13 @@ var gMainPane = { }, backoffTimes[this._backoffIndex]); } @@ -33,17 +29,7 @@ this.initBrowserContainers(); this.buildContentProcessCountMenuList(); - this.updateDefaultPerformanceSettingsPref(); - - let defaultPerformancePref = Preferences.get( - "browser.preferences.defaultPerformanceSettings.enabled" - ); -@@ -1298,16 +1305,27 @@ var gMainPane = { - this._backoffIndex = 0; - - let shellSvc = getShellService(); - if (!shellSvc) { - return; +@@ -1762,6 +1769,17 @@ var gMainPane = { } try { shellSvc.setDefaultBrowser(true, false); @@ -61,20 +47,11 @@ } catch (ex) { console.error(ex); return; - } - - let isDefault = shellSvc.isDefaultBrowser(false, true); - let setDefaultPane = document.getElementById("setDefaultPane"); - setDefaultPane.classList.toggle("is-default", isDefault); -diff --git a/browser/components/shell/moz.build b/browser/components/shell/moz.build ---- a/browser/components/shell/moz.build -+++ b/browser/components/shell/moz.build -@@ -31,16 +31,18 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "coco - ] - elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": - XPIDL_SOURCES += [ - "nsIGNOMEShellService.idl", - ] +Index: firefox-115.0/browser/components/shell/moz.build +=================================================================== +--- firefox-115.0.orig/browser/components/shell/moz.build ++++ firefox-115.0/browser/components/shell/moz.build +@@ -36,6 +36,8 @@ elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "gt SOURCES += [ "nsGNOMEShellService.cpp", @@ -83,15 +60,10 @@ ] if CONFIG["MOZ_ENABLE_DBUS"]: SOURCES += [ - "nsGNOMEShellDBusHelper.cpp", - "nsGNOMEShellSearchProvider.cpp", - ] - include("/ipc/chromium/chromium-config.mozbuild") - -diff --git a/browser/components/shell/nsKDEShellService.cpp b/browser/components/shell/nsKDEShellService.cpp -new file mode 100644 +Index: firefox-115.0/browser/components/shell/nsKDEShellService.cpp +=================================================================== --- /dev/null -+++ b/browser/components/shell/nsKDEShellService.cpp ++++ firefox-115.0/browser/components/shell/nsKDEShellService.cpp @@ -0,0 +1,109 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* This Source Code Form is subject to the terms of the Mozilla Public @@ -202,10 +174,10 @@ + return NS_ERROR_NOT_IMPLEMENTED; +} + -diff --git a/browser/components/shell/nsKDEShellService.h b/browser/components/shell/nsKDEShellService.h -new file mode 100644 +Index: firefox-115.0/browser/components/shell/nsKDEShellService.h +=================================================================== --- /dev/null -+++ b/browser/components/shell/nsKDEShellService.h ++++ firefox-115.0/browser/components/shell/nsKDEShellService.h @@ -0,0 +1,32 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* This Source Code Form is subject to the terms of the Mozilla Public @@ -239,10 +211,10 @@ +}; + +#endif // nskdeshellservice_h____ -diff --git a/browser/components/shell/nsUnixShellService.cpp b/browser/components/shell/nsUnixShellService.cpp -new file mode 100644 +Index: firefox-115.0/browser/components/shell/nsUnixShellService.cpp +=================================================================== --- /dev/null -+++ b/browser/components/shell/nsUnixShellService.cpp ++++ firefox-115.0/browser/components/shell/nsUnixShellService.cpp @@ -0,0 +1,22 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* This Source Code Form is subject to the terms of the Mozilla Public @@ -266,10 +238,10 @@ + return nsKDEShellServiceConstructor( aIID, aResult ); + return nsGNOMEShellServiceConstructor( aIID, aResult ); +} -diff --git a/browser/components/shell/nsUnixShellService.h b/browser/components/shell/nsUnixShellService.h -new file mode 100644 +Index: firefox-115.0/browser/components/shell/nsUnixShellService.h +=================================================================== --- /dev/null -+++ b/browser/components/shell/nsUnixShellService.h ++++ firefox-115.0/browser/components/shell/nsUnixShellService.h @@ -0,0 +1,15 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* This Source Code Form is subject to the terms of the Mozilla Public ++++++ l10n-114.0.2.tar.xz -> l10n-115.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/MozillaFirefox/l10n-114.0.2.tar.xz /work/SRC/openSUSE:Factory/.MozillaFirefox.new.23466/l10n-115.0.tar.xz differ: char 26, line 1 ++++++ mozilla-aarch64-startup-crash.patch ++++++ --- /var/tmp/diff_new_pack.GCwA6D/_old 2023-07-06 18:28:24.519048413 +0200 +++ /var/tmp/diff_new_pack.GCwA6D/_new 2023-07-06 18:28:24.523048438 +0200 @@ -3,19 +3,14 @@ # Date 1558442998 -7200 # Tue May 21 14:49:58 2019 +0200 # Node ID 386083b58d8558141901d796ec6919a4aba7ad3a -# Parent a30a9b9aae5740f096a16118ed9e4bc45d3d1c35 +# Parent 76b747f7d113bddbb8593184d81e1bfe5fd51af0 bsc#991344 - Rpi3: Firefox crashes after a few seconds of usage bmo#1302554 - ARM/AARCH64: Firefox crashes on NULL nsIChannel** result pointer in nsIOService::NewChannelFromURIWithProxyFlagsInternal() diff --git a/netwerk/base/nsIOService.cpp b/netwerk/base/nsIOService.cpp --- a/netwerk/base/nsIOService.cpp +++ b/netwerk/base/nsIOService.cpp -@@ -1032,17 +1032,23 @@ nsresult nsIOService::NewChannelFromURIW - "doesn't support nsIUploadChannel2. An extension has " - "supplied a non-functional http protocol handler. This will " - "break behavior and in future releases not work at all."); - } - gHasWarnedUploadChannel2 = true; +@@ -1159,7 +1159,13 @@ nsresult nsIOService::NewChannelFromURIW } } @@ -29,9 +24,4 @@ return NS_OK; } - NS_IMETHODIMP - nsIOService::NewChannelFromURIWithProxyFlags( - nsIURI* aURI, nsIURI* aProxyURI, uint32_t aProxyFlags, - nsINode* aLoadingNode, nsIPrincipal* aLoadingPrincipal, - nsIPrincipal* aTriggeringPrincipal, uint32_t aSecurityFlags, ++++++ mozilla-bmo1512162.patch ++++++ --- /var/tmp/diff_new_pack.GCwA6D/_old 2023-07-06 18:28:24.551048609 +0200 +++ /var/tmp/diff_new_pack.GCwA6D/_new 2023-07-06 18:28:24.555048634 +0200 @@ -3,15 +3,11 @@ This fixes a broken build for gcc < 9 on ppc64le. This patch can be removed for newer gcc-versions. -diff --git a/js/xpconnect/src/XPCWrappedNative.cpp b/js/xpconnect/src/XPCWrappedNative.cpp ---- a/js/xpconnect/src/XPCWrappedNative.cpp -+++ b/js/xpconnect/src/XPCWrappedNative.cpp -@@ -1072,17 +1072,21 @@ class MOZ_STACK_CLASS CallMethodHelper f - uint32_t* result); - - MOZ_ALWAYS_INLINE bool GetInterfaceTypeFromParam(const nsXPTType& type, - nsID* result) const; - +Index: firefox-115.0/js/xpconnect/src/XPCWrappedNative.cpp +=================================================================== +--- firefox-115.0.orig/js/xpconnect/src/XPCWrappedNative.cpp ++++ firefox-115.0/js/xpconnect/src/XPCWrappedNative.cpp +@@ -1061,7 +1061,11 @@ class MOZ_STACK_CLASS CallMethodHelper f MOZ_ALWAYS_INLINE bool GetOutParamSource(uint8_t paramIndex, MutableHandleValue srcp) const; @@ -24,17 +20,7 @@ MOZ_ALWAYS_INLINE bool QueryInterfaceFastPath(); - nsXPTCVariant* GetDispatchParam(uint8_t paramIndex) { - if (paramIndex >= mJSContextIndex) { - paramIndex += 1; - } - if (paramIndex >= mOptArgcIndex) { -@@ -1119,17 +1123,21 @@ class MOZ_STACK_CLASS CallMethodHelper f - - { - // Success checked later. - mIFaceInfo->GetMethodInfo(mVTableIndex, &mMethodInfo); - } +@@ -1108,7 +1112,11 @@ class MOZ_STACK_CLASS CallMethodHelper f ~CallMethodHelper(); @@ -47,9 +33,4 @@ // Trace implementation so we can put our CallMethodHelper in a Rooted<T>. void trace(JSTracer* aTrc); - }; - - // static - bool XPCWrappedNative::CallMethod(XPCCallContext& ccx, - CallMode mode /*= CALL_METHOD */) { ++++++ mozilla-bmo1775202.patch ++++++ From: Mike Hommey <m...@glandium.org> Date: Sun, 14 Aug 2022 07:01:33 +0900 Subject: Work around bz#1775202 to fix FTBFS on ppc64el --- third_party/libwebrtc/moz.build | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/third_party/libwebrtc/moz.build b/third_party/libwebrtc/moz.build index 976cf373..311519c 100644 --- a/third_party/libwebrtc/moz.build +++ b/third_party/libwebrtc/moz.build @@ -566,6 +566,13 @@ if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": "/third_party/libwebrtc/third_party/pipewire/pipewire_gn" ] +if CONFIG["CPU_ARCH"] == "ppc64" and CONFIG["OS_TARGET"] == "Linux": + + DIRS += [ + "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn", + "/third_party/libwebrtc/modules/desktop_capture/primitives_gn", + ] + if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": DIRS += [ ++++++ mozilla-bmo849632.patch ++++++ --- /var/tmp/diff_new_pack.GCwA6D/_old 2023-07-06 18:28:24.587048831 +0200 +++ /var/tmp/diff_new_pack.GCwA6D/_new 2023-07-06 18:28:24.587048831 +0200 @@ -6,15 +6,11 @@ So we swizzle the output of webgl after reading it from readpixels() Note: This does not fix all webGL sites, but is a step in the right direction -diff --git a/gfx/gl/GLContext.h b/gfx/gl/GLContext.h ---- a/gfx/gl/GLContext.h -+++ b/gfx/gl/GLContext.h -@@ -1548,16 +1548,23 @@ class GLContext : public GenericAtomicRe - AFTER_GL_CALL; - } - - void raw_fReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, - GLenum format, GLenum type, GLvoid* pixels) { +Index: firefox-115.0/gfx/gl/GLContext.h +=================================================================== +--- firefox-115.0.orig/gfx/gl/GLContext.h ++++ firefox-115.0/gfx/gl/GLContext.h +@@ -1560,6 +1560,13 @@ class GLContext : public GenericAtomicRe BEFORE_GL_CALL; mSymbols.fReadPixels(x, y, width, height, format, type, pixels); OnSyncCall(); @@ -28,9 +24,4 @@ AFTER_GL_CALL; mHeavyGLCallsSinceLastFlush = true; } - - void fReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, - GLenum format, GLenum type, GLvoid* pixels); - - public: ++++++ mozilla-fix-aarch64-libopus.patch ++++++ --- /var/tmp/diff_new_pack.GCwA6D/_old 2023-07-06 18:28:24.603048929 +0200 +++ /var/tmp/diff_new_pack.GCwA6D/_new 2023-07-06 18:28:24.607048953 +0200 @@ -1,15 +1,10 @@ # HG changeset patch -# Parent 2640f2f68373b7bec776bb11d3b3fb75c72a8adb +# Parent af2c24874d79cbebb444727ae96f2fefa3f22b47 diff --git a/media/libopus/silk/arm/arm_silk_map.c b/media/libopus/silk/arm/arm_silk_map.c --- a/media/libopus/silk/arm/arm_silk_map.c +++ b/media/libopus/silk/arm/arm_silk_map.c -@@ -23,17 +23,17 @@ INTERRUPTION) HOWEVER CAUSED AND ON ANY - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - ***********************************************************************/ - #ifdef HAVE_CONFIG_H +@@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE. # include "config.h" #endif @@ -18,9 +13,4 @@ #include "NSQ.h" #include "SigProc_FIX.h" - #if defined(OPUS_HAVE_RTCD) - - # if (defined(OPUS_ARM_MAY_HAVE_NEON_INTR) && \ - !defined(OPUS_ARM_PRESUME_NEON_INTR)) - ++++++ mozilla-kde.patch ++++++ ++++ 2428 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/MozillaFirefox/mozilla-kde.patch ++++ and /work/SRC/openSUSE:Factory/.MozillaFirefox.new.23466/mozilla-kde.patch ++++++ mozilla-nongnome-proxies.patch ++++++ --- /var/tmp/diff_new_pack.GCwA6D/_old 2023-07-06 18:28:24.643049174 +0200 +++ /var/tmp/diff_new_pack.GCwA6D/_new 2023-07-06 18:28:24.647049198 +0200 @@ -3,7 +3,7 @@ # Date 1558442915 -7200 # Tue May 21 14:48:35 2019 +0200 # Node ID 6bcf2dfebc1ea2aa34e5cc61152709fc8e409dc5 -# Parent bd5d1f49975deb730064a16b3079edb53c4a5f84 +# Parent 715f01d61df8627117e6aefca540f0c1bba45011 Do not use gconf for proxy settings if not running within Gnome Index: toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp =================================================================== @@ -13,12 +13,7 @@ diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp --- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp +++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp -@@ -49,20 +49,24 @@ NS_IMETHODIMP - nsUnixSystemProxySettings::GetMainThreadOnly(bool* aMainThreadOnly) { - // dbus prevents us from being threadsafe, but this routine should not block - // anyhow - *aMainThreadOnly = true; - return NS_OK; +@@ -52,10 +52,13 @@ nsUnixSystemProxySettings::GetMainThread } void nsUnixSystemProxySettings::Init() { @@ -30,16 +25,10 @@ + if (sessionType && !strcmp(sessionType, "gnome")) { + mGSettings = do_GetService(NS_GSETTINGSSERVICE_CONTRACTID); + if (mGSettings) { -+ mGSettings->GetCollectionForSchema( -+ "org.gnome.system.proxy"_ns, -+ getter_AddRefs(mProxySettings)); ++ mGSettings->GetCollectionForSchema("org.gnome.system.proxy"_ns, ++ getter_AddRefs(mProxySettings)); + } } } - nsresult nsUnixSystemProxySettings::GetPACURI(nsACString& aResult) { - if (mProxySettings) { - nsCString proxyMode; - // Check if mode is auto - nsresult rv = mProxySettings->GetString("mode"_ns, proxyMode); ++++++ mozilla-ntlm-full-path.patch ++++++ --- /var/tmp/diff_new_pack.GCwA6D/_old 2023-07-06 18:28:24.659049273 +0200 +++ /var/tmp/diff_new_pack.GCwA6D/_new 2023-07-06 18:28:24.663049297 +0200 @@ -1,18 +1,13 @@ # HG changeset patch # User Petr Cerny <pce...@novell.com> # Parent 7308e4a7c1f769f4bbbc90870b849cadd99495a6 -# Parent 2361c5db1e70e358b2158325e07fa15bb4569c2c +# Parent 1c6a565013e4c5f3494f964269783939cd5ed0b8 Bug 634334 - call to the ntlm_auth helper fails diff --git a/extensions/auth/nsAuthSambaNTLM.cpp b/extensions/auth/nsAuthSambaNTLM.cpp --- a/extensions/auth/nsAuthSambaNTLM.cpp +++ b/extensions/auth/nsAuthSambaNTLM.cpp -@@ -156,17 +156,17 @@ static uint8_t* ExtractMessage(const nsA - *aLen = (length / 4) * 3 - numEquals; - return reinterpret_cast<uint8_t*>(PL_Base64Decode(s, length, nullptr)); - } - - nsresult nsAuthSambaNTLM::SpawnNTLMAuthHelper() { +@@ -160,7 +160,7 @@ nsresult nsAuthSambaNTLM::SpawnNTLMAuthH const char* username = PR_GetEnv("USER"); if (!username) return NS_ERROR_FAILURE; @@ -21,9 +16,4 @@ "--helper-protocol", "ntlmssp-client-1", "--use-cached-creds", - "--username", - username, - nullptr}; - - bool isOK = SpawnIOChild(const_cast<char* const*>(args), &mChildPID, ++++++ mozilla-partial-revert-1768632.patch ++++++ Index: firefox-102.4.0/mfbt/EnumSet.h =================================================================== --- firefox-102.4.0.orig/mfbt/EnumSet.h +++ firefox-102.4.0/mfbt/EnumSet.h @@ -326,7 +326,7 @@ class EnumSet { } } - static constexpr size_t kMaxBits = MaxBits(); + static constexpr size_t kMaxBits = EnumSet().MaxBits(); Serialized mBitField; ++++++ mozilla-pgo.patch ++++++ --- /var/tmp/diff_new_pack.GCwA6D/_old 2023-07-06 18:28:24.683049420 +0200 +++ /var/tmp/diff_new_pack.GCwA6D/_new 2023-07-06 18:28:24.683049420 +0200 @@ -1,16 +1,12 @@ # HG changeset patch # User Wolfgang Rosenauer <w...@rosenauer.org> -# Parent d6f551c7b3dc20bb47526e06c44646fd159f3dd1 +# Parent 9959fe2a13a39cbeb98ca1bef2e21caba16717bd -diff --git a/build/moz.configure/lto-pgo.configure b/build/moz.configure/lto-pgo.configure ---- a/build/moz.configure/lto-pgo.configure -+++ b/build/moz.configure/lto-pgo.configure -@@ -242,34 +242,34 @@ def lto( - "configure." - ) - - if c_compiler.type == "clang": - if value == "full": +Index: firefox-115.0/build/moz.configure/lto-pgo.configure +=================================================================== +--- firefox-115.0.orig/build/moz.configure/lto-pgo.configure ++++ firefox-115.0/build/moz.configure/lto-pgo.configure +@@ -251,8 +251,8 @@ def lto( cflags.append("-flto") ldflags.append("-flto") else: @@ -19,18 +15,10 @@ + cflags.append("-flto") + ldflags.append("-flto") - if target.os == "Android" and value == "cross": + if target.os == "Android" and "cross" in values: # Work around https://github.com/rust-lang/rust/issues/90088 - # by enabling the highest level of SSE the rust targets default - # to. - # https://github.com/rust-lang/rust/blob/bdfcb88e8b6203ccb46a2fb6649979b773efc8ac/compiler/rustc_target/src/spec/i686_linux_android.rs#L13 - # https://github.com/rust-lang/rust/blob/8d1083e319841624f64400e1524805a40d725439/compiler/rustc_target/src/spec/x86_64_linux_android.rs#L7 - if target.cpu == "x86": - ldflags.append("-Wl,-plugin-opt=-mattr=+ssse3") - elif target.cpu == "x86_64": - ldflags.append("-Wl,-plugin-opt=-mattr=+sse4.2") - elif c_compiler.type == "clang-cl": - if value == "full": +@@ -268,7 +268,7 @@ def lto( + if "full" in values: cflags.append("-flto") else: - cflags.append("-flto=thin") @@ -38,20 +26,11 @@ # With clang-cl, -flto can only be used with -c or -fuse-ld=lld. # AC_TRY_LINKs during configure don't have -c, so pass -fuse-ld=lld. cflags.append("-fuse-ld=lld") - - # Explicitly set the CPU to optimize for so the linker doesn't - # choose a poor default. Rust compilation by default uses the - # pentium4 CPU on x86: - # -diff --git a/build/pgo/profileserver.py b/build/pgo/profileserver.py ---- a/build/pgo/profileserver.py -+++ b/build/pgo/profileserver.py -@@ -6,17 +6,17 @@ - - import glob - import json - import os - import subprocess +Index: firefox-115.0/build/pgo/profileserver.py +=================================================================== +--- firefox-115.0.orig/build/pgo/profileserver.py ++++ firefox-115.0/build/pgo/profileserver.py +@@ -11,7 +11,7 @@ import subprocess import sys import mozcrash @@ -60,17 +39,7 @@ from mozfile import TemporaryDirectory from mozhttpd import MozHttpd from mozprofile import FirefoxProfile, Preferences - from mozprofile.permissions import ServerLocations - from mozrunner import CLI, FirefoxRunner - from six import string_types - - PORT = 8888 -@@ -82,19 +82,32 @@ if __name__ == "__main__": - docroot=os.path.join(build.topsrcdir, "build", "pgo"), - path_mappings=path_mappings, - ) - httpd.start(block=False) - +@@ -87,9 +87,22 @@ if __name__ == "__main__": locations = ServerLocations() locations.add_host(host="127.0.0.1", port=PORT, options="primary,privileged") @@ -96,17 +65,7 @@ with TemporaryDirectory() as profilePath: # TODO: refactor this into mozprofile - profile_data_dir = os.path.join(build.topsrcdir, "testing", "profiles") - with open(os.path.join(profile_data_dir, "profiles.json"), "r") as fh: - base_profiles = json.load(fh)["profileserver"] - - prefpaths = [ -@@ -208,16 +221,20 @@ if __name__ == "__main__": - - # Try to move the crash reports to the artifacts even if Firefox appears - # to exit successfully, in case there's a crash that doesn't set the - # return code to non-zero for some reason. - if get_crashreports(profilePath, name="Firefox exited successfully?") != 0: +@@ -213,6 +226,10 @@ if __name__ == "__main__": print("Firefox exited successfully, but produced a crashreport") sys.exit(1) @@ -117,18 +76,11 @@ llvm_profdata = env.get("LLVM_PROFDATA") if llvm_profdata: profraw_files = glob.glob("*.profraw") - if not profraw_files: - print( - "Could not find profraw files in the current directory: %s" - % os.getcwd() - ) -diff --git a/build/unix/mozconfig.unix b/build/unix/mozconfig.unix ---- a/build/unix/mozconfig.unix -+++ b/build/unix/mozconfig.unix -@@ -1,14 +1,23 @@ - . "$topsrcdir/build/mozconfig.common" - - if [ -n "$FORCE_GCC" ]; then +Index: firefox-115.0/build/unix/mozconfig.unix +=================================================================== +--- firefox-115.0.orig/build/unix/mozconfig.unix ++++ firefox-115.0/build/unix/mozconfig.unix +@@ -4,6 +4,15 @@ if [ -n "$FORCE_GCC" ]; then CC="$MOZ_FETCHES_DIR/gcc/bin/gcc" CXX="$MOZ_FETCHES_DIR/gcc/bin/g++" @@ -144,34 +96,21 @@ # We want to make sure we use binutils and other binaries in the tooltool # package. mk_add_options "export PATH=$MOZ_FETCHES_DIR/gcc/bin:$MOZ_FETCHES_DIR/binutils/bin:$PATH" - else - # For some builds we don't want to have Clang based static-analysis activated - if [ -z "$DISABLE_CLANG_PLUGIN" ]; then - export ENABLE_CLANG_PLUGIN=1 - fi -diff --git a/extensions/spellcheck/src/moz.build b/extensions/spellcheck/src/moz.build ---- a/extensions/spellcheck/src/moz.build -+++ b/extensions/spellcheck/src/moz.build -@@ -23,8 +23,10 @@ LOCAL_INCLUDES += [ - "../hunspell/glue", - "../hunspell/src", - "/dom/base", - ] - EXPORTS.mozilla += [ +Index: firefox-115.0/extensions/spellcheck/src/moz.build +=================================================================== +--- firefox-115.0.orig/extensions/spellcheck/src/moz.build ++++ firefox-115.0/extensions/spellcheck/src/moz.build +@@ -28,3 +28,5 @@ EXPORTS.mozilla += [ "mozInlineSpellChecker.h", "mozSpellChecker.h", ] + +CXXFLAGS += ['-fno-devirtualize'] -diff --git a/toolkit/components/terminator/nsTerminator.cpp b/toolkit/components/terminator/nsTerminator.cpp ---- a/toolkit/components/terminator/nsTerminator.cpp -+++ b/toolkit/components/terminator/nsTerminator.cpp -@@ -455,16 +455,21 @@ void nsTerminator::StartWatchdog() { - // Defend against overflow - crashAfterMS = INT32_MAX; - } else { - crashAfterMS *= scaleUp; - } +Index: firefox-115.0/toolkit/components/terminator/nsTerminator.cpp +=================================================================== +--- firefox-115.0.orig/toolkit/components/terminator/nsTerminator.cpp ++++ firefox-115.0/toolkit/components/terminator/nsTerminator.cpp +@@ -460,6 +460,11 @@ void nsTerminator::StartWatchdog() { } #endif @@ -183,9 +122,4 @@ UniquePtr<Options> options(new Options()); // crashAfterTicks is guaranteed to be > 0 as // crashAfterMS >= ADDITIONAL_WAIT_BEFORE_CRASH_MS >> HEARTBEAT_INTERVAL_MS - options->crashAfterTicks = crashAfterMS / HEARTBEAT_INTERVAL_MS; - - DebugOnly<PRThread*> watchdogThread = - CreateSystemThread(RunWatchdog, options.release()); - MOZ_ASSERT(watchdogThread); ++++++ mozilla-reduce-rust-debuginfo.patch ++++++ --- /var/tmp/diff_new_pack.GCwA6D/_old 2023-07-06 18:28:24.695049493 +0200 +++ /var/tmp/diff_new_pack.GCwA6D/_new 2023-07-06 18:28:24.695049493 +0200 @@ -1,6 +1,10 @@ ---- firefox-96.0.3.orig/build/moz.configure/rust.configure -+++ firefox-96.0.3/build/moz.configure/rust.configure -@@ -641,7 +643,7 @@ def rust_compile_flags( +# HG changeset patch +# Parent 135d931b3e674a670473f69f8c079e741ac63643 + +diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure +--- a/build/moz.configure/rust.configure ++++ b/build/moz.configure/rust.configure +@@ -668,7 +668,7 @@ def rust_compile_flags( debug_assertions = False if debug_symbols: ++++++ mozilla-rust-disable-future-incompat.patch ++++++ diff -rup a/Cargo.toml b/Cargo.toml --- a/Cargo.toml 2023-07-04 15:15:01.089470619 +0200 +++ b/Cargo.toml 2023-07-04 15:24:31.626226962 +0200 @@ -188,3 +188,8 @@ uniffi_bindgen = "=0.23.0" uniffi_build = "=0.23.0" uniffi_macros = "=0.23.0" weedle2 = "=4.0.0" + +# Package code v0.1.4 uses code "that will be rejected by a future version of Rust" +# Shut up such messages for now to make the build succeed +[future-incompat-report] +frequency = "never" ++++++ mozilla-silence-no-return-type.patch ++++++ --- /var/tmp/diff_new_pack.GCwA6D/_old 2023-07-06 18:28:24.715049616 +0200 +++ /var/tmp/diff_new_pack.GCwA6D/_new 2023-07-06 18:28:24.723049666 +0200 @@ -1,9 +1,10 @@ # HG changeset patch # Parent 5df550d4b5fc674268055e504f60392389eb9ea7 -diff --git a/gfx/skia/skia/include/codec/SkEncodedOrigin.h b/gfx/skia/skia/include/codec/SkEncodedOrigin.h ---- a/gfx/skia/skia/include/codec/SkEncodedOrigin.h -+++ b/gfx/skia/skia/include/codec/SkEncodedOrigin.h +Index: firefox-115.0/gfx/skia/skia/include/codec/SkEncodedOrigin.h +=================================================================== +--- firefox-115.0.orig/gfx/skia/skia/include/codec/SkEncodedOrigin.h ++++ firefox-115.0/gfx/skia/skia/include/codec/SkEncodedOrigin.h @@ -41,6 +41,7 @@ static inline SkMatrix SkEncodedOriginTo case kLeftBottom_SkEncodedOrigin: return SkMatrix::MakeAll( 0, 1, 0, -1, 0, h, 0, 0, 1); } @@ -12,9 +13,10 @@ } /** -diff --git a/gfx/skia/skia/include/private/gpu/ganesh/GrTypesPriv.h b/gfx/skia/skia/include/private/gpu/ganesh/GrTypesPriv.h ---- a/gfx/skia/skia/include/private/gpu/ganesh/GrTypesPriv.h -+++ b/gfx/skia/skia/include/private/gpu/ganesh/GrTypesPriv.h +Index: firefox-115.0/gfx/skia/skia/include/private/gpu/ganesh/GrTypesPriv.h +=================================================================== +--- firefox-115.0.orig/gfx/skia/skia/include/private/gpu/ganesh/GrTypesPriv.h ++++ firefox-115.0/gfx/skia/skia/include/private/gpu/ganesh/GrTypesPriv.h @@ -325,6 +325,7 @@ static inline bool GrTextureTypeHasRestr default: SK_ABORT("Unexpected texture type"); @@ -23,9 +25,10 @@ } ////////////////////////////////////////////////////////////////////////////// -diff --git a/gfx/skia/skia/src/core/SkDescriptor.cpp b/gfx/skia/skia/src/core/SkDescriptor.cpp ---- a/gfx/skia/skia/src/core/SkDescriptor.cpp -+++ b/gfx/skia/skia/src/core/SkDescriptor.cpp +Index: firefox-115.0/gfx/skia/skia/src/core/SkDescriptor.cpp +=================================================================== +--- firefox-115.0.orig/gfx/skia/skia/src/core/SkDescriptor.cpp ++++ firefox-115.0/gfx/skia/skia/src/core/SkDescriptor.cpp @@ -26,6 +26,7 @@ std::unique_ptr<SkDescriptor> SkDescript void SkDescriptor::operator delete(void* p) { ::operator delete(p); } void* SkDescriptor::operator new(size_t) { @@ -34,9 +37,10 @@ } void SkDescriptor::flatten(SkWriteBuffer& buffer) const { -diff --git a/gfx/skia/skia/src/core/SkGeometry.h b/gfx/skia/skia/src/core/SkGeometry.h ---- a/gfx/skia/skia/src/core/SkGeometry.h -+++ b/gfx/skia/skia/src/core/SkGeometry.h +Index: firefox-115.0/gfx/skia/skia/src/core/SkGeometry.h +=================================================================== +--- firefox-115.0.orig/gfx/skia/skia/src/core/SkGeometry.h ++++ firefox-115.0/gfx/skia/skia/src/core/SkGeometry.h @@ -281,6 +281,7 @@ static inline bool SkCubicIsDegenerate(S return true; } @@ -53,9 +57,10 @@ } /** Returns the cubic classification. -diff --git a/gfx/skia/skia/src/core/SkTextBlob.cpp b/gfx/skia/skia/src/core/SkTextBlob.cpp ---- a/gfx/skia/skia/src/core/SkTextBlob.cpp -+++ b/gfx/skia/skia/src/core/SkTextBlob.cpp +Index: firefox-115.0/gfx/skia/skia/src/core/SkTextBlob.cpp +=================================================================== +--- firefox-115.0.orig/gfx/skia/skia/src/core/SkTextBlob.cpp ++++ firefox-115.0/gfx/skia/skia/src/core/SkTextBlob.cpp @@ -204,6 +204,7 @@ void SkTextBlob::operator delete(void* p void* SkTextBlob::operator new(size_t) { @@ -64,9 +69,10 @@ } void* SkTextBlob::operator new(size_t, void* p) { -diff --git a/gfx/skia/skia/src/core/SkTypeface_remote.h b/gfx/skia/skia/src/core/SkTypeface_remote.h ---- a/gfx/skia/skia/src/core/SkTypeface_remote.h -+++ b/gfx/skia/skia/src/core/SkTypeface_remote.h +Index: firefox-115.0/gfx/skia/skia/src/core/SkTypeface_remote.h +=================================================================== +--- firefox-115.0.orig/gfx/skia/skia/src/core/SkTypeface_remote.h ++++ firefox-115.0/gfx/skia/skia/src/core/SkTypeface_remote.h @@ -95,12 +95,14 @@ public: bool isLogging() const {return fIsLogging;} @@ -150,9 +156,10 @@ } private: -diff --git a/gfx/skia/skia/src/effects/imagefilters/SkBlurImageFilter.cpp b/gfx/skia/skia/src/effects/imagefilters/SkBlurImageFilter.cpp ---- a/gfx/skia/skia/src/effects/imagefilters/SkBlurImageFilter.cpp -+++ b/gfx/skia/skia/src/effects/imagefilters/SkBlurImageFilter.cpp +Index: firefox-115.0/gfx/skia/skia/src/effects/imagefilters/SkBlurImageFilter.cpp +=================================================================== +--- firefox-115.0.orig/gfx/skia/skia/src/effects/imagefilters/SkBlurImageFilter.cpp ++++ firefox-115.0/gfx/skia/skia/src/effects/imagefilters/SkBlurImageFilter.cpp @@ -815,6 +815,7 @@ sk_sp<SkSpecialImage> cpu_blur( return maker; } @@ -161,9 +168,10 @@ }; PassMaker* makerX = makeMaker(sigma.x()); -diff --git a/gfx/skia/skia/src/fonts/SkFontMgr_indirect.cpp b/gfx/skia/skia/src/fonts/SkFontMgr_indirect.cpp ---- a/gfx/skia/skia/src/fonts/SkFontMgr_indirect.cpp -+++ b/gfx/skia/skia/src/fonts/SkFontMgr_indirect.cpp +Index: firefox-115.0/gfx/skia/skia/src/fonts/SkFontMgr_indirect.cpp +=================================================================== +--- firefox-115.0.orig/gfx/skia/skia/src/fonts/SkFontMgr_indirect.cpp ++++ firefox-115.0/gfx/skia/skia/src/fonts/SkFontMgr_indirect.cpp @@ -69,6 +69,7 @@ void SkFontMgr_Indirect::onGetFamilyName SkFontStyleSet* SkFontMgr_Indirect::onCreateStyleSet(int index) const { @@ -172,9 +180,10 @@ } SkFontStyleSet* SkFontMgr_Indirect::onMatchFamily(const char familyName[]) const { -diff --git a/gfx/skia/skia/src/ports/SkFontMgr_FontConfigInterface.cpp b/gfx/skia/skia/src/ports/SkFontMgr_FontConfigInterface.cpp ---- a/gfx/skia/skia/src/ports/SkFontMgr_FontConfigInterface.cpp -+++ b/gfx/skia/skia/src/ports/SkFontMgr_FontConfigInterface.cpp +Index: firefox-115.0/gfx/skia/skia/src/ports/SkFontMgr_FontConfigInterface.cpp +=================================================================== +--- firefox-115.0.orig/gfx/skia/skia/src/ports/SkFontMgr_FontConfigInterface.cpp ++++ firefox-115.0/gfx/skia/skia/src/ports/SkFontMgr_FontConfigInterface.cpp @@ -162,18 +162,22 @@ public: protected: int onCountFamilies() const override { @@ -198,9 +207,10 @@ } SkTypeface* onMatchFamilyStyle(const char requestedFamilyName[], -diff --git a/gfx/skia/skia/src/sksl/SkSLCompiler.cpp b/gfx/skia/skia/src/sksl/SkSLCompiler.cpp ---- a/gfx/skia/skia/src/sksl/SkSLCompiler.cpp -+++ b/gfx/skia/skia/src/sksl/SkSLCompiler.cpp +Index: firefox-115.0/gfx/skia/skia/src/sksl/SkSLCompiler.cpp +=================================================================== +--- firefox-115.0.orig/gfx/skia/skia/src/sksl/SkSLCompiler.cpp ++++ firefox-115.0/gfx/skia/skia/src/sksl/SkSLCompiler.cpp @@ -277,6 +277,7 @@ std::unique_ptr<Expression> Compiler::co } default: @@ -209,9 +219,10 @@ } } -diff --git a/gfx/skia/skia/src/sksl/SkSLOperator.cpp b/gfx/skia/skia/src/sksl/SkSLOperator.cpp ---- a/gfx/skia/skia/src/sksl/SkSLOperator.cpp -+++ b/gfx/skia/skia/src/sksl/SkSLOperator.cpp +Index: firefox-115.0/gfx/skia/skia/src/sksl/SkSLOperator.cpp +=================================================================== +--- firefox-115.0.orig/gfx/skia/skia/src/sksl/SkSLOperator.cpp ++++ firefox-115.0/gfx/skia/skia/src/sksl/SkSLOperator.cpp @@ -51,7 +51,7 @@ OperatorPrecedence Operator::getBinaryPr case Kind::BITWISEXOREQ: // fall through case Kind::BITWISEOREQ: return OperatorPrecedence::kAssignment; @@ -221,9 +232,10 @@ } } -diff --git a/gfx/skia/skia/src/sksl/ir/SkSLType.h b/gfx/skia/skia/src/sksl/ir/SkSLType.h ---- a/gfx/skia/skia/src/sksl/ir/SkSLType.h -+++ b/gfx/skia/skia/src/sksl/ir/SkSLType.h +Index: firefox-115.0/gfx/skia/skia/src/sksl/ir/SkSLType.h +=================================================================== +--- firefox-115.0.orig/gfx/skia/skia/src/sksl/ir/SkSLType.h ++++ firefox-115.0/gfx/skia/skia/src/sksl/ir/SkSLType.h @@ -422,6 +422,7 @@ public: virtual const std::vector<Field>& fields() const { @@ -232,9 +244,10 @@ } /** -diff --git a/gfx/skia/skia/src/utils/SkShadowUtils.cpp b/gfx/skia/skia/src/utils/SkShadowUtils.cpp ---- a/gfx/skia/skia/src/utils/SkShadowUtils.cpp -+++ b/gfx/skia/skia/src/utils/SkShadowUtils.cpp +Index: firefox-115.0/gfx/skia/skia/src/utils/SkShadowUtils.cpp +=================================================================== +--- firefox-115.0.orig/gfx/skia/skia/src/utils/SkShadowUtils.cpp ++++ firefox-115.0/gfx/skia/skia/src/utils/SkShadowUtils.cpp @@ -140,6 +140,7 @@ struct SpotVerticesFactory { return true; } @@ -243,9 +256,10 @@ } sk_sp<SkVertices> makeVertices(const SkPath& path, const SkMatrix& ctm, -diff --git a/intl/icu/source/i18n/number_rounding.cpp b/intl/icu/source/i18n/number_rounding.cpp ---- a/intl/icu/source/i18n/number_rounding.cpp -+++ b/intl/icu/source/i18n/number_rounding.cpp +Index: firefox-115.0/intl/icu/source/i18n/number_rounding.cpp +=================================================================== +--- firefox-115.0.orig/intl/icu/source/i18n/number_rounding.cpp ++++ firefox-115.0/intl/icu/source/i18n/number_rounding.cpp @@ -283,6 +283,7 @@ FractionPrecision Precision::constructFr settings.fMaxFrac = static_cast<digits_t>(maxFrac); settings.fMinSig = -1; @@ -262,10 +276,11 @@ PrecisionUnion union_; union_.fracSig = settings; return {RND_SIGNIFICANT, union_}; -diff --git a/js/src/irregexp/imported/regexp-parser.cc b/js/src/irregexp/imported/regexp-parser.cc ---- a/js/src/irregexp/imported/regexp-parser.cc -+++ b/js/src/irregexp/imported/regexp-parser.cc -@@ -2655,6 +2655,7 @@ bool MayContainStrings(ClassSetOperandTy +Index: firefox-115.0/js/src/irregexp/imported/regexp-parser.cc +=================================================================== +--- firefox-115.0.orig/js/src/irregexp/imported/regexp-parser.cc ++++ firefox-115.0/js/src/irregexp/imported/regexp-parser.cc +@@ -2656,6 +2656,7 @@ bool MayContainStrings(ClassSetOperandTy if (operand->IsClassRanges()) return false; return operand->AsClassSetExpression()->may_contain_strings(); } @@ -273,9 +288,10 @@ } } // namespace -diff --git a/third_party/libwebrtc/api/adaptation/resource.cc b/third_party/libwebrtc/api/adaptation/resource.cc ---- a/third_party/libwebrtc/api/adaptation/resource.cc -+++ b/third_party/libwebrtc/api/adaptation/resource.cc +Index: firefox-115.0/third_party/libwebrtc/api/adaptation/resource.cc +=================================================================== +--- firefox-115.0.orig/third_party/libwebrtc/api/adaptation/resource.cc ++++ firefox-115.0/third_party/libwebrtc/api/adaptation/resource.cc @@ -22,6 +22,7 @@ const char* ResourceUsageStateToString(R return "kUnderuse"; } @@ -284,9 +300,10 @@ } ResourceListener::~ResourceListener() {} -diff --git a/third_party/libwebrtc/api/rtp_parameters.cc b/third_party/libwebrtc/api/rtp_parameters.cc ---- a/third_party/libwebrtc/api/rtp_parameters.cc -+++ b/third_party/libwebrtc/api/rtp_parameters.cc +Index: firefox-115.0/third_party/libwebrtc/api/rtp_parameters.cc +=================================================================== +--- firefox-115.0.orig/third_party/libwebrtc/api/rtp_parameters.cc ++++ firefox-115.0/third_party/libwebrtc/api/rtp_parameters.cc @@ -32,6 +32,7 @@ const char* DegradationPreferenceToStrin return "balanced"; } @@ -295,10 +312,11 @@ } const double kDefaultBitratePriority = 1.0; -diff --git a/third_party/libwebrtc/api/video/video_frame_buffer.cc b/third_party/libwebrtc/api/video/video_frame_buffer.cc ---- a/third_party/libwebrtc/api/video/video_frame_buffer.cc -+++ b/third_party/libwebrtc/api/video/video_frame_buffer.cc -@@ -99,6 +99,8 @@ const char* VideoFrameBufferTypeToString +Index: firefox-115.0/third_party/libwebrtc/api/video/video_frame_buffer.cc +=================================================================== +--- firefox-115.0.orig/third_party/libwebrtc/api/video/video_frame_buffer.cc ++++ firefox-115.0/third_party/libwebrtc/api/video/video_frame_buffer.cc +@@ -106,6 +106,8 @@ const char* VideoFrameBufferTypeToString default: RTC_DCHECK_NOTREACHED(); } @@ -307,9 +325,10 @@ } int I420BufferInterface::ChromaWidth() const { -diff --git a/third_party/libwebrtc/api/video_codecs/video_codec.cc b/third_party/libwebrtc/api/video_codecs/video_codec.cc ---- a/third_party/libwebrtc/api/video_codecs/video_codec.cc -+++ b/third_party/libwebrtc/api/video_codecs/video_codec.cc +Index: firefox-115.0/third_party/libwebrtc/api/video_codecs/video_codec.cc +=================================================================== +--- firefox-115.0.orig/third_party/libwebrtc/api/video_codecs/video_codec.cc ++++ firefox-115.0/third_party/libwebrtc/api/video_codecs/video_codec.cc @@ -118,6 +118,7 @@ const char* CodecTypeToPayloadString(Vid return kPayloadNameGeneric; } @@ -318,9 +337,10 @@ } VideoCodecType PayloadStringToCodecType(const std::string& name) { -diff --git a/third_party/libwebrtc/api/video_codecs/video_encoder_software_fallback_wrapper.cc b/third_party/libwebrtc/api/video_codecs/video_encoder_software_fallback_wrapper.cc ---- a/third_party/libwebrtc/api/video_codecs/video_encoder_software_fallback_wrapper.cc -+++ b/third_party/libwebrtc/api/video_codecs/video_encoder_software_fallback_wrapper.cc +Index: firefox-115.0/third_party/libwebrtc/api/video_codecs/video_encoder_software_fallback_wrapper.cc +=================================================================== +--- firefox-115.0.orig/third_party/libwebrtc/api/video_codecs/video_encoder_software_fallback_wrapper.cc ++++ firefox-115.0/third_party/libwebrtc/api/video_codecs/video_encoder_software_fallback_wrapper.cc @@ -163,6 +163,7 @@ class VideoEncoderSoftwareFallbackWrappe return fallback_encoder_.get(); } @@ -337,9 +357,10 @@ } int32_t VideoEncoderSoftwareFallbackWrapper::EncodeWithMainEncoder( -diff --git a/third_party/libwebrtc/call/adaptation/video_stream_adapter.cc b/third_party/libwebrtc/call/adaptation/video_stream_adapter.cc ---- a/third_party/libwebrtc/call/adaptation/video_stream_adapter.cc -+++ b/third_party/libwebrtc/call/adaptation/video_stream_adapter.cc +Index: firefox-115.0/third_party/libwebrtc/call/adaptation/video_stream_adapter.cc +=================================================================== +--- firefox-115.0.orig/third_party/libwebrtc/call/adaptation/video_stream_adapter.cc ++++ firefox-115.0/third_party/libwebrtc/call/adaptation/video_stream_adapter.cc @@ -168,6 +168,7 @@ const char* Adaptation::StatusToString(A return "kRejectedByConstraint"; } @@ -348,7 +369,7 @@ } Adaptation::Adaptation(int validation_id, -@@ -390,6 +391,7 @@ VideoStreamAdapter::RestrictionsOrState +@@ -390,6 +391,7 @@ VideoStreamAdapter::RestrictionsOrState return Adaptation::Status::kAdaptationDisabled; } RTC_CHECK_NOTREACHED(); @@ -373,9 +394,10 @@ } VideoStreamAdapter::RestrictionsOrState -diff --git a/third_party/libwebrtc/call/rtp_payload_params.cc b/third_party/libwebrtc/call/rtp_payload_params.cc ---- a/third_party/libwebrtc/call/rtp_payload_params.cc -+++ b/third_party/libwebrtc/call/rtp_payload_params.cc +Index: firefox-115.0/third_party/libwebrtc/call/rtp_payload_params.cc +=================================================================== +--- firefox-115.0.orig/third_party/libwebrtc/call/rtp_payload_params.cc ++++ firefox-115.0/third_party/libwebrtc/call/rtp_payload_params.cc @@ -407,7 +407,7 @@ absl::optional<FrameDependencyStructure> case VideoCodecType::kVideoCodecMultiplex: return absl::nullopt; @@ -385,9 +407,10 @@ } void RtpPayloadParams::GenericToGeneric(int64_t shared_frame_id, -diff --git a/third_party/libwebrtc/call/video_send_stream.cc b/third_party/libwebrtc/call/video_send_stream.cc ---- a/third_party/libwebrtc/call/video_send_stream.cc -+++ b/third_party/libwebrtc/call/video_send_stream.cc +Index: firefox-115.0/third_party/libwebrtc/call/video_send_stream.cc +=================================================================== +--- firefox-115.0.orig/third_party/libwebrtc/call/video_send_stream.cc ++++ firefox-115.0/third_party/libwebrtc/call/video_send_stream.cc @@ -30,6 +30,7 @@ const char* StreamTypeToString(VideoSend return "flexfec"; } @@ -396,9 +419,10 @@ } } // namespace -diff --git a/third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor.cc b/third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor.cc ---- a/third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor.cc -+++ b/third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor.cc +Index: firefox-115.0/third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor.cc +=================================================================== +--- firefox-115.0.orig/third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor.cc ++++ firefox-115.0/third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor.cc @@ -378,7 +378,7 @@ std::unique_ptr<ClippingPredictor> Creat config.reference_window_delay, config.clipping_threshold, /*adaptive_step_estimation=*/false); @@ -408,9 +432,10 @@ } } // namespace webrtc -diff --git a/third_party/libwebrtc/modules/audio_processing/agc2/input_volume_stats_reporter.cc b/third_party/libwebrtc/modules/audio_processing/agc2/input_volume_stats_reporter.cc ---- a/third_party/libwebrtc/modules/audio_processing/agc2/input_volume_stats_reporter.cc -+++ b/third_party/libwebrtc/modules/audio_processing/agc2/input_volume_stats_reporter.cc +Index: firefox-115.0/third_party/libwebrtc/modules/audio_processing/agc2/input_volume_stats_reporter.cc +=================================================================== +--- firefox-115.0.orig/third_party/libwebrtc/modules/audio_processing/agc2/input_volume_stats_reporter.cc ++++ firefox-115.0/third_party/libwebrtc/modules/audio_processing/agc2/input_volume_stats_reporter.cc @@ -48,6 +48,7 @@ constexpr absl::string_view MetricNamePr case InputVolumeType::kRecommended: return "WebRTC.Audio.Apm.RecommendedInputVolume."; @@ -419,9 +444,10 @@ } metrics::Histogram* CreateVolumeHistogram(InputVolumeType input_volume_type) { -diff --git a/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_fc.cc b/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_fc.cc ---- a/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_fc.cc -+++ b/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_fc.cc +Index: firefox-115.0/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_fc.cc +=================================================================== +--- firefox-115.0.orig/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_fc.cc ++++ firefox-115.0/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_fc.cc @@ -59,6 +59,8 @@ rtc::FunctionView<float(float)> GetActiv case ActivationFunction::kSigmoidApproximated: return ::rnnoise::SigmoidApproximated; @@ -431,9 +457,10 @@ } } // namespace -diff --git a/third_party/libwebrtc/modules/audio_processing/audio_processing_impl.cc b/third_party/libwebrtc/modules/audio_processing/audio_processing_impl.cc ---- a/third_party/libwebrtc/modules/audio_processing/audio_processing_impl.cc -+++ b/third_party/libwebrtc/modules/audio_processing/audio_processing_impl.cc +Index: firefox-115.0/third_party/libwebrtc/modules/audio_processing/audio_processing_impl.cc +=================================================================== +--- firefox-115.0.orig/third_party/libwebrtc/modules/audio_processing/audio_processing_impl.cc ++++ firefox-115.0/third_party/libwebrtc/modules/audio_processing/audio_processing_impl.cc @@ -99,6 +99,7 @@ GainControl::Mode Agc1ConfigModeToInterf return GainControl::kFixedDigital; } @@ -451,7 +478,7 @@ } // Returns an AudioProcessing::Error together with the best possible option for -@@ -2414,6 +2415,7 @@ void AudioProcessingImpl::InitializeNois +@@ -2421,6 +2422,7 @@ void AudioProcessingImpl::InitializeNois return NsConfig::SuppressionLevel::k21dB; } RTC_CHECK_NOTREACHED(); @@ -459,9 +486,10 @@ }; NsConfig cfg; -diff --git a/third_party/libwebrtc/modules/audio_processing/include/audio_processing.cc b/third_party/libwebrtc/modules/audio_processing/include/audio_processing.cc ---- a/third_party/libwebrtc/modules/audio_processing/include/audio_processing.cc -+++ b/third_party/libwebrtc/modules/audio_processing/include/audio_processing.cc +Index: firefox-115.0/third_party/libwebrtc/modules/audio_processing/include/audio_processing.cc +=================================================================== +--- firefox-115.0.orig/third_party/libwebrtc/modules/audio_processing/include/audio_processing.cc ++++ firefox-115.0/third_party/libwebrtc/modules/audio_processing/include/audio_processing.cc @@ -32,6 +32,7 @@ std::string NoiseSuppressionLevelToStrin return "VeryHigh"; } @@ -478,9 +506,10 @@ } } // namespace -diff --git a/third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl.cc b/third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl.cc ---- a/third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl.cc -+++ b/third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl.cc +Index: firefox-115.0/third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl.cc +=================================================================== +--- firefox-115.0.orig/third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl.cc ++++ firefox-115.0/third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl.cc @@ -53,6 +53,7 @@ std::string GetVadModeLabel(TransientSup case TransientSuppressor::VadMode::kNoVad: return "no VAD"; @@ -489,9 +518,10 @@ } } // namespace -diff --git a/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc b/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc ---- a/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc -+++ b/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc +Index: firefox-115.0/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc +=================================================================== +--- firefox-115.0.orig/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc ++++ firefox-115.0/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc @@ -44,6 +44,7 @@ ScreenCastPortal::CaptureSourceType Scre case CaptureType::kAnyScreenContent: return ScreenCastPortal::CaptureSourceType::kAnyScreenContent; @@ -500,9 +530,10 @@ } ScreenCastPortal::ScreenCastPortal(CaptureType type, PortalNotifier* notifier) -diff --git a/third_party/libwebrtc/modules/rtp_rtcp/source/create_video_rtp_depacketizer.cc b/third_party/libwebrtc/modules/rtp_rtcp/source/create_video_rtp_depacketizer.cc ---- a/third_party/libwebrtc/modules/rtp_rtcp/source/create_video_rtp_depacketizer.cc -+++ b/third_party/libwebrtc/modules/rtp_rtcp/source/create_video_rtp_depacketizer.cc +Index: firefox-115.0/third_party/libwebrtc/modules/rtp_rtcp/source/create_video_rtp_depacketizer.cc +=================================================================== +--- firefox-115.0.orig/third_party/libwebrtc/modules/rtp_rtcp/source/create_video_rtp_depacketizer.cc ++++ firefox-115.0/third_party/libwebrtc/modules/rtp_rtcp/source/create_video_rtp_depacketizer.cc @@ -38,6 +38,7 @@ std::unique_ptr<VideoRtpDepacketizer> Cr return std::make_unique<VideoRtpDepacketizerGeneric>(); } @@ -511,9 +542,10 @@ } } // namespace webrtc -diff --git a/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender.cc b/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender.cc ---- a/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender.cc -+++ b/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender.cc +Index: firefox-115.0/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender.cc +=================================================================== +--- firefox-115.0.orig/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender.cc ++++ firefox-115.0/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender.cc @@ -142,6 +142,7 @@ bool IsNonVolatile(RTPExtensionType type #endif } @@ -522,9 +554,10 @@ } bool HasBweExtension(const RtpHeaderExtensionMap& extensions_map) { -diff --git a/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender_audio.cc b/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender_audio.cc ---- a/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender_audio.cc -+++ b/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender_audio.cc +Index: firefox-115.0/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender_audio.cc +=================================================================== +--- firefox-115.0.orig/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender_audio.cc ++++ firefox-115.0/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender_audio.cc @@ -45,6 +45,7 @@ namespace { return "audio_cn"; } @@ -533,10 +566,11 @@ } constexpr char kIncludeCaptureClockOffset[] = -diff --git a/third_party/libwebrtc/modules/video_coding/codecs/vp8/default_temporal_layers.cc b/third_party/libwebrtc/modules/video_coding/codecs/vp8/default_temporal_layers.cc ---- a/third_party/libwebrtc/modules/video_coding/codecs/vp8/default_temporal_layers.cc -+++ b/third_party/libwebrtc/modules/video_coding/codecs/vp8/default_temporal_layers.cc -@@ -110,6 +110,7 @@ size_t BufferToIndex(Vp8BufferReference +Index: firefox-115.0/third_party/libwebrtc/modules/video_coding/codecs/vp8/default_temporal_layers.cc +=================================================================== +--- firefox-115.0.orig/third_party/libwebrtc/modules/video_coding/codecs/vp8/default_temporal_layers.cc ++++ firefox-115.0/third_party/libwebrtc/modules/video_coding/codecs/vp8/default_temporal_layers.cc +@@ -110,6 +110,7 @@ size_t BufferToIndex(Vp8BufferReference case Vp8FrameConfig::Vp8BufferReference::kNone: RTC_CHECK_NOTREACHED(); } @@ -544,9 +578,10 @@ } } // namespace -diff --git a/third_party/libwebrtc/modules/video_coding/codecs/vp8/temporal_layers_checker.cc b/third_party/libwebrtc/modules/video_coding/codecs/vp8/temporal_layers_checker.cc ---- a/third_party/libwebrtc/modules/video_coding/codecs/vp8/temporal_layers_checker.cc -+++ b/third_party/libwebrtc/modules/video_coding/codecs/vp8/temporal_layers_checker.cc +Index: firefox-115.0/third_party/libwebrtc/modules/video_coding/codecs/vp8/temporal_layers_checker.cc +=================================================================== +--- firefox-115.0.orig/third_party/libwebrtc/modules/video_coding/codecs/vp8/temporal_layers_checker.cc ++++ firefox-115.0/third_party/libwebrtc/modules/video_coding/codecs/vp8/temporal_layers_checker.cc @@ -30,6 +30,7 @@ TemporalLayersChecker::CreateTemporalLay return std::make_unique<TemporalLayersChecker>(num_temporal_layers); } @@ -555,9 +590,10 @@ } TemporalLayersChecker::TemporalLayersChecker(int num_temporal_layers) -diff --git a/third_party/libwebrtc/video/adaptation/video_stream_encoder_resource_manager.cc b/third_party/libwebrtc/video/adaptation/video_stream_encoder_resource_manager.cc ---- a/third_party/libwebrtc/video/adaptation/video_stream_encoder_resource_manager.cc -+++ b/third_party/libwebrtc/video/adaptation/video_stream_encoder_resource_manager.cc +Index: firefox-115.0/third_party/libwebrtc/video/adaptation/video_stream_encoder_resource_manager.cc +=================================================================== +--- firefox-115.0.orig/third_party/libwebrtc/video/adaptation/video_stream_encoder_resource_manager.cc ++++ firefox-115.0/third_party/libwebrtc/video/adaptation/video_stream_encoder_resource_manager.cc @@ -63,6 +63,7 @@ std::string ToString(VideoAdaptationReas return "cpu"; } ++++++ mozilla.keyring ++++++ --- /var/tmp/diff_new_pack.GCwA6D/_old 2023-07-06 18:28:24.743049788 +0200 +++ /var/tmp/diff_new_pack.GCwA6D/_new 2023-07-06 18:28:24.747049813 +0200 @@ -12,8 +12,8 @@ uid [ full ] Mozilla Software Releases <rele...@mozilla.com> sub rsa4096 2015-07-17 [S] [expired: 2017-07-16] sub rsa4096 2017-06-22 [S] [expired: 2019-06-22] -sub rsa4096 2019-05-30 [S] [expired: 2021-05-29] -sub rsa4096 2021-05-17 [S] [expired: 2023-05-17] +sub rsa4096 2019-05-30 [S] [expires: 2021-05-29] +sub rsa4096 2021-05-17 [S] [expires: 2023-05-17] sub rsa4096 2023-05-05 [S] [expires: 2025-05-04] -----BEGIN PGP PUBLIC KEY BLOCK----- ++++++ mozilla.sh.in ++++++ --- /var/tmp/diff_new_pack.GCwA6D/_old 2023-07-06 18:28:24.759049886 +0200 +++ /var/tmp/diff_new_pack.GCwA6D/_new 2023-07-06 18:28:24.763049911 +0200 @@ -100,7 +100,7 @@ fi # xinput2 (boo#1173320) -. /etc/os-release +source /etc/os-release if [ "$ID" = "opensuse-tumbleweed" ]; then export MOZ_USE_XINPUT2=1 fi @@ -151,7 +151,7 @@ # Try with a local variant first, then without a local variant SHORTMOZLOCALE=`echo $CURRENT_LOCALE | sed "s|_\([^.]*\).*||g" | sed "s|\..*||g"` MOZLOCALE=`echo $CURRENT_LOCALE | sed "s|_\([^.]*\).*|-\1|g" | sed "s|\..*||g"` - create_langpack_link() { + function create_langpack_link() { local language=$* local langpack=langpack-${language}@firefox.mozilla.org.xpi if [ -f $MOZ_LANGPACKS_DIR/$langpack ]; then ++++++ one_swizzle_to_rule_them_all.patch ++++++ --- /var/tmp/diff_new_pack.GCwA6D/_old 2023-07-06 18:28:24.775049984 +0200 +++ /var/tmp/diff_new_pack.GCwA6D/_new 2023-07-06 18:28:24.779050009 +0200 @@ -6,10 +6,10 @@ # Parent 81832d035e101471dcf52dd91de287268add7a91 imported patch one_swizzle_to_rule_them_all.patch -Index: firefox-102.0/gfx/webrender_bindings/RenderCompositorSWGL.cpp +Index: firefox-115.0/gfx/webrender_bindings/RenderCompositorSWGL.cpp =================================================================== ---- firefox-102.0.orig/gfx/webrender_bindings/RenderCompositorSWGL.cpp -+++ firefox-102.0/gfx/webrender_bindings/RenderCompositorSWGL.cpp +--- firefox-115.0.orig/gfx/webrender_bindings/RenderCompositorSWGL.cpp ++++ firefox-115.0/gfx/webrender_bindings/RenderCompositorSWGL.cpp @@ -7,6 +7,7 @@ #include "RenderCompositorSWGL.h" @@ -18,7 +18,7 @@ #include "mozilla/widget/CompositorWidget.h" #ifdef MOZ_WIDGET_GTK -@@ -235,6 +237,13 @@ void RenderCompositorSWGL::CommitMappedB +@@ -242,6 +243,13 @@ void RenderCompositorSWGL::CommitMappedB } mDT->Flush(); ++++++ tar_stamps ++++++ --- /var/tmp/diff_new_pack.GCwA6D/_old 2023-07-06 18:28:24.811050206 +0200 +++ /var/tmp/diff_new_pack.GCwA6D/_new 2023-07-06 18:28:24.811050206 +0200 @@ -1,11 +1,11 @@ PRODUCT="firefox" CHANNEL="release" -VERSION="114.0.2" +VERSION="115.0" VERSION_SUFFIX="" -PREV_VERSION="114.0.1" +PREV_VERSION="114.0.2" PREV_VERSION_SUFFIX="" #SKIP_LOCALES="" # Uncomment to skip l10n and compare-locales-generation RELEASE_REPO="https://hg.mozilla.org/releases/mozilla-release" -RELEASE_TAG="1378542b9001e9aeb6a5ac6f5a020886dcfdaa29" -RELEASE_TIMESTAMP="20230619081400" +RELEASE_TAG="1c2603279ac3bf5c442bf416ee7bf6d7d2c20d31" +RELEASE_TIMESTAMP="20230629134642"