firefox-60.4.0-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@11984 ec354946-7b23-47d6-9f5a-488ba84defc7

f/firefox/firefox-vine-default-prefs.js

@@ -1,23 +1,36 @@
-// Vine Linux default settings
 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("general.smoothScroll",                true);
 pref("browser.shell.checkDefaultBrowser",   false);
 pref("network.manage-offline-status",       true);
-pref("dom.ipc.plugins.enabled.nswrapper*",  false);
 pref("extensions.shownSelectionUI",         true);
-pref("extensions.autoDisableScope",         0);
+pref("ui.SpellCheckerUnderlineStyle",       1);
+pref("startup.homepage_override_url",       "https://vinelinux.org/");
+pref("startup.homepage_welcome_url",        "https://vinelinux.org/");
+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", "");
+
+// Vine Linux default settings
 pref("general.useragent.vendor",            "Vine");
 pref("general.useragent.vendorSub",         "FIREFOX_RPM_VR");
+pref("dom.ipc.plugins.enabled.nswrapper*",  false);
 pref("font.default",                        "sans-serif");
-pref("intl.locale.matchOS", 		    true);
-//pref("intl.accept_languages", 		    "ja,en-us,en");
-pref("layout.spellcheckDefault", 	    0);
 pref("datareporting.policy.dataSubmissionEnabled", false);
 pref("datareporting.healthreport.logging.consoleEnabled", false);
 pref("datareporting.healthreport.uploadEnabled", false);

f/firefox/firefox-vl.spec

@@ -1,8 +1,8 @@
 %bcond_without clang
 
 # do not include minor version number in MOZILLA_FIVE_HOME
-%global ffmajor 60.3
+%global ffmajor 60.4
-%global geckomajor 60.3
+%global geckomajor 60.4
 %global ffminor 0
 %global ffversion %{ffmajor}%{?ffminor:.%{ffminor}}
 %define ffdir %{_libdir}/firefox
@@ -48,7 +48,7 @@ Source230:       mozconfig-firefox-vine6
 Source240:       mozconfig-firefox-vine7
 
 Source11:       firefox-vine-default-bookmarks.html
-#Source12:       firefox-vine-default-prefs.js
+Source12:       firefox-vine-default-prefs.js
 Source21:       firefox.vine.sh.in
 Source22:       firefox.png
 Source23:       fx-about.png
@@ -85,8 +85,6 @@ Patch402:        mozilla-1196777.patch
 Patch406:        mozilla-256180.patch
 Patch413:        mozilla-1353817.patch
 Patch415:        mozilla-1436242.patch
-# Removing this patch could lead to deletion of passwords from user profile!
-Patch416:        mozilla-1475775-key3-revert.patch
 
 
 # customization patches
@@ -188,7 +186,6 @@ cd %{tarballdir}
 # This needs to stay for the future releases
 %if 0%{?rhel} < 8
 %patch230 -p1 -b .1503632-nss
-%patch416 -R -p1 -b .1475775-key3-revert
 %endif
 
 %patch402 -p1 -b .1196777
@@ -325,7 +322,6 @@ cd %{tarballdir}
 # Make sure locale works for langpacks
 %{__cat} > objdir/dist/bin/browser/defaults/preferences/firefox-l10n.js << EOF
 pref("general.useragent.locale", "chrome://global/locale/intl.properties");
-pref("intl.locale.requested", "ja");
 EOF
 
 export MOZ_APP_DISPLAYNAME="Fx Browser"
@@ -414,12 +410,21 @@ for langpack in `ls firefox-langpacks/*.xpi`; do
   sed -i -e "s|browser.startup.homepage.*$|browser.startup.homepage=%{homepage}|g;" \
      $extensionID/browser/chrome/$language/locale/branding/browserconfig.properties
 
-  sed -i \
+  if [ $language = "ja" ]; then
-     -e "s|Mozilla Firefox|Fx ウェブブラウザ|g" \
+    sed -i \
-     -e "s|Firefox|Fx ウェブブラウザ|g" \
+      -e "s|Mozilla Firefox|Fx ウェブブラウザ|g" \
-     -e "s|Mozilla|Project Vine|g" \
+      -e "s|Firefox|Fx ウェブブラウザ|g" \
-     -e 's|\(.*trademarkInfo.part1.*"\).*">|\1Vine Linux および Vine Linux ロゴは Project Vine および有限会社ヴァインカーブの日本およびその他の国における商標です。">|g' \
+      -e "s|Mozilla|Project Vine|g" \
-     $extensionID/browser/chrome/$language/locale/branding/brand.*
+      -e 's|\(.*trademarkInfo.part1.*"\).*">|\1Vine Linux および Vine Linux ロゴは Project Vine および有限会社ヴァインカーブの日本およびその他の国における商標です。">|g' \
+      $extensionID/browser/chrome/$language/locale/branding/brand.*
+  else
+    sed -i \
+      -e "s|Mozilla Firefox|Fx Browser|g" \
+      -e "s|Firefox|Fx Browser|g" \
+      -e "s|Mozilla|Project Vine|g" \
+      -e 's|\(.*trademarkInfo.part1.*"\).*">|\1Vine Linux and the Vine Linux logos are trademarks of Project Vine and Vine Caves Ltd.">|g' \
+      $extensionID/browser/chrome/$language/locale/branding/brand.*
+  fi
 
   %{__cp} -p %{SOURCE11} $extensionID/browser/chrome/$language/locale/browser/bookmarks.html
 
@@ -436,8 +441,11 @@ done
 # Keep compatibility with the old preference location 
 %{__mkdir_p} $RPM_BUILD_ROOT/%{ffdir}/defaults/preferences
 %{__mkdir_p} $RPM_BUILD_ROOT/%{ffdir}/browser/defaults
-ln -s %{ffdir}/defaults/preferences $RPM_BUILD_ROOT/%{ffdir}/browser/defaults/pref
+ln -s %{mozappdir}/defaults/preferences $RPM_BUILD_ROOT/%{mozappdir}/browser/defaults/preferences
-
+# Default preferences
+%{__cat} %{SOURCE12} | %{__sed} -e 's,FIREFOX_RPM_VR,%{ffversion}-%{release},g' > vine-default-prefs
+%{__cp} vine-default-prefs %{buildroot}%{mozappdir}/defaults/preferences/all-vine.js
+rm -f vine-default-prefs
 
 # System extensions
 %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/mozilla/extensions/%{firefox_app_id}
@@ -515,6 +523,12 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Wed Dec 12 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 60.4.0-1
+- updated to 60.4.0.
+- updated branding informations in language packs.
+- re-added default profiles.
+- dropped Patch416: fixed in upstream.
+
 * Thu Dec 06 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 60.3.0-1
 - updated to 60.3.0.
 - dropped patches.