From dced7c2e45db854be4905678075a3717fb96c381 Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@redhat.com>
Date: Tue, 18 Aug 2020 17:22:12 +0200
Subject: [PATCH] Build fixes - spec, patches

---
 firefox-disable-ffvpx-with-vapi.patch | 2 +-
 firefox.spec                          | 4 ++--
 mozilla-1170092.patch                 | 6 +++---
 mozilla-1580174-webrtc-popup.patch    | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/firefox-disable-ffvpx-with-vapi.patch b/firefox-disable-ffvpx-with-vapi.patch
index df179b0..c46a11d 100644
--- a/firefox-disable-ffvpx-with-vapi.patch
+++ b/firefox-disable-ffvpx-with-vapi.patch
@@ -30,7 +30,7 @@ diff --git a/dom/media/platforms/PDMFactory.cpp b/dom/media/platforms/PDMFactory
  #ifdef MOZ_FFVPX
 -  if (StaticPrefs::media_ffvpx_enabled()) {
 +  if (StaticPrefs::media_ffvpx_enabled() &&
-+      !gfxPlatformGtk::GetPlatform()->UseWaylandHardwareVideoDecoding()) {
++      !gfxPlatformGtk::GetPlatform()->UseHardwareVideoDecoding()) {
      m = FFVPXRuntimeLinker::CreateDecoderModule();
      StartupPDM(m);
    }
diff --git a/firefox.spec b/firefox.spec
index cc3a51c..3e32fe6 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -82,7 +82,7 @@ ExcludeArch: s390x
 %if %{?system_nss}
 %global nspr_version 4.21
 %global nspr_build_version %{nspr_version}
-%global nss_version 3.54
+%global nss_version 3.55
 %global nss_build_version %{nss_version}
 %endif
 
@@ -628,7 +628,7 @@ MOZ_SMP_FLAGS=-j1
 
 echo "mk_add_options MOZ_MAKE_FLAGS=\"$MOZ_SMP_FLAGS\"" >> .mozconfig
 echo "mk_add_options MOZ_SERVICES_SYNC=1" >> .mozconfig
-echo "mk_add_options STRIP=/bin/true" >> .mozconfig
+echo "export STRIP=/bin/true" >> .mozconfig
 %if %{build_with_pgo}
 %if %{pgo_wayland}
 xvfb-run mutter --wayland --nested &
diff --git a/mozilla-1170092.patch b/mozilla-1170092.patch
index bb77414..49b7b49 100644
--- a/mozilla-1170092.patch
+++ b/mozilla-1170092.patch
@@ -12,7 +12,7 @@ diff -up firefox-75.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 fi
 +                                  getter_AddRefs(jsFile));
 +      NS_ENSURE_SUCCESS(rv, rv);
 +
-+      rv = jsFile->AppendNative(NS_LITERAL_CSTRING("pref"));
++      rv = jsFile->AppendNative(nsLiteralCString("pref"));
 +      NS_ENSURE_SUCCESS(rv, rv);
 +      rv = jsFile->AppendNative(nsDependentCString(aFileName));
 +      NS_ENSURE_SUCCESS(rv, rv);
@@ -54,7 +54,7 @@ diff -up firefox-75.0/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-75.0/tool
 +
 +#if defined(XP_UNIX)
 +  if (!strcmp(aProperty, NS_APP_PREFS_SYSTEM_CONFIG_DIR)) {
-+    nsCString sysConfigDir = NS_LITERAL_CSTRING("/etc/");
++    nsCString sysConfigDir = nsLiteralCString("/etc/");
 +    nsCOMPtr<nsIXULAppInfo> appInfo = do_GetService("@mozilla.org/xre/app-info;1");
 +    if (!appInfo)
 +      return NS_ERROR_NOT_AVAILABLE;
@@ -78,7 +78,7 @@ diff -up firefox-75.0/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-75.0/tool
 +    rv = NS_GetSpecialDirectory(NS_APP_PREFS_SYSTEM_CONFIG_DIR,
 +                                getter_AddRefs(systemPrefDir));
 +    if (NS_SUCCEEDED(rv)) {
-+      rv = systemPrefDir->AppendNative(NS_LITERAL_CSTRING("pref"));
++      rv = systemPrefDir->AppendNative(nsLiteralCString("pref"));
 +      if (NS_SUCCEEDED(rv))
 +        directories.AppendObject(systemPrefDir);
 +    }
diff --git a/mozilla-1580174-webrtc-popup.patch b/mozilla-1580174-webrtc-popup.patch
index 2d154eb..f2c45b5 100644
--- a/mozilla-1580174-webrtc-popup.patch
+++ b/mozilla-1580174-webrtc-popup.patch
@@ -9,7 +9,7 @@ diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
 +  // Check if the popup is autocomplete (like tags autocomplete
 +  // in the bookmark edit popup).
 +  nsAtom* popupId = aMenuPopupFrame->GetContent()->GetID();
-+  if (popupId && popupId->Equals(NS_LITERAL_STRING("PopupAutoComplete"))) {
++  if (popupId && popupId->Equals(NS_LITERAL_STRING_FROM_CSTRING("PopupAutoComplete"))) {
 +    return true;
 +  }
 +