From 676b701984824f9e527444c3ef633715d1b9fe8a Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Tue, 18 Apr 2017 10:57:31 +0200 Subject: [PATCH 1/3] Resolves: #1403970 some images rendered as dark because of buggy color profiles (stop overriding gfx.color_management.enablev4 pref) --- firefox-redhat-default-prefs.js | 1 - firefox.spec | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/firefox-redhat-default-prefs.js b/firefox-redhat-default-prefs.js index a62532d..e97a4cf 100644 --- a/firefox-redhat-default-prefs.js +++ b/firefox-redhat-default-prefs.js @@ -13,7 +13,6 @@ pref("browser.link.open_external", 3); pref("browser.shell.checkDefaultBrowser", false); pref("network.manage-offline-status", true); pref("extensions.shownSelectionUI", true); -pref("gfx.color_management.enablev4", true); pref("ui.SpellCheckerUnderlineStyle", 1); pref("startup.homepage_override_url", ""); pref("browser.startup.homepage", "data:text/plain,browser.startup.homepage=http://start.fedoraproject.org/"); diff --git a/firefox.spec b/firefox.spec index 758c884..fbbba2b 100644 --- a/firefox.spec +++ b/firefox.spec @@ -837,6 +837,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : * Tue Apr 18 2017 Martin Stransky - 53.0-1 - Updated to 53.0 (B6) +* Tue Apr 18 2017 Jan Horak - 52.0.2-3 +- Do not use color management until it is fixed for some broken profiles, + ie. don't set gfx.color_management.enablev4 to true (rhbz#1403970). + * Fri Mar 31 2017 Martin Stransky - 52.0.2-2 - Added patch for mozbz#1348576 - enable e10s by default - Added patch for mozbz#1158076 - enable dark theme by pref From e1c3854d7108dc32371cac772045f43766f10ef4 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Tue, 18 Apr 2017 11:12:05 +0200 Subject: [PATCH 2/3] Added distribution.ini file to fix mozbz#1354489 --- distribution.ini | 9 +++++++++ firefox.spec | 7 +++++++ 2 files changed, 16 insertions(+) create mode 100644 distribution.ini diff --git a/distribution.ini b/distribution.ini new file mode 100644 index 0000000..11f1f96 --- /dev/null +++ b/distribution.ini @@ -0,0 +1,9 @@ +[Global] +id=fedora +version=1.0 +about=Mozilla Firefox for Fedora + +[Preferences] +app.distributor=fedora +app.distributor.channel=fedora +app.partner.fedora=fedora diff --git a/firefox.spec b/firefox.spec index fbbba2b..b90f657 100644 --- a/firefox.spec +++ b/firefox.spec @@ -118,6 +118,7 @@ Source21: firefox.sh.in Source23: firefox.1 Source24: mozilla-api-key Source25: firefox-symbolic.svg +Source26: distribution.ini # Build patches Patch0: firefox-install-dir.patch @@ -712,6 +713,10 @@ sed -i -e "s/\[Crash Reporter\]/[Crash Reporter]\nEnabled=1/" $RPM_BUILD_ROOT/%{ # Default %{__cp} %{SOURCE12} ${RPM_BUILD_ROOT}%{mozappdir}/browser/defaults/preferences +# Add distribution.ini +%{__mkdir_p} ${RPM_BUILD_ROOT}%{mozappdir}/distribution +%{__cp} %{SOURCE26} ${RPM_BUILD_ROOT}%{mozappdir}/distribution + # Remove copied libraries to speed up build rm -f ${RPM_BUILD_ROOT}%{mozappdirdev}/sdk/lib/libmozjs.so rm -f ${RPM_BUILD_ROOT}%{mozappdirdev}/sdk/lib/libmozalloc.so @@ -781,6 +786,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{mozappdir}/browser/features/firefox@getpocket.com.xpi %{mozappdir}/browser/features/webcompat@mozilla.org.xpi %{mozappdir}/browser/features/deployment-checker@mozilla.org.xpi +%{mozappdir}/distribution/distribution.ini # That's Windows only %ghost %{mozappdir}/browser/features/aushelper@mozilla.org.xpi %attr(644, root, root) %{mozappdir}/browser/blocklist.xml @@ -840,6 +846,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : * Tue Apr 18 2017 Jan Horak - 52.0.2-3 - Do not use color management until it is fixed for some broken profiles, ie. don't set gfx.color_management.enablev4 to true (rhbz#1403970). +- Added distribution.ini file to fix mozbz#1354489 * Fri Mar 31 2017 Martin Stransky - 52.0.2-2 - Added patch for mozbz#1348576 - enable e10s by default From cf0047aa5cf8850cbc518a36b5c09ffc0e47e962 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Tue, 18 Apr 2017 11:29:21 +0200 Subject: [PATCH 3/3] nss version update --- firefox.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firefox.spec b/firefox.spec index b90f657..c4d94bd 100644 --- a/firefox.spec +++ b/firefox.spec @@ -75,7 +75,7 @@ %if %{?system_nss} %global nspr_version 4.10.10 %global nspr_build_version %(pkg-config --silence-errors --modversion nspr 2>/dev/null || echo 65536) -%global nss_version 3.29.5 +%global nss_version 3.29.3 %global nss_build_version %(pkg-config --silence-errors --modversion nss 2>/dev/null || echo 65536) %endif