import firefox-78.12.0-1.el8_4

.firefox.metadata

 18a8f30a0356c751b8d0ea6f76e764cab13ee046 SOURCES/Python-2.7.13.tar.xz
 a9effcc06cf80eaa22f12c1f7d6aa4266a1c4966 SOURCES/cbindgen-vendor-0.14.3.tar.xz
-79b6254bfcbb3c257ffed71b4abbf2c7107725fb SOURCES/firefox-78.7.1esr.source.tar.xz
-bf1cd174d728653d13e27f293afc2092bfc7f8d4 SOURCES/firefox-langpacks-78.7.1esr-20210209.tar.xz
+83ae378d8bddd9efc5badb99a6246979313f7134 SOURCES/firefox-78.12.0esr.source.tar.xz
+a469453c2e84de2a22dccdb53ab8ca997cddd127 SOURCES/firefox-langpacks-78.12.0esr-20210707.tar.xz
 0de63f863b158454b9429234b52ed28a397ec45c SOURCES/gtk3-private-3.22.26-1.el6.src.rpm
 e188ab1a444697bc649e223c28389d82ca94c472 SOURCES/libffi-3.0.13-18.el7_3.src.rpm
 5715f987bc0024ce5d72993cb101b8268350033b SOURCES/nodejs-10.21.0-5.fc32.src.rpm

.gitignore

 SOURCES/Python-2.7.13.tar.xz
 SOURCES/cbindgen-vendor-0.14.3.tar.xz
-SOURCES/firefox-78.7.1esr.source.tar.xz
-SOURCES/firefox-langpacks-78.7.1esr-20210209.tar.xz
+SOURCES/firefox-78.12.0esr.source.tar.xz
+SOURCES/firefox-langpacks-78.12.0esr-20210707.tar.xz
 SOURCES/gtk3-private-3.22.26-1.el6.src.rpm
 SOURCES/libffi-3.0.13-18.el7_3.src.rpm
 SOURCES/nodejs-10.21.0-5.fc32.src.rpm

SOURCES/D110204-fscreen.diff

+diff -up firefox-78.9.0/widget/gtk/nsWindow.cpp.D110204-fscreen firefox-78.9.0/widget/gtk/nsWindow.cpp
+--- firefox-78.9.0/widget/gtk/nsWindow.cpp.D110204-fscreen	2021-03-30 13:28:56.212009697 +0200
++++ firefox-78.9.0/widget/gtk/nsWindow.cpp	2021-03-30 13:37:41.925850585 +0200
+@@ -139,6 +139,7 @@ using namespace mozilla::widget;
+ 
+ #include <dlfcn.h>
+ #include "nsPresContext.h"
++#include "nsIBrowserHandler.h"
+ 
+ using namespace mozilla;
+ using namespace mozilla::gfx;
+@@ -416,6 +417,7 @@ nsWindow::nsWindow() {
+   mRetryPointerGrab = false;
+   mWindowType = eWindowType_child;
+   mSizeState = nsSizeMode_Normal;
++  mPendingFullscreen = false;
+   mBoundsAreValid = true;
+   mAspectRatio = 0.0f;
+   mAspectRatioSaved = 0.0f;
+@@ -3887,6 +3889,19 @@ void nsWindow::OnWindowStateEvent(GtkWid
+       }
+     }
+   }
++
++  // Hack to ensure window switched to fullscreen - avoid to fail when starting
++  // in kiosk mode
++  if (mPendingFullscreen &&
++      !(aEvent->new_window_state & GDK_WINDOW_STATE_FULLSCREEN)) {
++    LOG(
++        ("  Window should be fullscreen, but it's not, retrying set to "
++         "fullscreen.\n"));
++    MakeFullScreen(true);
++  } else {
++    LOG(("  Window successfully switched to fullscreen, happy now\n"));
++    mPendingFullscreen = false;
++  }
+ }
+ 
+ void nsWindow::ThemeChanged() {
+@@ -6010,6 +6025,19 @@ nsresult nsWindow::MakeFullScreen(bool a
+       }
+     }
+ 
++    // if in kiosk, ensure the fullscreen is called
++    nsCOMPtr<nsIBrowserHandler> browserHandler =
++        do_GetService("@mozilla.org/browser/clh;1");
++    if (browserHandler) {
++      bool isKiosk;
++      browserHandler->GetKiosk(&isKiosk);
++      if (isKiosk) {
++        LOG(("  is kiosk, ensure the window switch to fullscreen\n"));
++        mPendingFullscreen = true;
++      }
++    } else {
++      LOG(("  Cannot find the browserHandler service.\n"));
++    }
+     gtk_window_fullscreen(GTK_WINDOW(mShell));
+   } else {
+     mSizeMode = mLastSizeMode;
+diff -up firefox-78.9.0/widget/gtk/nsWindow.h.D110204-fscreen firefox-78.9.0/widget/gtk/nsWindow.h
+--- firefox-78.9.0/widget/gtk/nsWindow.h.D110204-fscreen	2021-03-15 16:52:42.000000000 +0100
++++ firefox-78.9.0/widget/gtk/nsWindow.h	2021-03-30 13:28:56.237009784 +0200
+@@ -703,6 +703,7 @@ class nsWindow final : public nsBaseWidg
+   nsRect mPreferredPopupRect;
+   bool mPreferredPopupRectFlushed;
+   bool mWaitingForMoveToRectCB;
++  bool mPendingFullscreen;
+   LayoutDeviceIntRect mPendingSizeRect;
+ 
+   /**

SOURCES/mozilla-1703636-slot-fail-workaround.patch

+diff -up firefox-78.9.0/security/certverifier/NSSCertDBTrustDomain.cpp.slot-fail firefox-78.9.0/security/certverifier/NSSCertDBTrustDomain.cpp
+--- firefox-78.9.0/security/certverifier/NSSCertDBTrustDomain.cpp.slot-fail	2021-04-08 08:02:13.879018493 +0200
++++ firefox-78.9.0/security/certverifier/NSSCertDBTrustDomain.cpp	2021-04-08 08:05:56.713623197 +0200
+@@ -118,7 +118,7 @@ static Result FindRootsWithSubject(Uniqu
+     CERTCertificateList* rawResults = nullptr;
+     if (PK11_FindRawCertsWithSubject(rootsModule->slots[slotIndex], &subject,
+                                      &rawResults) != SECSuccess) {
+-      return Result::FATAL_ERROR_LIBRARY_FAILURE;
++      continue;
+     }
+     // rawResults == nullptr means we didn't find any matching certificates
+     if (!rawResults) {

SPECS/firefox.spec

@@ -6,31 +6,26 @@
 %global debug_package %{nil}
 %endif
 
-%global rhel_minor_version -1
-%if 0%{?flatpak:1}
-%global rhel_minor_version 4
-%endif
-%if "%{?dist}" == ".el8"
-%global rhel_minor_version 4
-%endif
-%if "%{?dist}" == ".el8_3"
-%global rhel_minor_version 3
-%endif
-%if "%{?dist}" == ".el8_2"
-%global rhel_minor_version 2
-%endif
-%if "%{?dist}" == ".el8_1"
-%global rhel_minor_version 1
-%endif
-%if "%{?dist}" == ".el8_0"
-%global rhel_minor_version 0
-%endif
+%{lua:
+function dist_to_rhel_minor(str, start)
+  match = string.match(str, ".module%+el8.%d+")
+  if match then
+     return string.sub(match, 13)
+  end
+  match = string.match(str, ".el8_%d+")
+  if match then
+     return string.sub(match, 6)
+  end
+  return -1
+end}
+
+%global rhel_minor_version %{lua:print(dist_to_rhel_minor(rpm.expand("%dist")))}
 
 %global system_nss        1
 %global bundle_nss        0
 
 %if 0%{?rhel} == 8
-  %if 0%{?rhel_minor_version} < 2
+  %if %{rhel_minor_version} < 2
 %global bundle_nss        1
   %endif
 %endif
@@ -131,7 +126,7 @@
 
 #%global default_bookmarks_file  %{_datadir}/bookmarks/default-bookmarks.html
 # need to use full path because of flatpak where datadir is /app/share
-%global default_bookmarks_file  %{_prefix}/share/bookmarks/default-bookmarks.html
+%global default_bookmarks_file  /usr/share/bookmarks/default-bookmarks.html
 %global firefox_app_id  \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
 # Minimal required versions
 %global cairo_version 1.13.1
@@ -164,7 +159,7 @@
 %define use_bundled_yasm        0
 
 %if 0%{?rhel} == 8
-  %if 0%{?rhel_minor_version} <= 2
+  %if %{rhel_minor_version} <= 2
 %define use_bundled_nodejs      1
   %endif
 %endif
@@ -215,7 +210,7 @@
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
-Version:        78.7.1
+Version:        78.12.0
 Release:        1%{?dist}
 URL:            https://www.mozilla.org/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -228,7 +223,7 @@ ExclusiveArch:  i686 x86_64 ppc64 s390x
 
 Source0:        https://hg.mozilla.org/releases/mozilla-release/archive/firefox-%{version}%{?pre_version}.source.tar.xz
 %if %{build_langpacks}
-Source1:        firefox-langpacks-%{version}%{?pre_version}-20210209.tar.xz
+Source1:        firefox-langpacks-%{version}%{?pre_version}-20210707.tar.xz
 %endif
 Source2:        cbindgen-vendor-0.14.3.tar.xz
 Source10:       firefox-mozconfig
@@ -307,6 +302,8 @@ Patch513:        mozilla-bmo998749.patch
 Patch514:        mozilla-s390x-skia-gradient.patch
 Patch515:        mozilla-bmo1626236.patch
 Patch516:        D87019-thin-vec-big-endian.diff
+Patch517:        mozilla-1703636-slot-fail-workaround.patch
+Patch518:        D110204-fscreen.diff
 
 
 # CentOS patches
@@ -419,7 +416,7 @@ BuildRequires:  openssl-devel
 %endif
 
 %if 0%{?rhel} == 8
-  %if 0%{?rhel_minor_version} >= 3
+  %if %{rhel_minor_version} >= 3
 BuildRequires:  pkgconfig(libpipewire-0.3)
   %else
 BuildRequires:  pipewire-devel
@@ -601,7 +598,7 @@ https://extensions.gnome.org.
 %prep
 echo "Build environment"
 echo "dist                  %{?dist}"
-echo "RHEL 8 minor version: %{?rhel_minor_version}"
+echo "RHEL 8 minor version: %{rhel_minor_version}"
 echo "use_bundled_ffi       %{?use_bundled_ffi}"
 echo "use_bundled_python_2  %{?use_bundled_python_2}"
 echo "use_bundled_python_3  %{?use_bundled_python_3}"
@@ -647,7 +644,7 @@ sed -ie 's|/usr/include|/app/include|' %_sourcedir/firefox-pipewire-0-3.patch
 %endif
 
 %if 0%{?rhel} == 8
-  %if 0%{?rhel_minor_version} >= 3
+  %if %{rhel_minor_version} >= 3
 %patch235 -p1 -b .pipewire-0-3
   %else
 %patch231 -p1 -b .pipewire
@@ -681,6 +678,8 @@ sed -ie 's|/usr/include|/app/include|' %_sourcedir/firefox-pipewire-0-3.patch
 %patch514 -p1 -b .mozilla-s390x-skia-gradient
 %patch515 -p1 -b .mozilla-bmo1626236
 %patch516 -p1 -b .D87019-thin-vec-big-endian.diff
+%patch517 -p1 -b .mozilla-1703636-slot-fail-workaround
+%patch518 -p1 -b .D110204-fscreen.diff
 
 
 %patch1001 -p1 -b .ppc64le-inline
@@ -1428,6 +1427,7 @@ SentUpstream: 2014-09-22
 <application>
   <id type="desktop">firefox.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
+  <project_license>MPLv1.1 or GPLv2+ or LGPLv2+</project_license>
   <description>
     <p>
       Bringing together all kinds of awesomeness to make browsing better for you.
@@ -1685,6 +1685,27 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Wed Jul 07 2021 Eike Rathke <erack@redhat.com> - 78.12.0-1
+- Update to 78.12.0 build1
+
+* Mon May 31 2021 Eike Rathke <erack@redhat.com> - 78.11.0-3
+- Update to 78.11.0 build2 (release)
+
+* Thu May 27 2021 Eike Rathke <erack@redhat.com> - 78.11.0-2
+- Fix rhel_minor_version for dist .el8_4 and .el8
+
+* Tue May 25 2021 Eike Rathke <erack@redhat.com> - 78.11.0-1
+- Update to 78.11.0 build1
+
+* Tue Apr 20 2021 Eike Rathke <erack@redhat.com> - 78.10.0-1
+- Update to 78.10.0
+
+* Wed Mar 17 2021 Eike Rathke <erack@redhat.com> - 78.9.0-1
+- Update to 78.9.0 build1
+
+* Wed Feb 17 2021 Eike Rathke <erack@redhat.com> - 78.8.0-1
+- Update to 78.8.0 build2
+
 * Tue Feb 09 2021 Eike Rathke <erack@redhat.com> - 78.7.1-1
 - Update to 78.7.1