From b18fda39cd00e81e3d7d9801fc9e8948405b312bab53f6ef2af74652d18d6ac0 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Wed, 29 Dec 2021 09:38:41 +0000 Subject: [PATCH 1/2] Accepting request 943030 from home:iznogood:branches:mozilla:Factory - Add upstream patches: * mozilla-bmo1745560.patch: Fix build against wayland 1.20. * mozilla-bmo1744896.patch: Create WaylandVsyncSource on window creation OBS-URL: https://build.opensuse.org/request/show/943030 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=949 --- MozillaFirefox.changes | 8 ++++++++ MozillaFirefox.spec | 4 ++++ mozilla-bmo1744896.patch | 43 ++++++++++++++++++++++++++++++++++++++++ mozilla-bmo1745560.patch | 15 ++++++++++++++ 4 files changed, 70 insertions(+) create mode 100644 mozilla-bmo1744896.patch create mode 100644 mozilla-bmo1745560.patch diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 21a8e29..885e378 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Dec 28 17:45:28 UTC 2021 - Bjørn Lie + +- Add upstream patches: + * mozilla-bmo1745560.patch: Fix build against wayland 1.20. + * mozilla-bmo1744896.patch: Create WaylandVsyncSource on window + creation + ------------------------------------------------------------------- Fri Dec 17 13:49:16 UTC 2021 - Wolfgang Rosenauer diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 699c5d6..ba81ef3 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -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 diff --git a/mozilla-bmo1744896.patch b/mozilla-bmo1744896.patch new file mode 100644 index 0000000..46b2607 --- /dev/null +++ b/mozilla-bmo1744896.patch @@ -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( + mWaylandVsyncSource->GetGlobalDisplay()); + diff --git a/mozilla-bmo1745560.patch b/mozilla-bmo1745560.patch new file mode 100644 index 0000000..d372949 --- /dev/null +++ b/mozilla-bmo1745560.patch @@ -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; ++} + From 2942ef5aafaf6617f44086e033f29a56ba214322653898d818410afae5441406 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Wed, 29 Dec 2021 10:25:00 +0000 Subject: [PATCH 2/2] - 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/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=950 --- MozillaFirefox.changes | 8 ++++++++ MozillaFirefox.spec | 4 ++-- _constraints | 6 +++--- firefox-95.0.1.source.tar.xz | 3 --- firefox-95.0.1.source.tar.xz.asc | 16 ---------------- firefox-95.0.2.source.tar.xz | 3 +++ firefox-95.0.2.source.tar.xz.asc | 16 ++++++++++++++++ l10n-95.0.1.tar.xz => l10n-95.0.2.tar.xz | 0 tar_stamps | 8 ++++---- 9 files changed, 36 insertions(+), 28 deletions(-) delete mode 100644 firefox-95.0.1.source.tar.xz delete mode 100644 firefox-95.0.1.source.tar.xz.asc create mode 100644 firefox-95.0.2.source.tar.xz create mode 100644 firefox-95.0.2.source.tar.xz.asc rename l10n-95.0.1.tar.xz => l10n-95.0.2.tar.xz (100%) diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 885e378..00b18dd 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -6,6 +6,14 @@ Tue Dec 28 17:45:28 UTC 2021 - Bjørn Lie * mozilla-bmo1744896.patch: Create WaylandVsyncSource on window creation +------------------------------------------------------------------- +Mon Dec 20 21:57:30 UTC 2021 - Wolfgang Rosenauer + +- 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 diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index ba81ef3..77e288c 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -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 diff --git a/_constraints b/_constraints index 9f171fb..ee68889 100644 --- a/_constraints +++ b/_constraints @@ -51,7 +51,7 @@ - 16 + 18 @@ -62,10 +62,10 @@ - 25 + 36 - 10 + 11 2500 diff --git a/firefox-95.0.1.source.tar.xz b/firefox-95.0.1.source.tar.xz deleted file mode 100644 index 8dafd28..0000000 --- a/firefox-95.0.1.source.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:552a2bd731921f40694a4db8ad31dce6f4e9f52035d04e7cd1f917613f803efa -size 385073408 diff --git a/firefox-95.0.1.source.tar.xz.asc b/firefox-95.0.1.source.tar.xz.asc deleted file mode 100644 index 551b5bc..0000000 --- a/firefox-95.0.1.source.tar.xz.asc +++ /dev/null @@ -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----- diff --git a/firefox-95.0.2.source.tar.xz b/firefox-95.0.2.source.tar.xz new file mode 100644 index 0000000..e5eb28b --- /dev/null +++ b/firefox-95.0.2.source.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c178cbf61979bd39a8daa9a09c6e03089da37baded692ad1f745ecfcaae74d64 +size 384674224 diff --git a/firefox-95.0.2.source.tar.xz.asc b/firefox-95.0.2.source.tar.xz.asc new file mode 100644 index 0000000..0a6bc20 --- /dev/null +++ b/firefox-95.0.2.source.tar.xz.asc @@ -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----- diff --git a/l10n-95.0.1.tar.xz b/l10n-95.0.2.tar.xz similarity index 100% rename from l10n-95.0.1.tar.xz rename to l10n-95.0.2.tar.xz diff --git a/tar_stamps b/tar_stamps index 3a17338..bc4f605 100644 --- a/tar_stamps +++ b/tar_stamps @@ -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"