pool/MozillaFirefox
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Mozilla Firefox 115.0

Browse Source 
* 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

OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=1071
This commit is contained in:
Wolfgang Rosenauer 2023-07-05 21:06:07 +00:00 committed by Git OBS Bridge
parent bd8061e25d
commit 2bccc014af
28 changed files with 1186 additions and 1645 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
MozillaFirefox.changes
View File

@ -1,3 +1,116 @@
-------------------------------------------------------------------
Sun Jul 2 16:00:53 UTC 2023 - Wolfgang Rosenauer <wr@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
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jun 20 19:49:51 UTC 2023 - Andreas Stieger <Andreas.Stieger@gmx.de> Tue Jun 20 19:49:51 UTC 2023 - Andreas Stieger <Andreas.Stieger@gmx.de>

25
MozillaFirefox.spec
View File

@ -28,9 +28,9 @@
# orig_suffix b3 # orig_suffix b3
# major 69 # major 69
# mainver %%major.99 # mainver %%major.99
%define major 114 %define major 115
%define mainver %major.0.2 %define mainver %major.0
%define orig_version 114.0.2 %define orig_version 115.0
%define orig_suffix %{nil} %define orig_suffix %{nil}
%define update_channel release %define update_channel release
%define branding 1 %define branding 1
@ -98,7 +98,8 @@ BuildRequires: dejavu-fonts
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: memory-constraints BuildRequires: memory-constraints
%if 0%{?suse_version} < 1550 && 0%{?sle_version} <= 150500 %if 0%{?suse_version} < 1550 && 0%{?sle_version} <= 150500
BuildRequires: gcc11-c++ BuildRequires: gcc12
BuildRequires: gcc12-c++
%else %else
BuildRequires: gcc-c++ BuildRequires: gcc-c++
%endif %endif
@ -113,9 +114,9 @@ BuildRequires: libiw-devel
BuildRequires: libproxy-devel BuildRequires: libproxy-devel
BuildRequires: makeinfo BuildRequires: makeinfo
BuildRequires: mozilla-nspr-devel >= 4.35 BuildRequires: mozilla-nspr-devel >= 4.35
BuildRequires: mozilla-nss-devel >= 3.89.1 BuildRequires: mozilla-nss-devel >= 3.90
BuildRequires: nasm >= 2.14 BuildRequires: nasm >= 2.14
BuildRequires: nodejs >= 10.22.1 BuildRequires: nodejs >= 12.22.12
%if 0%{?sle_version} >= 120000 && 0%{?sle_version} < 150000 %if 0%{?sle_version} >= 120000 && 0%{?sle_version} < 150000
BuildRequires: libXtst-devel BuildRequires: libXtst-devel
BuildRequires: python-libxml2 BuildRequires: python-libxml2
@ -226,7 +227,9 @@ Patch18: mozilla-silence-no-return-type.patch
Patch19: mozilla-bmo531915.patch Patch19: mozilla-bmo531915.patch
Patch20: one_swizzle_to_rule_them_all.patch Patch20: one_swizzle_to_rule_them_all.patch
Patch21: svg-rendering.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 # Firefox/browser
Patch101: firefox-kde.patch Patch101: firefox-kde.patch
Patch102: firefox-branded-icons.patch Patch102: firefox-branded-icons.patch
@ -347,12 +350,12 @@ sed -i "s|potential_python_binary = f\"python3.{i}\"|potential_python_binary = f
export PYTHON3=/usr/bin/python3.9 export PYTHON3=/usr/bin/python3.9
%endif %endif
#
kdehelperversion=$(cat toolkit/xre/nsKDEUtils.cpp | grep '#define KMOZILLAHELPER_VERSION' | cut -d ' ' -f 3) kdehelperversion=$(cat toolkit/xre/nsKDEUtils.cpp | grep '#define KMOZILLAHELPER_VERSION' | cut -d ' ' -f 3)
if test "$kdehelperversion" != %{kde_helper_version}; then if test "$kdehelperversion" != %{kde_helper_version}; then
echo fix kde helper version in the .spec file echo fix kde helper version in the .spec file
exit 1 exit 1
fi fi
# When doing only_print_mozconfig, this file isn't necessarily available, so skip it # When doing only_print_mozconfig, this file isn't necessarily available, so skip it
cp %{SOURCE4} .obsenv.sh cp %{SOURCE4} .obsenv.sh
%else %else
@ -373,8 +376,8 @@ export MOZ_TELEMETRY_REPORTING=1
export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system
export CFLAGS="%{optflags}" export CFLAGS="%{optflags}"
%if 0%{?suse_version} < 1550 && 0%{?sle_version} <= 150500 %if 0%{?suse_version} < 1550 && 0%{?sle_version} <= 150500
export CC=gcc-11 export CC=gcc-12
export CXX=g++-11 export CXX=g++-12
%else %else
%if 0%{?clang_build} == 0 %if 0%{?clang_build} == 0
export CC=gcc export CC=gcc
@ -393,7 +396,7 @@ export GC_SECTIONS_BREAKS_DEBUG_RANGES=yes
export LDFLAGS="\$LDFLAGS -fPIC -Wl,-z,relro,-z,now" export LDFLAGS="\$LDFLAGS -fPIC -Wl,-z,relro,-z,now"
%ifarch ppc64 ppc64le %ifarch ppc64 ppc64le
%if 0%{?clang_build} == 0 %if 0%{?clang_build} == 0
export CFLAGS="\$CFLAGS -mminimal-toc" #export CFLAGS="\$CFLAGS -mminimal-toc"
%endif %endif
%endif %endif
%ifarch %ix86 %ifarch %ix86

3
firefox-114.0.2.source.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:aa602032f0b7065b743ba7fabf96714398aba538bcc017a4b0fff556dc69f8fe
size 505974216

16
firefox-114.0.2.source.tar.xz.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEErdcHlHlwDcrf3VM34207E/PZMnQFAmSQN54ACgkQ4207E/PZ
MnTMGBAAlwust6D3sNlWTUsKLQYMn7QwkjdRl+dRzK12TRDDZbFm0kZw/Elp74i2
4qT6FUuGc1fwEJ4kOOg+5aDm+r95NmNZw2XrVDwb8uyDEZvyUxC10fbgIfFTu0JK
bhE2AZnB8TJBKTP0QxYRuvPOe6nizk72G3McdF3e7Dywky1bP0pVlflPuKsVi/wI
6MYBTmgnYoDBIGqMTF41afEqfeNchH02h7nM/IQj155TDjMH0I5pxENjM8lFQE3M
cO7tZr5OhzxWcc0seHG4hDOWxVUofyjzfVIDLOmVgrfIt5PJ0EaQGdcKRKXqi1vL
IZW6uBr3rteyEP7X0BTMf8G90/iwtxO1a52E0w25P/pxXQNjWtp7aTe4M9RZDdsQ
j6eLDDyGw7uJDoW7vqqy5Mw49Ac5u7UB33ObkfVB7LY+1qW4z9qG6I5ABaOledkV
MSsMoaEHqAwI5zkVv+BwMVcbHIi22XIZpL2e956loBvV1IRPv6T0aHPlKN+i02Qa
D6shduU3jpU+Lwtlk4Qn+HOYKd9rlvk/gfMFFrR/bgpOqbezMU4RVqhZCC1m70RG
AdqGRKTae9quB6JAGQUQE4jJtyktuHnG5u4mPwW6s9GlvkLDVedILfG0fdXebqAX
eoGKm6n8SwyyJrvqmmZGWc6+7u9LUWfgBiReI1fpB6QHeVL5ygg=
=WW8r
-----END PGP SIGNATURE-----

3
firefox-115.0.source.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7cdb23fe5ccb54334c8fe14c1e5dd89d5788f8e7b79a2bd9cc4eabdc7e54e898
size 505151516

16
firefox-115.0.source.tar.xz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEErdcHlHlwDcrf3VM34207E/PZMnQFAmSdwi8ACgkQ4207E/PZ
MnR2gQ//fQE+SAST2KBdo/k8qvUHdfvA5LRi3oLSOUTyxgZb4epM8MllIrTjaSeK
KQzaf4duPCa5Hp4tlI/37Pn2fais9e0baBN5MXtIv5UzivRKO9BUj4hzhX4wSkb9
C2HvFQTUhJG3xRrizdgHm1Y2Cqj4UWra7Z1kxslNR8gbWTFBtuiHYx/m1tgqNrqq
pLRFxgjbRx6qD64UGl1p9405WSRb1TzTNcFFSRkUUF7/2T6btxpiTpi00L4jZWNQ
WuheyqNkQDb/Hj7Cqx4oIrmdhSaL5THbBFI3Dt/17MyanoNf0xDGck4R7gW1De+f
TyD9GY06w9kkGPNLHiKhXp7G0gMvBJPXzyP06GU2WSDvAE1d1sdF9iIDSWFz3GlZ
nkZ7Z/aMBF3PxT5OuEwCsM7ZthiuGtGlYQ7FkYphz0jkJZF1jFGxjAud5F+O+eii
3qNrV+k9USA+YHrX9Sj8ECrj3TWgSlCK7A2b1m5M6JSczon/NQ8hygoEGLXcDAq1
tBoHFvK9ZHkbZU9O0cMBwAPZHonqx71UBBn6FaGhh4bWkAPK2VBHCEQJtDR289Nx
r0vc32LfiLgFRUTi063HpggNR1mCALQN175gTUkozr1+fnhuizHoEy6oCPT11CeJ
MUnmXM+KBAWGgaqAzdKECB9weFozMB6/WkCcYuiR5MRl0EhnYCo=
=7h8/
-----END PGP SIGNATURE-----

34
firefox-branded-icons.patch
View File

@ -2,15 +2,11 @@
# Parent e0751ad74e835e80041a61ea00c2a63bf6fbe2de # Parent e0751ad74e835e80041a61ea00c2a63bf6fbe2de
# Parent fe7e6fdd75484993420740244f21b5b41d6e0fa1 # Parent fe7e6fdd75484993420740244f21b5b41d6e0fa1
diff --git a/browser/branding/branding-common.mozbuild b/browser/branding/branding-common.mozbuild Index: firefox-115.0/browser/branding/branding-common.mozbuild
--- a/browser/branding/branding-common.mozbuild ===================================================================
+++ b/browser/branding/branding-common.mozbuild --- firefox-115.0.orig/browser/branding/branding-common.mozbuild
@@ -25,12 +25,15 @@ def FirefoxBranding(): +++ firefox-115.0/browser/branding/branding-common.mozbuild
'PrivateBrowsing_70.png', @@ -30,6 +30,9 @@ def FirefoxBranding():
'VisualElements_150.png',
'VisualElements_70.png',
]
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
FINAL_TARGET_FILES.chrome.icons.default += [ FINAL_TARGET_FILES.chrome.icons.default += [
'default128.png', 'default128.png',
'default16.png', 'default16.png',
@ -20,16 +16,11 @@ diff --git a/browser/branding/branding-common.mozbuild b/browser/branding/brandi
'default32.png', 'default32.png',
'default48.png', 'default48.png',
'default64.png', 'default64.png',
] Index: firefox-115.0/browser/installer/package-manifest.in
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in ===================================================================
--- a/browser/installer/package-manifest.in --- firefox-115.0.orig/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in +++ firefox-115.0/browser/installer/package-manifest.in
@@ -221,20 +221,23 @@ @@ -227,10 +227,13 @@
@RESPATH@/browser/chrome/browser@JAREXT@
@RESPATH@/browser/chrome/browser.manifest
@RESPATH@/chrome/pdfjs.manifest
@RESPATH@/chrome/pdfjs/*
@RESPATH@/chrome/toolkit@JAREXT@
@RESPATH@/chrome/toolkit.manifest @RESPATH@/chrome/toolkit.manifest
#ifdef MOZ_GTK #ifdef MOZ_GTK
@RESPATH@/browser/chrome/icons/default/default16.png @RESPATH@/browser/chrome/icons/default/default16.png
@ -43,8 +34,3 @@ diff --git a/browser/installer/package-manifest.in b/browser/installer/package-m
#endif #endif
@RESPATH@/browser/features/* @RESPATH@/browser/features/*
; [DevTools Startup Files]
@RESPATH@/browser/chrome/devtools-startup@JAREXT@
@RESPATH@/browser/chrome/devtools-startup.manifest
; DevTools

74
firefox-kde.patch
View File

@ -11,15 +11,11 @@ How to apply this patch:
4. Replace #ifndef with #ifdef in the line above (this hanges the button order from Gnome-style to KDE-style) 4. Replace #ifndef with #ifdef in the line above (this hanges the button order from Gnome-style to KDE-style)
5. hg qrefresh 5. hg qrefresh
diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js Index: firefox-115.0/browser/components/preferences/main.js
--- a/browser/components/preferences/main.js ===================================================================
+++ b/browser/components/preferences/main.js --- firefox-115.0.orig/browser/components/preferences/main.js
@@ -296,16 +296,23 @@ var gMainPane = { +++ firefox-115.0/browser/components/preferences/main.js
}, backoffTimes[this._backoffIndex + 1 < backoffTimes.length ? this._backoffIndex++ : backoffTimes.length - 1]); @@ -293,6 +293,13 @@ var gMainPane = {
};
window.setTimeout(() => {
window.requestIdleCallback(pollForDefaultBrowser);
}, backoffTimes[this._backoffIndex]); }, backoffTimes[this._backoffIndex]);
} }
@ -33,17 +29,7 @@ diff --git a/browser/components/preferences/main.js b/browser/components/prefere
this.initBrowserContainers(); this.initBrowserContainers();
this.buildContentProcessCountMenuList(); this.buildContentProcessCountMenuList();
this.updateDefaultPerformanceSettingsPref(); @@ -1762,6 +1769,17 @@ var gMainPane = {
let defaultPerformancePref = Preferences.get(
"browser.preferences.defaultPerformanceSettings.enabled"
);
@@ -1298,16 +1305,27 @@ var gMainPane = {
this._backoffIndex = 0;
let shellSvc = getShellService();
if (!shellSvc) {
return;
} }
try { try {
shellSvc.setDefaultBrowser(true, false); shellSvc.setDefaultBrowser(true, false);
@ -61,20 +47,11 @@ diff --git a/browser/components/preferences/main.js b/browser/components/prefere
} catch (ex) { } catch (ex) {
console.error(ex); console.error(ex);
return; return;
} Index: firefox-115.0/browser/components/shell/moz.build
===================================================================
let isDefault = shellSvc.isDefaultBrowser(false, true); --- firefox-115.0.orig/browser/components/shell/moz.build
let setDefaultPane = document.getElementById("setDefaultPane"); +++ firefox-115.0/browser/components/shell/moz.build
setDefaultPane.classList.toggle("is-default", isDefault); @@ -36,6 +36,8 @@ elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "gt
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",
]
SOURCES += [ SOURCES += [
"nsGNOMEShellService.cpp", "nsGNOMEShellService.cpp",
@ -83,15 +60,10 @@ diff --git a/browser/components/shell/moz.build b/browser/components/shell/moz.b
] ]
if CONFIG["MOZ_ENABLE_DBUS"]: if CONFIG["MOZ_ENABLE_DBUS"]:
SOURCES += [ SOURCES += [
"nsGNOMEShellDBusHelper.cpp", Index: firefox-115.0/browser/components/shell/nsKDEShellService.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
--- /dev/null --- /dev/null
+++ b/browser/components/shell/nsKDEShellService.cpp +++ firefox-115.0/browser/components/shell/nsKDEShellService.cpp
@@ -0,0 +1,109 @@ @@ -0,0 +1,109 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* -*- 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 +/* This Source Code Form is subject to the terms of the Mozilla Public
@ -202,10 +174,10 @@ new file mode 100644
+ return NS_ERROR_NOT_IMPLEMENTED; + return NS_ERROR_NOT_IMPLEMENTED;
+} +}
+ +
diff --git a/browser/components/shell/nsKDEShellService.h b/browser/components/shell/nsKDEShellService.h Index: firefox-115.0/browser/components/shell/nsKDEShellService.h
new file mode 100644 ===================================================================
--- /dev/null --- /dev/null
+++ b/browser/components/shell/nsKDEShellService.h +++ firefox-115.0/browser/components/shell/nsKDEShellService.h
@@ -0,0 +1,32 @@ @@ -0,0 +1,32 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* -*- 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 +/* This Source Code Form is subject to the terms of the Mozilla Public
@ -239,10 +211,10 @@ new file mode 100644
+}; +};
+ +
+#endif // nskdeshellservice_h____ +#endif // nskdeshellservice_h____
diff --git a/browser/components/shell/nsUnixShellService.cpp b/browser/components/shell/nsUnixShellService.cpp Index: firefox-115.0/browser/components/shell/nsUnixShellService.cpp
new file mode 100644 ===================================================================
--- /dev/null --- /dev/null
+++ b/browser/components/shell/nsUnixShellService.cpp +++ firefox-115.0/browser/components/shell/nsUnixShellService.cpp
@@ -0,0 +1,22 @@ @@ -0,0 +1,22 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* -*- 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 +/* This Source Code Form is subject to the terms of the Mozilla Public
@ -266,10 +238,10 @@ new file mode 100644
+ return nsKDEShellServiceConstructor( aIID, aResult ); + return nsKDEShellServiceConstructor( aIID, aResult );
+ return nsGNOMEShellServiceConstructor( aIID, aResult ); + return nsGNOMEShellServiceConstructor( aIID, aResult );
+} +}
diff --git a/browser/components/shell/nsUnixShellService.h b/browser/components/shell/nsUnixShellService.h Index: firefox-115.0/browser/components/shell/nsUnixShellService.h
new file mode 100644 ===================================================================
--- /dev/null --- /dev/null
+++ b/browser/components/shell/nsUnixShellService.h +++ firefox-115.0/browser/components/shell/nsUnixShellService.h
@@ -0,0 +1,15 @@ @@ -0,0 +1,15 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* -*- 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 +/* This Source Code Form is subject to the terms of the Mozilla Public

3
l10n-114.0.2.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c91243c41b340ae5f18265a7b38ed6e5a83f8e89581a14d586a7c8b29a4729c2
size 31072368

3
l10n-115.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9ce34098d2c6fa150ca2504e00b6d4229a7dbea22d57be54815f7050fcd2b93b
size 31190600

14
mozilla-aarch64-startup-crash.patch
View File

@ -3,19 +3,14 @@
# Date 1558442998 -7200 # Date 1558442998 -7200
# Tue May 21 14:49:58 2019 +0200 # Tue May 21 14:49:58 2019 +0200
# Node ID 386083b58d8558141901d796ec6919a4aba7ad3a # Node ID 386083b58d8558141901d796ec6919a4aba7ad3a
# Parent a30a9b9aae5740f096a16118ed9e4bc45d3d1c35 # Parent 76b747f7d113bddbb8593184d81e1bfe5fd51af0
bsc#991344 - Rpi3: Firefox crashes after a few seconds of usage 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() 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 diff --git a/netwerk/base/nsIOService.cpp b/netwerk/base/nsIOService.cpp
--- a/netwerk/base/nsIOService.cpp --- a/netwerk/base/nsIOService.cpp
+++ b/netwerk/base/nsIOService.cpp +++ b/netwerk/base/nsIOService.cpp
@@ -1032,17 +1032,23 @@ nsresult nsIOService::NewChannelFromURIW @@ -1159,7 +1159,13 @@ 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;
} }
} }
@ -29,8 +24,3 @@ diff --git a/netwerk/base/nsIOService.cpp b/netwerk/base/nsIOService.cpp
return NS_OK; return NS_OK;
} }
NS_IMETHODIMP
nsIOService::NewChannelFromURIWithProxyFlags(
nsIURI* aURI, nsIURI* aProxyURI, uint32_t aProxyFlags,
nsINode* aLoadingNode, nsIPrincipal* aLoadingPrincipal,
nsIPrincipal* aTriggeringPrincipal, uint32_t aSecurityFlags,

31
mozilla-bmo1512162.patch
View File

@ -3,15 +3,11 @@
This fixes a broken build for gcc < 9 on ppc64le. This fixes a broken build for gcc < 9 on ppc64le.
This patch can be removed for newer gcc-versions. This patch can be removed for newer gcc-versions.
diff --git a/js/xpconnect/src/XPCWrappedNative.cpp b/js/xpconnect/src/XPCWrappedNative.cpp Index: firefox-115.0/js/xpconnect/src/XPCWrappedNative.cpp
--- a/js/xpconnect/src/XPCWrappedNative.cpp ===================================================================
+++ b/js/xpconnect/src/XPCWrappedNative.cpp --- firefox-115.0.orig/js/xpconnect/src/XPCWrappedNative.cpp
@@ -1072,17 +1072,21 @@ class MOZ_STACK_CLASS CallMethodHelper f +++ firefox-115.0/js/xpconnect/src/XPCWrappedNative.cpp
uint32_t* result); @@ -1061,7 +1061,11 @@ class MOZ_STACK_CLASS CallMethodHelper f
MOZ_ALWAYS_INLINE bool GetInterfaceTypeFromParam(const nsXPTType& type,
nsID* result) const;
MOZ_ALWAYS_INLINE bool GetOutParamSource(uint8_t paramIndex, MOZ_ALWAYS_INLINE bool GetOutParamSource(uint8_t paramIndex,
MutableHandleValue srcp) const; MutableHandleValue srcp) const;
@ -24,17 +20,7 @@ diff --git a/js/xpconnect/src/XPCWrappedNative.cpp b/js/xpconnect/src/XPCWrapped
MOZ_ALWAYS_INLINE bool QueryInterfaceFastPath(); MOZ_ALWAYS_INLINE bool QueryInterfaceFastPath();
nsXPTCVariant* GetDispatchParam(uint8_t paramIndex) { @@ -1108,7 +1112,11 @@ class MOZ_STACK_CLASS CallMethodHelper f
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);
}
~CallMethodHelper(); ~CallMethodHelper();
@ -47,8 +33,3 @@ diff --git a/js/xpconnect/src/XPCWrappedNative.cpp b/js/xpconnect/src/XPCWrapped
// Trace implementation so we can put our CallMethodHelper in a Rooted<T>. // Trace implementation so we can put our CallMethodHelper in a Rooted<T>.
void trace(JSTracer* aTrc); void trace(JSTracer* aTrc);
};
// static
bool XPCWrappedNative::CallMethod(XPCCallContext& ccx,
CallMode mode /*= CALL_METHOD */) {

26
mozilla-bmo1775202.patch Normal file
View File

@ -0,0 +1,26 @@
From: Mike Hommey <mh@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 += [

19
mozilla-bmo849632.patch
View File

@ -6,15 +6,11 @@ Solution: Problem is with skia once again. Output of webgl seems endian-correct,
So we swizzle the output of webgl after reading it from readpixels() 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 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 Index: firefox-115.0/gfx/gl/GLContext.h
--- a/gfx/gl/GLContext.h ===================================================================
+++ b/gfx/gl/GLContext.h --- firefox-115.0.orig/gfx/gl/GLContext.h
@@ -1548,16 +1548,23 @@ class GLContext : public GenericAtomicRe +++ firefox-115.0/gfx/gl/GLContext.h
AFTER_GL_CALL; @@ -1560,6 +1560,13 @@ class GLContext : public GenericAtomicRe
}
void raw_fReadPixels(GLint x, GLint y, GLsizei width, GLsizei height,
GLenum format, GLenum type, GLvoid* pixels) {
BEFORE_GL_CALL; BEFORE_GL_CALL;
mSymbols.fReadPixels(x, y, width, height, format, type, pixels); mSymbols.fReadPixels(x, y, width, height, format, type, pixels);
OnSyncCall(); OnSyncCall();
@ -28,8 +24,3 @@ diff --git a/gfx/gl/GLContext.h b/gfx/gl/GLContext.h
AFTER_GL_CALL; AFTER_GL_CALL;
mHeavyGLCallsSinceLastFlush = true; mHeavyGLCallsSinceLastFlush = true;
} }
void fReadPixels(GLint x, GLint y, GLsizei width, GLsizei height,
GLenum format, GLenum type, GLvoid* pixels);
public:

27
mozilla-buildfixes.patch
View File

@ -1,27 +0,0 @@
# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Parent e583ac9b86ba82dd1c60d307115b4cb96296a6af
# References: bmo#1792159 - Add missing includes to AtomicOperationsGenerated.h
diff --git a/mozglue/misc/SIMD_avx2.cpp b/mozglue/misc/SIMD_avx2.cpp
--- a/mozglue/misc/SIMD_avx2.cpp
+++ b/mozglue/misc/SIMD_avx2.cpp
@@ -53,17 +53,17 @@ template <typename TValue>
}
if (sizeof(TValue) == 2) {
return _mm256_cmpeq_epi16(a, b);
}
return _mm256_cmpeq_epi64(a, b);
}
-# if defined(__GNUC__) && !defined(__clang__)
+# if 0
// See the comment in SIMD.cpp over Load32BitsIntoXMM. This is just adapted
// from that workaround. Testing this, it also yields the correct instructions
// across all tested compilers.
__m128i Load64BitsIntoXMM(uintptr_t ptr) {
int64_t tmp;
memcpy(&tmp, reinterpret_cast<const void*>(ptr), sizeof(tmp));
return _mm_cvtsi64_si128(tmp);

14
mozilla-fix-aarch64-libopus.patch
View File

@ -1,15 +1,10 @@
# HG changeset patch # 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 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 --- a/media/libopus/silk/arm/arm_silk_map.c
+++ b/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 @@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE.
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
# include "config.h" # include "config.h"
#endif #endif
@ -18,8 +13,3 @@ diff --git a/media/libopus/silk/arm/arm_silk_map.c b/media/libopus/silk/arm/arm_
#include "NSQ.h" #include "NSQ.h"
#include "SigProc_FIX.h" #include "SigProc_FIX.h"
#if defined(OPUS_HAVE_RTCD)
# if (defined(OPUS_ARM_MAY_HAVE_NEON_INTR) && \
!defined(OPUS_ARM_PRESUME_NEON_INTR))

1928
mozilla-kde.patch
View File

File diff suppressed because it is too large Load Diff

19
mozilla-nongnome-proxies.patch
View File

@ -3,7 +3,7 @@
# Date 1558442915 -7200 # Date 1558442915 -7200
# Tue May 21 14:48:35 2019 +0200 # Tue May 21 14:48:35 2019 +0200
# Node ID 6bcf2dfebc1ea2aa34e5cc61152709fc8e409dc5 # Node ID 6bcf2dfebc1ea2aa34e5cc61152709fc8e409dc5
# Parent bd5d1f49975deb730064a16b3079edb53c4a5f84 # Parent 715f01d61df8627117e6aefca540f0c1bba45011
Do not use gconf for proxy settings if not running within Gnome Do not use gconf for proxy settings if not running within Gnome
Index: toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp Index: toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
=================================================================== ===================================================================
@ -13,12 +13,7 @@ retrieving revision 1.1
diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
--- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp --- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
+++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp +++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
@@ -49,20 +49,24 @@ NS_IMETHODIMP @@ -52,10 +52,13 @@ nsUnixSystemProxySettings::GetMainThread
nsUnixSystemProxySettings::GetMainThreadOnly(bool* aMainThreadOnly) {
// dbus prevents us from being threadsafe, but this routine should not block
// anyhow
*aMainThreadOnly = true;
return NS_OK;
} }
void nsUnixSystemProxySettings::Init() { void nsUnixSystemProxySettings::Init() {
@ -30,15 +25,9 @@ diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/sy
+ if (sessionType && !strcmp(sessionType, "gnome")) { + if (sessionType && !strcmp(sessionType, "gnome")) {
+ mGSettings = do_GetService(NS_GSETTINGSSERVICE_CONTRACTID); + mGSettings = do_GetService(NS_GSETTINGSSERVICE_CONTRACTID);
+ if (mGSettings) { + if (mGSettings) {
+ mGSettings->GetCollectionForSchema( + mGSettings->GetCollectionForSchema("org.gnome.system.proxy"_ns,
+ "org.gnome.system.proxy"_ns, + getter_AddRefs(mProxySettings));
+ getter_AddRefs(mProxySettings));
+ } + }
} }
} }
nsresult nsUnixSystemProxySettings::GetPACURI(nsACString& aResult) {
if (mProxySettings) {
nsCString proxyMode;
// Check if mode is auto
nsresult rv = mProxySettings->GetString("mode"_ns, proxyMode);

14
mozilla-ntlm-full-path.patch
View File

@ -1,18 +1,13 @@
# HG changeset patch # HG changeset patch
# User Petr Cerny <pcerny@novell.com> # User Petr Cerny <pcerny@novell.com>
# Parent 7308e4a7c1f769f4bbbc90870b849cadd99495a6 # Parent 7308e4a7c1f769f4bbbc90870b849cadd99495a6
# Parent 2361c5db1e70e358b2158325e07fa15bb4569c2c # Parent 1c6a565013e4c5f3494f964269783939cd5ed0b8
Bug 634334 - call to the ntlm_auth helper fails Bug 634334 - call to the ntlm_auth helper fails
diff --git a/extensions/auth/nsAuthSambaNTLM.cpp b/extensions/auth/nsAuthSambaNTLM.cpp diff --git a/extensions/auth/nsAuthSambaNTLM.cpp b/extensions/auth/nsAuthSambaNTLM.cpp
--- a/extensions/auth/nsAuthSambaNTLM.cpp --- a/extensions/auth/nsAuthSambaNTLM.cpp
+++ b/extensions/auth/nsAuthSambaNTLM.cpp +++ b/extensions/auth/nsAuthSambaNTLM.cpp
@@ -156,17 +156,17 @@ static uint8_t* ExtractMessage(const nsA @@ -160,7 +160,7 @@ nsresult nsAuthSambaNTLM::SpawnNTLMAuthH
*aLen = (length / 4) * 3 - numEquals;
return reinterpret_cast<uint8_t*>(PL_Base64Decode(s, length, nullptr));
}
nsresult nsAuthSambaNTLM::SpawnNTLMAuthHelper() {
const char* username = PR_GetEnv("USER"); const char* username = PR_GetEnv("USER");
if (!username) return NS_ERROR_FAILURE; if (!username) return NS_ERROR_FAILURE;
@ -21,8 +16,3 @@ diff --git a/extensions/auth/nsAuthSambaNTLM.cpp b/extensions/auth/nsAuthSambaNT
"--helper-protocol", "--helper-protocol",
"ntlmssp-client-1", "ntlmssp-client-1",
"--use-cached-creds", "--use-cached-creds",
"--username",
username,
nullptr};
bool isOK = SpawnIOChild(const_cast<char* const*>(args), &mChildPID,

13
mozilla-partial-revert-1768632.patch Normal file
View File

@ -0,0 +1,13 @@
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;

128
mozilla-pgo.patch
View File

@ -1,16 +1,12 @@
# HG changeset patch # HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org> # User Wolfgang Rosenauer <wr@rosenauer.org>
# Parent d6f551c7b3dc20bb47526e06c44646fd159f3dd1 # Parent 9959fe2a13a39cbeb98ca1bef2e21caba16717bd
diff --git a/build/moz.configure/lto-pgo.configure b/build/moz.configure/lto-pgo.configure Index: firefox-115.0/build/moz.configure/lto-pgo.configure
--- a/build/moz.configure/lto-pgo.configure ===================================================================
+++ b/build/moz.configure/lto-pgo.configure --- firefox-115.0.orig/build/moz.configure/lto-pgo.configure
@@ -242,34 +242,34 @@ def lto( +++ firefox-115.0/build/moz.configure/lto-pgo.configure
"configure." @@ -251,8 +251,8 @@ def lto(
)
if c_compiler.type == "clang":
if value == "full":
cflags.append("-flto") cflags.append("-flto")
ldflags.append("-flto") ldflags.append("-flto")
else: else:
@ -19,18 +15,10 @@ diff --git a/build/moz.configure/lto-pgo.configure b/build/moz.configure/lto-pgo
+ cflags.append("-flto") + cflags.append("-flto")
+ ldflags.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 # Work around https://github.com/rust-lang/rust/issues/90088
# by enabling the highest level of SSE the rust targets default @@ -268,7 +268,7 @@ def lto(
# to. if "full" in values:
# 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":
cflags.append("-flto") cflags.append("-flto")
else: else:
- cflags.append("-flto=thin") - cflags.append("-flto=thin")
@ -38,20 +26,11 @@ diff --git a/build/moz.configure/lto-pgo.configure b/build/moz.configure/lto-pgo
# With clang-cl, -flto can only be used with -c or -fuse-ld=lld. # 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. # AC_TRY_LINKs during configure don't have -c, so pass -fuse-ld=lld.
cflags.append("-fuse-ld=lld") cflags.append("-fuse-ld=lld")
Index: firefox-115.0/build/pgo/profileserver.py
# Explicitly set the CPU to optimize for so the linker doesn't ===================================================================
# choose a poor default. Rust compilation by default uses the --- firefox-115.0.orig/build/pgo/profileserver.py
# pentium4 CPU on x86: +++ firefox-115.0/build/pgo/profileserver.py
# @@ -11,7 +11,7 @@ import subprocess
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
import sys import sys
import mozcrash import mozcrash
@ -60,17 +39,7 @@ diff --git a/build/pgo/profileserver.py b/build/pgo/profileserver.py
from mozfile import TemporaryDirectory from mozfile import TemporaryDirectory
from mozhttpd import MozHttpd from mozhttpd import MozHttpd
from mozprofile import FirefoxProfile, Preferences from mozprofile import FirefoxProfile, Preferences
from mozprofile.permissions import ServerLocations @@ -87,9 +87,22 @@ if __name__ == "__main__":
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)
locations = ServerLocations() locations = ServerLocations()
locations.add_host(host="127.0.0.1", port=PORT, options="primary,privileged") locations.add_host(host="127.0.0.1", port=PORT, options="primary,privileged")
@ -96,17 +65,7 @@ diff --git a/build/pgo/profileserver.py b/build/pgo/profileserver.py
with TemporaryDirectory() as profilePath: with TemporaryDirectory() as profilePath:
# TODO: refactor this into mozprofile # TODO: refactor this into mozprofile
profile_data_dir = os.path.join(build.topsrcdir, "testing", "profiles") @@ -213,6 +226,10 @@ if __name__ == "__main__":
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:
print("Firefox exited successfully, but produced a crashreport") print("Firefox exited successfully, but produced a crashreport")
sys.exit(1) sys.exit(1)
@ -117,18 +76,11 @@ diff --git a/build/pgo/profileserver.py b/build/pgo/profileserver.py
llvm_profdata = env.get("LLVM_PROFDATA") llvm_profdata = env.get("LLVM_PROFDATA")
if llvm_profdata: if llvm_profdata:
profraw_files = glob.glob("*.profraw") profraw_files = glob.glob("*.profraw")
if not profraw_files: Index: firefox-115.0/build/unix/mozconfig.unix
print( ===================================================================
"Could not find profraw files in the current directory: %s" --- firefox-115.0.orig/build/unix/mozconfig.unix
% os.getcwd() +++ firefox-115.0/build/unix/mozconfig.unix
) @@ -4,6 +4,15 @@ if [ -n "$FORCE_GCC" ]; then
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
CC="$MOZ_FETCHES_DIR/gcc/bin/gcc" CC="$MOZ_FETCHES_DIR/gcc/bin/gcc"
CXX="$MOZ_FETCHES_DIR/gcc/bin/g++" CXX="$MOZ_FETCHES_DIR/gcc/bin/g++"
@ -144,34 +96,21 @@ diff --git a/build/unix/mozconfig.unix b/build/unix/mozconfig.unix
# We want to make sure we use binutils and other binaries in the tooltool # We want to make sure we use binutils and other binaries in the tooltool
# package. # package.
mk_add_options "export PATH=$MOZ_FETCHES_DIR/gcc/bin:$MOZ_FETCHES_DIR/binutils/bin:$PATH" mk_add_options "export PATH=$MOZ_FETCHES_DIR/gcc/bin:$MOZ_FETCHES_DIR/binutils/bin:$PATH"
else Index: firefox-115.0/extensions/spellcheck/src/moz.build
# For some builds we don't want to have Clang based static-analysis activated ===================================================================
if [ -z "$DISABLE_CLANG_PLUGIN" ]; then --- firefox-115.0.orig/extensions/spellcheck/src/moz.build
export ENABLE_CLANG_PLUGIN=1 +++ firefox-115.0/extensions/spellcheck/src/moz.build
fi @@ -28,3 +28,5 @@ EXPORTS.mozilla += [
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 += [
"mozInlineSpellChecker.h", "mozInlineSpellChecker.h",
"mozSpellChecker.h", "mozSpellChecker.h",
] ]
+ +
+CXXFLAGS += ['-fno-devirtualize'] +CXXFLAGS += ['-fno-devirtualize']
diff --git a/toolkit/components/terminator/nsTerminator.cpp b/toolkit/components/terminator/nsTerminator.cpp Index: firefox-115.0/toolkit/components/terminator/nsTerminator.cpp
--- a/toolkit/components/terminator/nsTerminator.cpp ===================================================================
+++ b/toolkit/components/terminator/nsTerminator.cpp --- firefox-115.0.orig/toolkit/components/terminator/nsTerminator.cpp
@@ -455,16 +455,21 @@ void nsTerminator::StartWatchdog() { +++ firefox-115.0/toolkit/components/terminator/nsTerminator.cpp
// Defend against overflow @@ -460,6 +460,11 @@ void nsTerminator::StartWatchdog() {
crashAfterMS = INT32_MAX;
} else {
crashAfterMS *= scaleUp;
}
} }
#endif #endif
@ -183,8 +122,3 @@ diff --git a/toolkit/components/terminator/nsTerminator.cpp b/toolkit/components
UniquePtr<Options> options(new Options()); UniquePtr<Options> options(new Options());
// crashAfterTicks is guaranteed to be > 0 as // crashAfterTicks is guaranteed to be > 0 as
// crashAfterMS >= ADDITIONAL_WAIT_BEFORE_CRASH_MS >> HEARTBEAT_INTERVAL_MS // 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);

10
mozilla-reduce-rust-debuginfo.patch
View File

@ -1,6 +1,10 @@
--- firefox-96.0.3.orig/build/moz.configure/rust.configure # HG changeset patch
+++ firefox-96.0.3/build/moz.configure/rust.configure # Parent 135d931b3e674a670473f69f8c079e741ac63643
@@ -641,7 +643,7 @@ def rust_compile_flags(
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 debug_assertions = False
if debug_symbols: if debug_symbols:

12
mozilla-rust-disable-future-incompat.patch Normal file
View File

@ -0,0 +1,12 @@
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"

262
mozilla-silence-no-return-type.patch
View File

@ -1,9 +1,10 @@
# HG changeset patch # HG changeset patch
# Parent 5df550d4b5fc674268055e504f60392389eb9ea7 # Parent 5df550d4b5fc674268055e504f60392389eb9ea7
diff --git 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
--- a/gfx/skia/skia/include/codec/SkEncodedOrigin.h ===================================================================
+++ b/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 @@ -41,6 +41,7 @@ static inline SkMatrix SkEncodedOriginTo
case kLeftBottom_SkEncodedOrigin: return SkMatrix::MakeAll( 0, 1, 0, -1, 0, h, 0, 0, 1); 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/codec/SkEncodedOrigin.h b/gfx/skia/skia/inclu
} }
/** /**
diff --git 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
--- a/gfx/skia/skia/include/private/gpu/ganesh/GrTypesPriv.h ===================================================================
+++ b/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 @@ -325,6 +325,7 @@ static inline bool GrTextureTypeHasRestr
default: default:
SK_ABORT("Unexpected texture type"); SK_ABORT("Unexpected texture type");
@ -23,9 +25,10 @@ diff --git a/gfx/skia/skia/include/private/gpu/ganesh/GrTypesPriv.h b/gfx/skia/s
} }
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
diff --git 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
--- a/gfx/skia/skia/src/core/SkDescriptor.cpp ===================================================================
+++ b/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 @@ -26,6 +26,7 @@ std::unique_ptr<SkDescriptor> SkDescript
void SkDescriptor::operator delete(void* p) { ::operator delete(p); } void SkDescriptor::operator delete(void* p) { ::operator delete(p); }
void* SkDescriptor::operator new(size_t) { void* SkDescriptor::operator new(size_t) {
@ -34,9 +37,10 @@ diff --git a/gfx/skia/skia/src/core/SkDescriptor.cpp b/gfx/skia/skia/src/core/Sk
} }
void SkDescriptor::flatten(SkWriteBuffer& buffer) const { void SkDescriptor::flatten(SkWriteBuffer& buffer) const {
diff --git 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
--- a/gfx/skia/skia/src/core/SkGeometry.h ===================================================================
+++ b/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 @@ -281,6 +281,7 @@ static inline bool SkCubicIsDegenerate(S
return true; return true;
} }
@ -53,9 +57,10 @@ diff --git a/gfx/skia/skia/src/core/SkGeometry.h b/gfx/skia/skia/src/core/SkGeom
} }
/** Returns the cubic classification. /** Returns the cubic classification.
diff --git 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
--- a/gfx/skia/skia/src/core/SkTextBlob.cpp ===================================================================
+++ b/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 @@ -204,6 +204,7 @@ void SkTextBlob::operator delete(void* p
void* SkTextBlob::operator new(size_t) { void* SkTextBlob::operator new(size_t) {
@ -64,9 +69,10 @@ diff --git a/gfx/skia/skia/src/core/SkTextBlob.cpp b/gfx/skia/skia/src/core/SkTe
} }
void* SkTextBlob::operator new(size_t, void* p) { 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 Index: firefox-115.0/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 --- 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: @@ -95,12 +95,14 @@ public:
bool isLogging() const {return fIsLogging;} bool isLogging() const {return fIsLogging;}
@ -150,9 +156,10 @@ diff --git a/gfx/skia/skia/src/core/SkTypeface_remote.h b/gfx/skia/skia/src/core
} }
private: private:
diff --git 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
--- a/gfx/skia/skia/src/effects/imagefilters/SkBlurImageFilter.cpp ===================================================================
+++ b/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( @@ -815,6 +815,7 @@ sk_sp<SkSpecialImage> cpu_blur(
return maker; return maker;
} }
@ -161,9 +168,10 @@ diff --git a/gfx/skia/skia/src/effects/imagefilters/SkBlurImageFilter.cpp b/gfx/
}; };
PassMaker* makerX = makeMaker(sigma.x()); 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 Index: firefox-115.0/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 --- 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 @@ -69,6 +69,7 @@ void SkFontMgr_Indirect::onGetFamilyName
SkFontStyleSet* SkFontMgr_Indirect::onCreateStyleSet(int index) const { SkFontStyleSet* SkFontMgr_Indirect::onCreateStyleSet(int index) const {
@ -172,9 +180,10 @@ diff --git a/gfx/skia/skia/src/fonts/SkFontMgr_indirect.cpp b/gfx/skia/skia/src/
} }
SkFontStyleSet* SkFontMgr_Indirect::onMatchFamily(const char familyName[]) const { 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 Index: firefox-115.0/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 --- 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: @@ -162,18 +162,22 @@ public:
protected: protected:
int onCountFamilies() const override { int onCountFamilies() const override {
@ -198,9 +207,10 @@ diff --git a/gfx/skia/skia/src/ports/SkFontMgr_FontConfigInterface.cpp b/gfx/ski
} }
SkTypeface* onMatchFamilyStyle(const char requestedFamilyName[], SkTypeface* onMatchFamilyStyle(const char requestedFamilyName[],
diff --git 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
--- a/gfx/skia/skia/src/sksl/SkSLCompiler.cpp ===================================================================
+++ b/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 @@ -277,6 +277,7 @@ std::unique_ptr<Expression> Compiler::co
} }
default: default:
@ -209,9 +219,10 @@ diff --git a/gfx/skia/skia/src/sksl/SkSLCompiler.cpp b/gfx/skia/skia/src/sksl/Sk
} }
} }
diff --git 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
--- a/gfx/skia/skia/src/sksl/SkSLOperator.cpp ===================================================================
+++ b/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 @@ -51,7 +51,7 @@ OperatorPrecedence Operator::getBinaryPr
case Kind::BITWISEXOREQ: // fall through case Kind::BITWISEXOREQ: // fall through
case Kind::BITWISEOREQ: return OperatorPrecedence::kAssignment; case Kind::BITWISEOREQ: return OperatorPrecedence::kAssignment;
@ -221,9 +232,10 @@ diff --git a/gfx/skia/skia/src/sksl/SkSLOperator.cpp b/gfx/skia/skia/src/sksl/Sk
} }
} }
diff --git 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
--- a/gfx/skia/skia/src/sksl/ir/SkSLType.h ===================================================================
+++ b/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: @@ -422,6 +422,7 @@ public:
virtual const std::vector<Field>& fields() const { virtual const std::vector<Field>& fields() const {
@ -232,9 +244,10 @@ diff --git a/gfx/skia/skia/src/sksl/ir/SkSLType.h b/gfx/skia/skia/src/sksl/ir/Sk
} }
/** /**
diff --git 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
--- a/gfx/skia/skia/src/utils/SkShadowUtils.cpp ===================================================================
+++ b/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 { @@ -140,6 +140,7 @@ struct SpotVerticesFactory {
return true; return true;
} }
@ -243,9 +256,10 @@ diff --git a/gfx/skia/skia/src/utils/SkShadowUtils.cpp b/gfx/skia/skia/src/utils
} }
sk_sp<SkVertices> makeVertices(const SkPath& path, const SkMatrix& ctm, 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 Index: firefox-115.0/intl/icu/source/i18n/number_rounding.cpp
--- a/intl/icu/source/i18n/number_rounding.cpp ===================================================================
+++ b/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 @@ -283,6 +283,7 @@ FractionPrecision Precision::constructFr
settings.fMaxFrac = static_cast<digits_t>(maxFrac); settings.fMaxFrac = static_cast<digits_t>(maxFrac);
settings.fMinSig = -1; settings.fMinSig = -1;
@ -262,10 +276,11 @@ diff --git a/intl/icu/source/i18n/number_rounding.cpp b/intl/icu/source/i18n/num
PrecisionUnion union_; PrecisionUnion union_;
union_.fracSig = settings; union_.fracSig = settings;
return {RND_SIGNIFICANT, union_}; return {RND_SIGNIFICANT, union_};
diff --git a/js/src/irregexp/imported/regexp-parser.cc b/js/src/irregexp/imported/regexp-parser.cc Index: firefox-115.0/js/src/irregexp/imported/regexp-parser.cc
--- a/js/src/irregexp/imported/regexp-parser.cc ===================================================================
+++ b/js/src/irregexp/imported/regexp-parser.cc --- firefox-115.0.orig/js/src/irregexp/imported/regexp-parser.cc
@@ -2655,6 +2655,7 @@ bool MayContainStrings(ClassSetOperandTy +++ firefox-115.0/js/src/irregexp/imported/regexp-parser.cc
@@ -2656,6 +2656,7 @@ bool MayContainStrings(ClassSetOperandTy
if (operand->IsClassRanges()) return false; if (operand->IsClassRanges()) return false;
return operand->AsClassSetExpression()->may_contain_strings(); return operand->AsClassSetExpression()->may_contain_strings();
} }
@ -273,9 +288,10 @@ diff --git a/js/src/irregexp/imported/regexp-parser.cc b/js/src/irregexp/importe
} }
} // namespace } // namespace
diff --git 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
--- a/third_party/libwebrtc/api/adaptation/resource.cc ===================================================================
+++ b/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 @@ -22,6 +22,7 @@ const char* ResourceUsageStateToString(R
return "kUnderuse"; return "kUnderuse";
} }
@ -284,9 +300,10 @@ diff --git a/third_party/libwebrtc/api/adaptation/resource.cc b/third_party/libw
} }
ResourceListener::~ResourceListener() {} ResourceListener::~ResourceListener() {}
diff --git 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
--- a/third_party/libwebrtc/api/rtp_parameters.cc ===================================================================
+++ b/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 @@ -32,6 +32,7 @@ const char* DegradationPreferenceToStrin
return "balanced"; return "balanced";
} }
@ -295,10 +312,11 @@ diff --git a/third_party/libwebrtc/api/rtp_parameters.cc b/third_party/libwebrtc
} }
const double kDefaultBitratePriority = 1.0; 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 Index: firefox-115.0/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 --- firefox-115.0.orig/third_party/libwebrtc/api/video/video_frame_buffer.cc
@@ -99,6 +99,8 @@ const char* VideoFrameBufferTypeToString +++ firefox-115.0/third_party/libwebrtc/api/video/video_frame_buffer.cc
@@ -106,6 +106,8 @@ const char* VideoFrameBufferTypeToString
default: default:
RTC_DCHECK_NOTREACHED(); RTC_DCHECK_NOTREACHED();
} }
@ -307,9 +325,10 @@ diff --git a/third_party/libwebrtc/api/video/video_frame_buffer.cc b/third_party
} }
int I420BufferInterface::ChromaWidth() const { 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 Index: firefox-115.0/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 --- 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 @@ -118,6 +118,7 @@ const char* CodecTypeToPayloadString(Vid
return kPayloadNameGeneric; return kPayloadNameGeneric;
} }
@ -318,9 +337,10 @@ diff --git a/third_party/libwebrtc/api/video_codecs/video_codec.cc b/third_party
} }
VideoCodecType PayloadStringToCodecType(const std::string& name) { 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 Index: firefox-115.0/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 --- 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 @@ -163,6 +163,7 @@ class VideoEncoderSoftwareFallbackWrappe
return fallback_encoder_.get(); return fallback_encoder_.get();
} }
@ -337,9 +357,10 @@ diff --git a/third_party/libwebrtc/api/video_codecs/video_encoder_software_fallb
} }
int32_t VideoEncoderSoftwareFallbackWrapper::EncodeWithMainEncoder( 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 Index: firefox-115.0/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 --- 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 @@ -168,6 +168,7 @@ const char* Adaptation::StatusToString(A
return "kRejectedByConstraint"; return "kRejectedByConstraint";
} }
@ -348,7 +369,7 @@ diff --git a/third_party/libwebrtc/call/adaptation/video_stream_adapter.cc b/thi
} }
Adaptation::Adaptation(int validation_id, Adaptation::Adaptation(int validation_id,
@@ -390,6 +391,7 @@ VideoStreamAdapter::RestrictionsOrState @@ -390,6 +391,7 @@ VideoStreamAdapter::RestrictionsOrState
return Adaptation::Status::kAdaptationDisabled; return Adaptation::Status::kAdaptationDisabled;
} }
RTC_CHECK_NOTREACHED(); RTC_CHECK_NOTREACHED();
@ -373,9 +394,10 @@ diff --git a/third_party/libwebrtc/call/adaptation/video_stream_adapter.cc b/thi
} }
VideoStreamAdapter::RestrictionsOrState VideoStreamAdapter::RestrictionsOrState
diff --git 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
--- a/third_party/libwebrtc/call/rtp_payload_params.cc ===================================================================
+++ b/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> @@ -407,7 +407,7 @@ absl::optional<FrameDependencyStructure>
case VideoCodecType::kVideoCodecMultiplex: case VideoCodecType::kVideoCodecMultiplex:
return absl::nullopt; return absl::nullopt;
@ -385,9 +407,10 @@ diff --git a/third_party/libwebrtc/call/rtp_payload_params.cc b/third_party/libw
} }
void RtpPayloadParams::GenericToGeneric(int64_t shared_frame_id, 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 Index: firefox-115.0/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 --- 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 @@ -30,6 +30,7 @@ const char* StreamTypeToString(VideoSend
return "flexfec"; return "flexfec";
} }
@ -396,9 +419,10 @@ diff --git a/third_party/libwebrtc/call/video_send_stream.cc b/third_party/libwe
} }
} // namespace } // 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 Index: firefox-115.0/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 --- 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 @@ -378,7 +378,7 @@ std::unique_ptr<ClippingPredictor> Creat
config.reference_window_delay, config.clipping_threshold, config.reference_window_delay, config.clipping_threshold,
/*adaptive_step_estimation=*/false); /*adaptive_step_estimation=*/false);
@ -408,9 +432,10 @@ diff --git a/third_party/libwebrtc/modules/audio_processing/agc2/clipping_predic
} }
} // namespace webrtc } // 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 Index: firefox-115.0/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 --- 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 @@ -48,6 +48,7 @@ constexpr absl::string_view MetricNamePr
case InputVolumeType::kRecommended: case InputVolumeType::kRecommended:
return "WebRTC.Audio.Apm.RecommendedInputVolume."; return "WebRTC.Audio.Apm.RecommendedInputVolume.";
@ -419,9 +444,10 @@ diff --git a/third_party/libwebrtc/modules/audio_processing/agc2/input_volume_st
} }
metrics::Histogram* CreateVolumeHistogram(InputVolumeType input_volume_type) { 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 Index: firefox-115.0/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 --- 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 @@ -59,6 +59,8 @@ rtc::FunctionView<float(float)> GetActiv
case ActivationFunction::kSigmoidApproximated: case ActivationFunction::kSigmoidApproximated:
return ::rnnoise::SigmoidApproximated; return ::rnnoise::SigmoidApproximated;
@ -431,9 +457,10 @@ diff --git a/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_fc.
} }
} // namespace } // 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 Index: firefox-115.0/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 --- 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 @@ -99,6 +99,7 @@ GainControl::Mode Agc1ConfigModeToInterf
return GainControl::kFixedDigital; return GainControl::kFixedDigital;
} }
@ -451,7 +478,7 @@ diff --git a/third_party/libwebrtc/modules/audio_processing/audio_processing_imp
} }
// Returns an AudioProcessing::Error together with the best possible option for // 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; return NsConfig::SuppressionLevel::k21dB;
} }
RTC_CHECK_NOTREACHED(); RTC_CHECK_NOTREACHED();
@ -459,9 +486,10 @@ diff --git a/third_party/libwebrtc/modules/audio_processing/audio_processing_imp
}; };
NsConfig cfg; 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 Index: firefox-115.0/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 --- 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 @@ -32,6 +32,7 @@ std::string NoiseSuppressionLevelToStrin
return "VeryHigh"; return "VeryHigh";
} }
@ -478,9 +506,10 @@ diff --git a/third_party/libwebrtc/modules/audio_processing/include/audio_proces
} }
} // namespace } // 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 Index: firefox-115.0/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 --- 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 @@ -53,6 +53,7 @@ std::string GetVadModeLabel(TransientSup
case TransientSuppressor::VadMode::kNoVad: case TransientSuppressor::VadMode::kNoVad:
return "no VAD"; return "no VAD";
@ -489,9 +518,10 @@ diff --git a/third_party/libwebrtc/modules/audio_processing/transient/transient_
} }
} // namespace } // 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 Index: firefox-115.0/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 --- 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 @@ -44,6 +44,7 @@ ScreenCastPortal::CaptureSourceType Scre
case CaptureType::kAnyScreenContent: case CaptureType::kAnyScreenContent:
return ScreenCastPortal::CaptureSourceType::kAnyScreenContent; return ScreenCastPortal::CaptureSourceType::kAnyScreenContent;
@ -500,9 +530,10 @@ diff --git a/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screenc
} }
ScreenCastPortal::ScreenCastPortal(CaptureType type, PortalNotifier* notifier) 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 Index: firefox-115.0/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 --- 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 @@ -38,6 +38,7 @@ std::unique_ptr<VideoRtpDepacketizer> Cr
return std::make_unique<VideoRtpDepacketizerGeneric>(); return std::make_unique<VideoRtpDepacketizerGeneric>();
} }
@ -511,9 +542,10 @@ diff --git a/third_party/libwebrtc/modules/rtp_rtcp/source/create_video_rtp_depa
} }
} // namespace webrtc } // 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 Index: firefox-115.0/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 --- 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 @@ -142,6 +142,7 @@ bool IsNonVolatile(RTPExtensionType type
#endif #endif
} }
@ -522,9 +554,10 @@ diff --git a/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender.cc b/third
} }
bool HasBweExtension(const RtpHeaderExtensionMap& extensions_map) { 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 Index: firefox-115.0/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 --- 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 { @@ -45,6 +45,7 @@ namespace {
return "audio_cn"; return "audio_cn";
} }
@ -533,10 +566,11 @@ diff --git a/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender_audio.cc b
} }
constexpr char kIncludeCaptureClockOffset[] = 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 Index: firefox-115.0/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 --- firefox-115.0.orig/third_party/libwebrtc/modules/video_coding/codecs/vp8/default_temporal_layers.cc
@@ -110,6 +110,7 @@ size_t BufferToIndex(Vp8BufferReference +++ 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: case Vp8FrameConfig::Vp8BufferReference::kNone:
RTC_CHECK_NOTREACHED(); RTC_CHECK_NOTREACHED();
} }
@ -544,9 +578,10 @@ diff --git a/third_party/libwebrtc/modules/video_coding/codecs/vp8/default_tempo
} }
} // namespace } // 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 Index: firefox-115.0/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 --- 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 @@ -30,6 +30,7 @@ TemporalLayersChecker::CreateTemporalLay
return std::make_unique<TemporalLayersChecker>(num_temporal_layers); return std::make_unique<TemporalLayersChecker>(num_temporal_layers);
} }
@ -555,9 +590,10 @@ diff --git a/third_party/libwebrtc/modules/video_coding/codecs/vp8/temporal_laye
} }
TemporalLayersChecker::TemporalLayersChecker(int num_temporal_layers) 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 Index: firefox-115.0/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 --- 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 @@ -63,6 +63,7 @@ std::string ToString(VideoAdaptationReas
return "cpu"; return "cpu";
} }

4
mozilla.keyring
View File

@ -12,8 +12,8 @@ pub rsa4096 2015-07-17 [SC]
uid [ full ] Mozilla Software Releases <release@mozilla.com> uid [ full ] Mozilla Software Releases <release@mozilla.com>
sub rsa4096 2015-07-17 [S] [expired: 2017-07-16] sub rsa4096 2015-07-17 [S] [expired: 2017-07-16]
sub rsa4096 2017-06-22 [S] [expired: 2019-06-22] sub rsa4096 2017-06-22 [S] [expired: 2019-06-22]
sub rsa4096 2019-05-30 [S] [expired: 2021-05-29] sub rsa4096 2019-05-30 [S] [expires: 2021-05-29]
sub rsa4096 2021-05-17 [S] [expired: 2023-05-17] sub rsa4096 2021-05-17 [S] [expires: 2023-05-17]
sub rsa4096 2023-05-05 [S] [expires: 2025-05-04] sub rsa4096 2023-05-05 [S] [expires: 2025-05-04]
-----BEGIN PGP PUBLIC KEY BLOCK----- -----BEGIN PGP PUBLIC KEY BLOCK-----

4
mozilla.sh.in
View File

@ -100,7 +100,7 @@ if [ "$WAYLAND_DISPLAY" ]; then
fi fi
# xinput2 (boo#1173320) # xinput2 (boo#1173320)
. /etc/os-release source /etc/os-release
if [ "$ID" = "opensuse-tumbleweed" ]; then if [ "$ID" = "opensuse-tumbleweed" ]; then
export MOZ_USE_XINPUT2=1 export MOZ_USE_XINPUT2=1
fi fi
@ -151,7 +151,7 @@ if [ $MOZILLA_DOWN -ne 0 ]; then
# Try with a local variant first, then without a local variant # Try with a local variant first, then without a local variant
SHORTMOZLOCALE=`echo $CURRENT_LOCALE | sed "s|_\([^.]*\).*||g" | sed "s|\..*||g"` SHORTMOZLOCALE=`echo $CURRENT_LOCALE | sed "s|_\([^.]*\).*||g" | sed "s|\..*||g"`
MOZLOCALE=`echo $CURRENT_LOCALE | sed "s|_\([^.]*\).*|-\1|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 language=$*
local langpack=langpack-${language}@firefox.mozilla.org.xpi local langpack=langpack-${language}@firefox.mozilla.org.xpi
if [ -f $MOZ_LANGPACKS_DIR/$langpack ]; then if [ -f $MOZ_LANGPACKS_DIR/$langpack ]; then

8
one_swizzle_to_rule_them_all.patch
View File

@ -6,10 +6,10 @@
# Parent 81832d035e101471dcf52dd91de287268add7a91 # Parent 81832d035e101471dcf52dd91de287268add7a91
imported patch one_swizzle_to_rule_them_all.patch 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-115.0.orig/gfx/webrender_bindings/RenderCompositorSWGL.cpp
+++ firefox-102.0/gfx/webrender_bindings/RenderCompositorSWGL.cpp +++ firefox-115.0/gfx/webrender_bindings/RenderCompositorSWGL.cpp
@@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@
#include "RenderCompositorSWGL.h" #include "RenderCompositorSWGL.h"
@ -18,7 +18,7 @@ Index: firefox-102.0/gfx/webrender_bindings/RenderCompositorSWGL.cpp
#include "mozilla/widget/CompositorWidget.h" #include "mozilla/widget/CompositorWidget.h"
#ifdef MOZ_WIDGET_GTK #ifdef MOZ_WIDGET_GTK
@@ -235,6 +237,13 @@ void RenderCompositorSWGL::CommitMappedB @@ -242,6 +243,13 @@ void RenderCompositorSWGL::CommitMappedB
} }
mDT->Flush(); mDT->Flush();

8
tar_stamps
View File

@ -1,10 +1,10 @@
PRODUCT="firefox" PRODUCT="firefox"
CHANNEL="release" CHANNEL="release"
VERSION="114.0.2" VERSION="115.0"
VERSION_SUFFIX="" VERSION_SUFFIX=""
PREV_VERSION="114.0.1" PREV_VERSION="114.0.2"
PREV_VERSION_SUFFIX="" PREV_VERSION_SUFFIX=""
#SKIP_LOCALES="" # Uncomment to skip l10n and compare-locales-generation #SKIP_LOCALES="" # Uncomment to skip l10n and compare-locales-generation
RELEASE_REPO="https://hg.mozilla.org/releases/mozilla-release" RELEASE_REPO="https://hg.mozilla.org/releases/mozilla-release"
RELEASE_TAG="1378542b9001e9aeb6a5ac6f5a020886dcfdaa29" RELEASE_TAG="1c2603279ac3bf5c442bf416ee7bf6d7d2c20d31"
RELEASE_TIMESTAMP="20230619081400" RELEASE_TIMESTAMP="20230629134642"