rpms/firefox
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Build fixes - spec, patches

Browse Source
This commit is contained in:
Martin Stransky 2020-08-18 17:22:12 +02:00
parent 51f4268c7b
commit dced7c2e45
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firefox-disable-ffvpx-with-vapi.patch
View File

@ -30,7 +30,7 @@ diff --git a/dom/media/platforms/PDMFactory.cpp b/dom/media/platforms/PDMFactory
#ifdef MOZ_FFVPX #ifdef MOZ_FFVPX
- if (StaticPrefs::media_ffvpx_enabled()) { - if (StaticPrefs::media_ffvpx_enabled()) {
+ if (StaticPrefs::media_ffvpx_enabled() && + if (StaticPrefs::media_ffvpx_enabled() &&
+ !gfxPlatformGtk::GetPlatform()->UseWaylandHardwareVideoDecoding()) { + !gfxPlatformGtk::GetPlatform()->UseHardwareVideoDecoding()) {
m = FFVPXRuntimeLinker::CreateDecoderModule(); m = FFVPXRuntimeLinker::CreateDecoderModule();
StartupPDM(m); StartupPDM(m);
} }

4
firefox.spec
View File

@ -82,7 +82,7 @@ ExcludeArch: s390x
%if %{?system_nss} %if %{?system_nss}
%global nspr_version 4.21 %global nspr_version 4.21
%global nspr_build_version %{nspr_version} %global nspr_build_version %{nspr_version}
%global nss_version 3.54 %global nss_version 3.55
%global nss_build_version %{nss_version} %global nss_build_version %{nss_version}
%endif %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_MAKE_FLAGS=\"$MOZ_SMP_FLAGS\"" >> .mozconfig
echo "mk_add_options MOZ_SERVICES_SYNC=1" >> .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 %{build_with_pgo}
%if %{pgo_wayland} %if %{pgo_wayland}
xvfb-run mutter --wayland --nested & xvfb-run mutter --wayland --nested &

6
mozilla-1170092.patch
View File

@ -12,7 +12,7 @@ diff -up firefox-75.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 fi
+ getter_AddRefs(jsFile)); + getter_AddRefs(jsFile));
+ NS_ENSURE_SUCCESS(rv, rv); + NS_ENSURE_SUCCESS(rv, rv);
+ +
+ rv = jsFile->AppendNative(NS_LITERAL_CSTRING("pref")); + rv = jsFile->AppendNative(nsLiteralCString("pref"));
+ NS_ENSURE_SUCCESS(rv, rv); + NS_ENSURE_SUCCESS(rv, rv);
+ rv = jsFile->AppendNative(nsDependentCString(aFileName)); + rv = jsFile->AppendNative(nsDependentCString(aFileName));
+ NS_ENSURE_SUCCESS(rv, rv); + 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 defined(XP_UNIX)
+ if (!strcmp(aProperty, NS_APP_PREFS_SYSTEM_CONFIG_DIR)) { + 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"); + nsCOMPtr<nsIXULAppInfo> appInfo = do_GetService("@mozilla.org/xre/app-info;1");
+ if (!appInfo) + if (!appInfo)
+ return NS_ERROR_NOT_AVAILABLE; + 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, + rv = NS_GetSpecialDirectory(NS_APP_PREFS_SYSTEM_CONFIG_DIR,
+ getter_AddRefs(systemPrefDir)); + getter_AddRefs(systemPrefDir));
+ if (NS_SUCCEEDED(rv)) { + if (NS_SUCCEEDED(rv)) {
+ rv = systemPrefDir->AppendNative(NS_LITERAL_CSTRING("pref")); + rv = systemPrefDir->AppendNative(nsLiteralCString("pref"));
+ if (NS_SUCCEEDED(rv)) + if (NS_SUCCEEDED(rv))
+ directories.AppendObject(systemPrefDir); + directories.AppendObject(systemPrefDir);
+ } + }

2
mozilla-1580174-webrtc-popup.patch
View File

@ -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 + // Check if the popup is autocomplete (like tags autocomplete
+ // in the bookmark edit popup). + // in the bookmark edit popup).
+ nsAtom* popupId = aMenuPopupFrame->GetContent()->GetID(); + 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; + return true;
+ } + }
+ +