From c3beecb585ef0a54d97c8341e614b6d65be7ac89 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 02 2022 07:14:01 +0000 Subject: import firefox-91.12.0-2.module+el8.6.0+16051+0e389879 --- diff --git a/.firefox.metadata b/.firefox.metadata index 4a1ead1..8f79761 100644 --- a/.firefox.metadata +++ b/.firefox.metadata @@ -1,5 +1,5 @@ c822547dbc12e2baebdfdfb38b665e23f0c2513a SOURCES/cbindgen-vendor.tar.xz -72b64cbe7b2aa6dbf64c1db0d122a57b06189e66 SOURCES/firefox-91.10.0esr.processed-source.tar.xz -72ea5a3b4889eb3b12f37b14fad621f7b417c9fc SOURCES/firefox-langpacks-91.10.0esr-20220524.tar.xz +39f2ee46c5e34141352021b76f4f41f75d6ad6b7 SOURCES/firefox-91.12.0esr.processed-source.tar.xz +7f84818bb27b90dce6b858f2acbf64c4e35e29f3 SOURCES/firefox-langpacks-91.12.0esr-20220721.tar.xz b5fd1332d8e0d37339ae170c7bebcb63a40b22e0 SOURCES/nspr-4.32.0-1.el8_1.src.rpm 8fff814901e03c2518ede2f8992d898f5ba61ed9 SOURCES/nss-3.67.0-7.el8_1.src.rpm diff --git a/.gitignore b/.gitignore index a39c447..5e1f63f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ SOURCES/cbindgen-vendor.tar.xz -SOURCES/firefox-91.10.0esr.processed-source.tar.xz -SOURCES/firefox-langpacks-91.10.0esr-20220524.tar.xz +SOURCES/firefox-91.12.0esr.processed-source.tar.xz +SOURCES/firefox-langpacks-91.12.0esr-20220721.tar.xz SOURCES/nspr-4.32.0-1.el8_1.src.rpm SOURCES/nss-3.67.0-7.el8_1.src.rpm diff --git a/README.debrand b/README.debrand deleted file mode 100644 index 01c46d2..0000000 --- a/README.debrand +++ /dev/null @@ -1,2 +0,0 @@ -Warning: This package was configured for automatic debranding, but the changes -failed to apply. diff --git a/SOURCES/D110204-fscreen.diff b/SOURCES/D110204-fscreen.diff index 99eeb3b..ce4c908 100644 --- a/SOURCES/D110204-fscreen.diff +++ b/SOURCES/D110204-fscreen.diff @@ -1,6 +1,5 @@ -diff -up firefox-91.0/widget/gtk/nsWindow.cpp.D110204-fscreen.diff firefox-91.0/widget/gtk/nsWindow.cpp ---- firefox-91.0/widget/gtk/nsWindow.cpp.D110204-fscreen.diff 2021-07-27 23:31:38.000000000 +0200 -+++ firefox-91.0/widget/gtk/nsWindow.cpp 2021-07-30 15:47:22.031795569 +0200 +--- firefox-91.11.0/widget/gtk/nsWindow.cpp.D110204-fscreen.diff 2022-06-20 21:18:51.000000000 +0200 ++++ firefox-91.11.0/widget/gtk/nsWindow.cpp 2022-06-21 12:21:44.892706641 +0200 @@ -91,6 +91,7 @@ #include "SystemTimeConverter.h" #include "WidgetUtilsGtk.h" @@ -17,7 +16,7 @@ diff -up firefox-91.0/widget/gtk/nsWindow.cpp.D110204-fscreen.diff firefox-91.0/ mAspectRatio(0.0f), mAspectRatioSaved(0.0f), mLastScrollEventTime(GDK_CURRENT_TIME), -@@ -4626,6 +4628,19 @@ void nsWindow::OnWindowStateEvent(GtkWid +@@ -4618,6 +4620,19 @@ void nsWindow::OnWindowStateEvent(GtkWid ClearTransparencyBitmap(); } } @@ -37,7 +36,7 @@ diff -up firefox-91.0/widget/gtk/nsWindow.cpp.D110204-fscreen.diff firefox-91.0/ } void nsWindow::OnDPIChanged() { -@@ -6880,6 +6895,19 @@ nsresult nsWindow::MakeFullScreen(bool a +@@ -6860,6 +6875,19 @@ nsresult nsWindow::MakeFullScreen(bool a } } @@ -57,14 +56,13 @@ diff -up firefox-91.0/widget/gtk/nsWindow.cpp.D110204-fscreen.diff firefox-91.0/ gtk_window_fullscreen(GTK_WINDOW(mShell)); } else { mSizeMode = mLastSizeMode; -diff -up firefox-91.0/widget/gtk/nsWindow.h.D110204-fscreen.diff firefox-91.0/widget/gtk/nsWindow.h ---- firefox-91.0/widget/gtk/nsWindow.h.D110204-fscreen.diff 2021-07-27 23:31:38.000000000 +0200 -+++ firefox-91.0/widget/gtk/nsWindow.h 2021-07-29 18:35:41.000639386 +0200 -@@ -763,6 +763,7 @@ class nsWindow final : public nsBaseWidg - * move-to-rect callback we store it to mNewSizeAfterMoveToRect. +--- firefox-91.11.0/widget/gtk/nsWindow.h.D110204-fscreen.diff 2022-06-21 12:21:44.894706636 +0200 ++++ firefox-91.11.0/widget/gtk/nsWindow.h 2022-06-21 12:25:20.985209461 +0200 +@@ -767,6 +767,7 @@ class nsWindow final : public nsBaseWidg + * move-to-rect callback we set mResizedAfterMoveToRect. */ bool mWaitingForMoveToRectCallback; + bool mPendingFullscreen; - LayoutDeviceIntRect mNewSizeAfterMoveToRect; + bool mResizedAfterMoveToRect; /** diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec index 2dfac10..6619e84 100644 --- a/SPECS/firefox.spec +++ b/SPECS/firefox.spec @@ -135,8 +135,8 @@ end} Summary: Mozilla Firefox Web browser Name: firefox -Version: 91.10.0 -Release: 1%{?dist} +Version: 91.12.0 +Release: 2%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ %if 0%{?rhel} == 9 @@ -160,7 +160,7 @@ ExcludeArch: aarch64 s390 ppc # Link to official tarball: https://hg.mozilla.org/releases/mozilla-release/archive/firefox-%%{version}%%{?pre_version}.source.tar.xz Source0: firefox-%{version}%{?pre_version}%{?buildnum}.processed-source.tar.xz %if %{build_langpacks} -Source1: firefox-langpacks-%{version}%{?pre_version}-20220524.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20220721.tar.xz %endif Source2: cbindgen-vendor.tar.xz @@ -1271,8 +1271,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog -* Tue Jun 21 2022 CentOS Sources - 91.10.0-1.el8.centos -- Apply debranding changes +* Thu Jul 21 2022 Eike Rathke - 91.12.0-1 +- Update to 91.12.0 build1 + +* Thu Jun 23 2022 Eike Rathke - 91.11.0-2 +- Update to 91.11.0 build2 + +* Tue Jun 21 2022 Eike Rathke - 91.11.0-1 +- Update to 91.11.0 build1 * Tue May 24 2022 Eike Rathke - 91.10.0-1 - Update to 91.10.0 build1