From 749682abcb107b2ae7f940658bfe66f7b2867e89 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 4 Dec 2012 04:21:09 -0200 Subject: iceweasel-libre-17.0.1.1-2: put new changes from vendor.js to the libre.patch for firefox-branding.js --- libre/iceweasel-libre/PKGBUILD | 4 ++-- libre/iceweasel-libre/libre.patch | 17 +++++++++++++++++ libre/iceweasel-libre/vendor.js | 8 -------- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 9b00b201a..f1d873728 100755 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -57,9 +57,9 @@ md5sums=('37b9b7eafc8affa9b8a5942f8ff19f8f' 'eab149c1994ab14392e55af3abb08e80' 'ac29b01c189f20abae2f3eef1618ffc0' 'a485a2b5dc544a8a2bd40c985d2e5813' - '420e6a57743591b4bcdf188fd027da38' + 'f2bf013ba4259091355c762dc70b4985' 'abf5ecb74caa857abb42bcfbb3442d9c' - '97fff72dee9c0e3748c7e3e4a8c2060f' + '0d053487907de4376d67d8f499c5502b' '52e52f840a49eb1d14be1c0065b03a93' '65f68090d2a69b467bd2707d0c4ea3bd') diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch index faae29a36..4534f0ca8 100755 --- a/libre/iceweasel-libre/libre.patch +++ b/libre/iceweasel-libre/libre.patch @@ -474,3 +474,20 @@ diff -urN iceweasel-17.0.1.orig/debian/branding/locales/browserconfig.properties browser.startup.homepage=about:home - +browser.search.defaultenginename=DuckDuckGo HTML +diff -urN iceweasel-17.0.1.orig/debian/branding/firefox-branding.js iceweasel-17.0.1/debian/branding/firefox-branding.js +--- iceweasel-17.0.1.orig/debian/branding/firefox-branding.js 2012-12-01 07:21:01.000000000 -0200 ++++ iceweasel-17.0.1/debian/branding/firefox-branding.js 2012-12-04 04:11:24.803127119 -0200 +@@ -1,3 +1,13 @@ + pref("startup.homepage_override_url",""); + pref("startup.homepage_welcome_url",""); + pref("app.releaseNotesURL", "http://mozilla.debian.net/%LOCALE%/%APP%/%VERSION%/releasenotes/"); ++ ++pref("browser.search.defaultenginename", "DuckDuckGo HTML"); ++ ++// Disable safe browsing. ++pref("browser.safebrowsing.enabled", false); ++pref("browser.safebrowsing.malware.enabled", false); ++ ++// Disable localstorage for privacy reasons. We will rewrite about:home js to ++// fix the bug. ++pref("dom.storage.enabled", false); diff --git a/libre/iceweasel-libre/vendor.js b/libre/iceweasel-libre/vendor.js index 29a9ceaf7..d8d606bc1 100755 --- a/libre/iceweasel-libre/vendor.js +++ b/libre/iceweasel-libre/vendor.js @@ -7,11 +7,3 @@ pref("browser.shell.checkDefaultBrowser", false); // Don't disable our bundled extensions in the application directory pref("extensions.autoDisableScopes", 11); pref("extensions.shownSelectionUI", true); - -// Disable safe browsing. -pref("browser.safebrowsing.enabled", false); -pref("browser.safebrowsing.malware.enabled", false); - -// Disable localstorage for privacy reasons. We will rewrite about:home js to -// fix the bug. -pref("dom.storage.enabled", false); -- cgit v1.2.3