From e0f288f534770ed346b4e477e9468881aebde522 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 28 Nov 2012 16:49:21 -0200 Subject: iceweasel-libre-17.0.1-3: fixing more parts on libre.patch --- libre/iceweasel-libre/PKGBUILD | 2 +- libre/iceweasel-libre/libre.patch | 42 +++++++++++++++++++++++++++++---------- 2 files changed, 32 insertions(+), 12 deletions(-) diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 7ac6debab..a0049d64b 100755 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -57,7 +57,7 @@ md5sums=('3e555026478026987753b4859ec91d3b' 'eab149c1994ab14392e55af3abb08e80' 'ac29b01c189f20abae2f3eef1618ffc0' 'a485a2b5dc544a8a2bd40c985d2e5813' - 'f617d556dc5c1ce0d47d2b69034b82a4' + '9814ffe0b0bf122b129f41320614ea36' 'abf5ecb74caa857abb42bcfbb3442d9c' '0d053487907de4376d67d8f499c5502b' '52e52f840a49eb1d14be1c0065b03a93' diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch index c29a3565c..922102e70 100755 --- a/libre/iceweasel-libre/libre.patch +++ b/libre/iceweasel-libre/libre.patch @@ -1,6 +1,6 @@ -diff -urN iceweasel-16.0.orig/browser/app/profile/firefox.js iceweasel-16.0/browser/app/profile/firefox.js ---- iceweasel-16.0.orig/browser/app/profile/firefox.js 2012-10-05 20:01:58.000000000 -0300 -+++ iceweasel-16.0/browser/app/profile/firefox.js 2012-10-11 17:19:44.984225170 -0200 +diff -urN iceweasel-17.0.orig/browser/app/profile/firefox.js iceweasel-17.0/browser/app/profile/firefox.js +--- iceweasel-17.0.orig/browser/app/profile/firefox.js 2012-10-05 20:01:58.000000000 -0300 ++++ iceweasel-17.0/browser/app/profile/firefox.js 2012-11-28 16:33:37.105547392 -0200 @@ -37,11 +37,11 @@ // Preferences for AMO integration pref("extensions.getAddons.cache.enabled", true); @@ -27,7 +27,16 @@ diff -urN iceweasel-16.0.orig/browser/app/profile/firefox.js iceweasel-16.0/brow pref("extensions.dss.enabled", false); // Dynamic Skin Switching pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next // restart. -@@ -327,7 +327,7 @@ +@@ -210,7 +210,7 @@ + pref("keyword.enabled", true); + // Override the default keyword.URL. Empty value means + // "use the search service's default engine" +-pref("keyword.URL", ""); ++pref("keyword.URL", "https://duckduckgo.com/?q="); + + pref("general.skins.selectedSkin", "classic/1.0"); + +@@ -340,7 +340,7 @@ pref("browser.download.panel.removeFinishedDownloads", false); // search engines URL @@ -36,7 +45,7 @@ diff -urN iceweasel-16.0.orig/browser/app/profile/firefox.js iceweasel-16.0/brow // pointer to the default engine name pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties"); -@@ -584,7 +584,7 @@ +@@ -582,7 +582,7 @@ pref("accessibility.typeaheadfind.flashBar", 1); // plugin finder service url @@ -45,10 +54,24 @@ diff -urN iceweasel-16.0.orig/browser/app/profile/firefox.js iceweasel-16.0/brow // by default we show an infobar message when pages require plugins the user has not installed, or are outdated pref("plugins.hide_infobar_for_missing_plugin", false); +@@ -1184,13 +1184,3 @@ + // might keep around more than this, but we'll try to get down to this value). + // (This is intentionally on the high side; see bug 746055.) + pref("image.mem.max_decoded_image_kb", 256000); +- +-// Example social provider +-pref("social.manifest.facebook", "{\"origin\":\"https://www.facebook.com\",\"name\":\"Facebook Messenger\",\"workerURL\":\"https://www.facebook.com/desktop/fbdesktop2/socialfox/fbworker.js.php\",\"iconURL\":\"data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8%2F9hAAAAX0lEQVQ4jWP4%2F%2F8%2FAyUYTFhHzjgDxP9JxGeQDSBVMxgTbUBCxer%2Fr999%2BQ8DJBuArJksA9A10s8AXIBoA0B%2BR%2FY%2FjD%2BEwoBoA1yT5v3PbdmCE8MAshhID%2FUMoDgzUYIBj0Cgi7ar4coAAAAASUVORK5CYII%3D\",\"sidebarURL\":\"https://www.facebook.com/desktop/fbdesktop2/?socialfox=true\"}"); +-// Comma-separated list of nsIURI::prePaths that are allowed to activate +-// built-in social functionality. +-pref("social.activation.whitelist", "https://www.facebook.com"); +-pref("social.sidebar.open", true); +-pref("social.sidebar.unload_timeout_ms", 10000); +-pref("social.active", false); +-pref("social.toast-notifications.enabled", true); diff -urN iceweasel-17.0.orig/browser/locales/en-US/chrome/browser-region/region.properties iceweasel-17.0/browser/locales/en-US/chrome/browser-region/region.properties --- iceweasel-17.0.orig/browser/locales/en-US/chrome/browser-region/region.properties 2012-11-20 00:45:50.000000000 -0200 -+++ iceweasel-17.0/browser/locales/en-US/chrome/browser-region/region.properties 2012-11-28 12:54:19.326326121 -0200 -@@ -3,25 +3,21 @@ ++++ iceweasel-17.0/browser/locales/en-US/chrome/browser-region/region.properties 2012-11-28 16:25:11.411107262 -0200 +@@ -3,25 +3,18 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # Default search engine @@ -69,9 +92,6 @@ diff -urN iceweasel-17.0.orig/browser/locales/en-US/chrome/browser-region/region +browser.search.order.1=Duck Duck Go (HTML) +browser.search.order.2=Seeks Search +browser.search.order.3=YaCy -+ -+# Keyword URL (for location bar searches) -+keyword.URL=https://duckduckgo.com/?q= # URL for site-specific search engines # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site @@ -82,7 +102,7 @@ diff -urN iceweasel-17.0.orig/browser/locales/en-US/chrome/browser-region/region # increment this number when anything gets changed in the list below. This will # cause Firefox to re-read these prefs and inject any new handlers into the -@@ -30,20 +26,10 @@ +@@ -30,20 +23,10 @@ # don't make any spelling errors here. gecko.handlerService.defaultHandlersVersion=3 -- cgit v1.2.3