1
0

Accepting request 943041 from mozilla:Factory

- Add upstream patches:
  * mozilla-bmo1745560.patch: Fix build against wayland 1.20.
  * mozilla-bmo1744896.patch: Create WaylandVsyncSource on window
    creation

- Mozilla Firefox 95.0.2
  * Addresses frequent crashes experienced by users with C/E/Z-Series
    "Bobcat" CPUs running on Windows 7, 8, and 8.1.
- updated constraints for ppc and x86-64

OBS-URL: https://build.opensuse.org/request/show/943041
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/MozillaFirefox?expand=0&rev=353
This commit is contained in:
Dominique Leuenberger 2021-12-30 14:55:28 +00:00 committed by Git OBS Bridge
commit 2f267289f4
11 changed files with 106 additions and 28 deletions

View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Tue Dec 28 17:45:28 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
- Add upstream patches:
* mozilla-bmo1745560.patch: Fix build against wayland 1.20.
* mozilla-bmo1744896.patch: Create WaylandVsyncSource on window
creation
-------------------------------------------------------------------
Mon Dec 20 21:57:30 UTC 2021 - Wolfgang Rosenauer <wr@rosenauer.org>
- Mozilla Firefox 95.0.2
* Addresses frequent crashes experienced by users with C/E/Z-Series
"Bobcat" CPUs running on Windows 7, 8, and 8.1.
- updated constraints for ppc and x86-64
-------------------------------------------------------------------
Fri Dec 17 13:49:16 UTC 2021 - Wolfgang Rosenauer <wr@rosenauer.org>

View File

@ -29,8 +29,8 @@
# major 69
# mainver %major.99
%define major 95
%define mainver %major.0.1
%define orig_version 95.0.1
%define mainver %major.0.2
%define orig_version 95.0.2
%define orig_suffix %{nil}
%define update_channel release
%define branding 1
@ -223,6 +223,8 @@ Patch27: mozilla-s390x-skia-gradient.patch
Patch28: mozilla-libavcodec58_91.patch
Patch29: mozilla-silence-no-return-type.patch
Patch31: mozilla-bmo531915.patch
Patch32: mozilla-bmo1745560.patch
Patch33: mozilla-bmo1744896.patch
# Firefox/browser
Patch101: firefox-kde.patch
Patch102: firefox-branded-icons.patch
@ -351,6 +353,8 @@ cd $RPM_BUILD_DIR/%{srcname}-%{orig_version}
%patch28 -p1
%patch29 -p1
%patch31 -p1
%patch32 -p1
%patch33 -p1
# Firefox
%patch101 -p1
%patch102 -p1

View File

@ -51,7 +51,7 @@
</conditions>
<hardware>
<memory>
<size unit="G">16</size>
<size unit="G">18</size>
</memory>
</hardware>
</overwrite>
@ -62,10 +62,10 @@
</conditions>
<hardware>
<disk>
<size unit="G">25</size>
<size unit="G">36</size>
</disk>
<physicalmemory>
<size unit="G">10</size>
<size unit="G">11</size>
</physicalmemory>
<memoryperjob>
<size unit="M">2500</size>

View File

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

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEQ2D+IQnEl2MYb44h6+QekPbxL20FAmG6cDsACgkQ6+QekPbx
L23AUA//b+3rVDwFhnVfbLATnYBcsIYBdlyD/I5nzEnBlQlB2+MyNikcw9QdwSiK
0tsYEr8IAtS67j+hcikk01au5QJarcgC6fnEAa/jtJ2iaktPS0We+nBIPtlN9zdb
vl1yap33tZfKIx9eoHgQQ8G4gWB/Os6BRYweffDhaOnc0d7W1jE+Cd0BLpTq/y9X
erqRAoUGWr7bUEkOeN5YlqgV0WMaJC2hXQNCWslcqm9RcpsoOHrNqnD7uhuEKl4W
jdAJUv2mGzFbXprh3WL1OTCKQcFzh18qwES9RkRbUIiWSlzwyNHPdE2p3aKLdBYu
M+2PsKmLOuicD4kwcsbx+MbiVa0Ypk1gKiq6B+SHTi4bri9vgTX9ynoIbIWDO6qZ
WcJC2q8JzPP3xjvecXY1Wyg87FKB3hjt/Kkp/ti3k9/Oyuc36ujGzGePfBFvoj9h
fTSqSxWESp8eWUjMa9zWVb38bfDfeZH+C994X6m9ZRYM4YPnOdq/LaV2ML69K8iC
dAGdSAl+pSPh0pWfyLS6oa1McBImahUZVKZRgkeeL9ZA91HZtAc29PbMQAxlq5XB
9/6E5GSaUAPcZLqkg81NkV4uXzKWxaUOouyNaFBCrKcAJDhq5ApsLGdKGA8ES5Yg
VpW6UzMlIHn15pXDCnDMRBqDY4KrEDTCwqv+jdpgbgW1DOxJDaU=
=TuCE
-----END PGP SIGNATURE-----

View File

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

View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEQ2D+IQnEl2MYb44h6+QekPbxL20FAmG+SckACgkQ6+QekPbx
L23tPRAAqGSghR7WZBqehxYjaUKqSEUyB1+nGXzZKkHSSHoQRHoy8afbCtzXGiC0
5MC9rPnsnsSm3nsgJcof/0lJzbLH6zFqOUCVkIhA/ynJIGGhYo7MEpH8/DlJtppV
j0l3JYPcKWw6tzXsiXVgCYmQYKqpT+kyhm6cxTOyg24MvgYGApIOEY2D992EUi24
dE+JDV4fEjnD5/r2RJPG4GMDvGYFFsY6Y5qkGCP4C6VgPanmSBolB/CaoqhJdyG5
FdC4m1DE6/p1k30tMWwtaKyXfGaHyENqGU+KNDkgqY2HMqZzzAYiNkQjtb67WwLn
dpuNTmCoq05JAgaJuA5fn0lf4ZwwP3Dhk8XF9V1Rx+8YLiH/S9RnRAdmEZpdbmOy
yvg8jBrIQUe0EojSg4qCcG1gtvWLZVlG7ODewkz5sOch/0TbEy2bBWjbwC7UnAC2
XDnHgBT2FRzfMp1mDSuV5F74uIICjoDHpAmGtc+1bjBX4JtQtyB+CWl5PiP0a3al
8qCtVI9EMo9P4L7ooU5L+ByoA6+1DpQChCkCAhB/3QAhUdkwzE4EnYNsYIgzSnzw
SWftC2M1OA0h31vWn062ewCaG+KHne2lKfActDbu09rUxMBhunfJZmsmh3ttnEJT
Xuj51c6f8gFc1yRFzbDu7ZgxP9O2BxvLFvemc9v/PyVmUQeLpLk=
=Q1X4
-----END PGP SIGNATURE-----

43
mozilla-bmo1744896.patch Normal file
View File

@ -0,0 +1,43 @@
diff -up firefox-95.0.2/widget/gtk/nsWindow.cpp.1744896 firefox-95.0.2/widget/gtk/nsWindow.cpp
--- firefox-95.0.2/widget/gtk/nsWindow.cpp.1744896 2021-12-23 11:54:31.522539340 +0100
+++ firefox-95.0.2/widget/gtk/nsWindow.cpp 2021-12-23 11:55:56.070270174 +0100
@@ -5765,6 +5765,17 @@ nsresult nsWindow::Create(nsIWidget* aPa
}
}
#endif
+#ifdef MOZ_WAYLAND
+ // Initialize the window specific VsyncSource early in order to avoid races
+ // with BrowserParent::UpdateVsyncParentVsyncSource().
+ // Only use for toplevel windows for now, see bug 1619246.
+ if (GdkIsWaylandDisplay() &&
+ StaticPrefs::widget_wayland_vsync_enabled_AtStartup() &&
+ mWindowType == eWindowType_toplevel) {
+ mWaylandVsyncSource = new WaylandVsyncSource();
+ MOZ_RELEASE_ASSERT(mWaylandVsyncSource);
+ }
+#endif
// We create input contexts for all containers, except for
// toplevel popup windows
@@ -6077,19 +6088,12 @@ void nsWindow::ResumeCompositorFromCompo
void nsWindow::WaylandStartVsync() {
#ifdef MOZ_WAYLAND
- // only use for toplevel windows for now - see bug 1619246
- if (!GdkIsWaylandDisplay() ||
- !StaticPrefs::widget_wayland_vsync_enabled_AtStartup() ||
- mWindowType != eWindowType_toplevel) {
+ if (!mWaylandVsyncSource) {
return;
}
LOG("nsWindow::WaylandStartVsync() [%p]\n", (void*)this);
- if (!mWaylandVsyncSource) {
- mWaylandVsyncSource = new WaylandVsyncSource();
- }
-
WaylandVsyncSource::WaylandDisplay& display =
static_cast<WaylandVsyncSource::WaylandDisplay&>(
mWaylandVsyncSource->GetGlobalDisplay());

15
mozilla-bmo1745560.patch Normal file
View File

@ -0,0 +1,15 @@
diff --git a/widget/gtk/mozwayland/mozwayland.c b/widget/gtk/mozwayland/mozwayland.c
--- a/widget/gtk/mozwayland/mozwayland.c
+++ b/widget/gtk/mozwayland/mozwayland.c
@@ -200,3 +200,10 @@
MOZ_EXPORT void wl_list_insert_list(struct wl_list* list,
struct wl_list* other) {}
+
+MOZ_EXPORT struct wl_proxy* wl_proxy_marshal_flags(
+ struct wl_proxy* proxy, uint32_t opcode,
+ const struct wl_interface* interface, uint32_t version, uint32_t flags,
+ ...) {
+ return NULL;
+}

View File

@ -1,10 +1,10 @@
PRODUCT="firefox"
CHANNEL="release"
VERSION="95.0.1"
VERSION="95.0.2"
VERSION_SUFFIX=""
PREV_VERSION="95.0"
PREV_VERSION="95.0.1"
PREV_VERSION_SUFFIX=""
#SKIP_LOCALES="" # Uncomment to skip l10n and compare-locales-generation
RELEASE_REPO="https://hg.mozilla.org/releases/mozilla-release"
RELEASE_TAG="5a1a2f3b06c23a27532ba48f9999c59c643f3f36"
RELEASE_TIMESTAMP="20211129150630"
RELEASE_TAG="1ff2cec0bb36e389df1a209a9f882b443ed48495"
RELEASE_TIMESTAMP="20211218203254"