From cff6c368ac25156f518d046074c34f3fb255439b Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: Feb 14 2022 14:18:00 +0000 Subject: Manual CentOS Debranding --- diff --git a/SOURCES/firefox-redhat-default-prefs.js b/SOURCES/firefox-redhat-default-prefs.js deleted file mode 100644 index 9ead3a2..0000000 --- a/SOURCES/firefox-redhat-default-prefs.js +++ /dev/null @@ -1,35 +0,0 @@ -pref("app.update.auto", false); -pref("app.update.enabled", false); -pref("app.update.autoInstallEnabled", false); -pref("general.smoothScroll", true); -pref("intl.locale.matchOS", true); -pref("toolkit.storage.synchronous", 0); -pref("toolkit.networkmanager.disable", false); -pref("offline.autoDetect", true); -pref("browser.backspace_action", 2); -pref("browser.display.use_system_colors", true); -pref("browser.download.folderList", 1); -pref("browser.link.open_external", 3); -pref("browser.shell.checkDefaultBrowser", false); -pref("network.manage-offline-status", true); -pref("extensions.shownSelectionUI", true); -pref("ui.SpellCheckerUnderlineStyle", 1); -pref("startup.homepage_override_url", "http://www.redhat.com"); -pref("startup.homepage_welcome_url", "http://www.redhat.com"); -pref("browser.startup.homepage", "data:text/plain,browser.startup.homepage=file:///%PREFIX%/share/doc/HTML/index.html"); -pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%"); -pref("media.gmp-gmpopenh264.provider.enabled",false); -pref("media.gmp-gmpopenh264.autoupdate",false); -pref("media.gmp-gmpopenh264.enabled",false); -pref("media.gmp-gmpopenh264.enabled",false); -pref("plugins.notifyMissingFlash", false); -/* See https://bugzilla.redhat.com/show_bug.cgi?id=1226489 */ -pref("browser.display.use_system_colors", false); -pref("layers.use-image-offscreen-surfaces", false); -/* Allow sending credetials to all https:// sites */ -pref("network.negotiate-auth.trusted-uris", "https://"); -pref("security.use_sqldb", false); -/* Use OS settings for UI language */ -pref("intl.locale.requested", ""); -/* See https://bugzilla.redhat.com/show_bug.cgi?id=1672424 */ -pref("storage.nfs_filesystem", true); \ No newline at end of file diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec index 1895c9e..0694645 100644 --- a/SPECS/firefox.spec +++ b/SPECS/firefox.spec @@ -207,6 +207,12 @@ Patch515: mozilla-bmo1626236.patch Patch518: D110204-fscreen.diff # Flatpak patches + +# CentOS patches +%if 0%{?centos} +Patch10000: Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch +Patch10001: Bug-1526653---fix_user_vfp_armv7.patch +%endif %if %{?system_nss} %if !0%{?bundle_nss} @@ -464,6 +470,13 @@ echo "use_rustts %{?use_rustts}" %endif %endif +%if 0%{?centos} +%ifarch %{arm} +%patch 10000 -p1 -b .centos.armhfp +%patch 10001 -p1 -b .centos.armhfp2 +%endif +%endif + %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig %if %{official_branding}