From 25eeed60a98b95a9ef8a1a0eb5962ffd46ef0a6b Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Mon, 1 Apr 2024 08:35:49 +0000 Subject: [PATCH] Revert EuroLinux modifications --- SOURCES/distribution.ini | 10 +++++----- ...refs.js => firefox-redhat-default-prefs.js} | 18 +++++------------- SPECS/firefox.spec | 12 +----------- 3 files changed, 11 insertions(+), 29 deletions(-) rename SOURCES/{firefox-eurolinux-default-prefs.js => firefox-redhat-default-prefs.js} (70%) diff --git a/SOURCES/distribution.ini b/SOURCES/distribution.ini index 9a0d9ab..11f1f96 100644 --- a/SOURCES/distribution.ini +++ b/SOURCES/distribution.ini @@ -1,9 +1,9 @@ [Global] -id=eurolinux +id=fedora version=1.0 -about=Mozilla Firefox for EuroLinux +about=Mozilla Firefox for Fedora [Preferences] -app.distributor=eurolinux -app.distributor.channel=eurolinux -app.partner.fedora=eurolinux +app.distributor=fedora +app.distributor.channel=fedora +app.partner.fedora=fedora diff --git a/SOURCES/firefox-eurolinux-default-prefs.js b/SOURCES/firefox-redhat-default-prefs.js similarity index 70% rename from SOURCES/firefox-eurolinux-default-prefs.js rename to SOURCES/firefox-redhat-default-prefs.js index 8e25416..cdb98dd 100644 --- a/SOURCES/firefox-eurolinux-default-prefs.js +++ b/SOURCES/firefox-redhat-default-prefs.js @@ -2,7 +2,7 @@ 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("intl.locale.requested", ""); pref("toolkit.storage.synchronous", 0); pref("toolkit.networkmanager.disable", false); pref("offline.autoDetect", true); @@ -14,18 +14,15 @@ pref("browser.shell.checkDefaultBrowser", false); pref("network.manage-offline-status", true); pref("extensions.shownSelectionUI", true); pref("ui.SpellCheckerUnderlineStyle", 1); -pref("startup.homepage_override_url", "https://euro-linux.com"); -pref("startup.homepage_welcome_url", "https://euro-linux.com"); +pref("startup.homepage_override_url", "%HOMEPAGE%"); +pref("startup.homepage_welcome_url", "%HOMEPAGE%"); 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.autoupdate",true); pref("media.gmp-gmpopenh264.enabled",false); +pref("media.gmp.decoder.enabled", true); 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); @@ -37,10 +34,5 @@ pref("browser.policies.perUserDir", true); pref("browser.gnome-search-provider.enabled",true); /* Enable ffvpx playback for WebRTC */ pref("media.navigator.mediadatadecoder_vpx_enabled", true); -/* 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); -pref("datareporting.healthreport.uploadEnabled", false); -pref("datareporting.policy.dataSubmissionEnabled", false); -pref("toolkit.telemetry.archive.enabled", false); diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec index 8ed8a8d..e1ecc12 100644 --- a/SPECS/firefox.spec +++ b/SPECS/firefox.spec @@ -168,7 +168,7 @@ Source1: firefox-langpacks-%{version}%{?pre_version}-20240322.tar.xz Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball Source10: firefox-mozconfig -Source12: firefox-eurolinux-default-prefs.js +Source12: firefox-redhat-default-prefs.js Source20: firefox.desktop Source21: firefox.sh.in Source23: firefox.1 @@ -1742,16 +1742,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog -* Wed Mar 27 2024 EuroLinux Autopatch -- Ran Regex: firefox-centos-default-prefs.js => firefox-eurolinux-default-prefs.js ---> Change firefox-centos-default-prefs.js to firefox-eurolinux-default-prefs.js -- Ran Regex: firefox-redhat-default-prefs.js => firefox-eurolinux-default-prefs.js ---> Change firefox-redhat-default-prefs.js to firefox-eurolinux-default-prefs.js -- Replaced Source: distribution.ini ---> Replace RHEL distribution.ini branding with EuroLinux -- Replaced Source: firefox-eurolinux-default-prefs.js ---> Replace firefox-eurolinux-default-prefs.js inplace - * Fri Mar 22 2024 Eike Rathke - 115.9.1-1 - Update to 115.9.1