From dea4c7473a34a9f40fc2827521790f013ea3d866 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 29 Nov 2012 17:21:29 -0200 Subject: icecat-14.0-3: updating libre.patch file --- libre/icecat/PKGBUILD | 2 +- libre/icecat/libre.patch | 112 +++++++++++++++-------------------------------- 2 files changed, 37 insertions(+), 77 deletions(-) diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index cb4ef9688..742c1e637 100755 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -79,7 +79,7 @@ md5sums=( 3117865902d1a20ab61d75707be9888e ac29b01c189f20abae2f3eef1618ffc0 3009b176cc5f9b1e416b1bf7c45b064b - 0fe48b455f9b0ad7993071cd766b3bbf + 0dd247d29f9bf50e7826f654c72c7bb3 e81ad01dbc16ba28bf92ba4b7c309ca7 d93fe402b87cd000a869e1fd6badc6c9 b320085e7effa2890a79f4f45760614b diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch index b5a9acc0b..3d3350d79 100755 --- a/libre/icecat/libre.patch +++ b/libre/icecat/libre.patch @@ -1,3 +1,10 @@ +diff -Nur a/browser/branding/unofficial/locales/browserconfig.properties b/browser/branding/unofficial/locales/browserconfig.properties +--- a/browser/branding/unofficial/locales/browserconfig.properties ++++ b/browser/branding/unofficial/locales/browserconfig.properties +@@ -1,2 +1,2 @@ + # Do NOT localize or otherwise change these values +-browser.startup.homepage=http://gnuzilla.gnu.org ++browser.startup.homepage=about:home diff -Nur a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -9,15 +16,6 @@ diff -Nur a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js pref("extensions.getAddons.search.browseURL","http://www.gnu.org/software/gnuzilla/addons.html"); pref("extensions.getAddons.search.url","http://www.gnu.org/software/gnuzilla/addons.html"); pref("extensions.webservice.discoverURL","http://www.gnu.org/software/gnuzilla/addons.html"); -@@ -87,7 +88,7 @@ - pref("extensions.update.autoUpdateDefault", true); - - // Dictionary download preference --pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/"); -+pref("browser.dictionaries.download.url","http://www.gnu.org/software/gnuzilla/addons.html"); - - // The minimum delay in seconds for the timer to fire. - // default=2 minutes diff -Nur a/browser/base/content/aboutHome.js b/browser/base/content/abouthome/aboutHome.js --- a/browser/base/content/abouthome/aboutHome.js +++ b/browser/base/content/abouthome/aboutHome.js @@ -129,9 +127,8 @@ diff -Nur a/browser/base/content/aboutHome.js b/browser/base/content/abouthome/a @@ -143,7 +45,7 @@ // The part of the snippet will be linked to the corresponding url. const DEFAULT_SNIPPETS_URLS = [ -- "http://www.mozilla.com/firefox/features/?WT.mc_ID=default1" + "http://www.mozilla.com/firefox/features/?WT.mc_ID=default1" -, "https://addons.mozilla.org/firefox/?src=snippet&WT.mc_ID=default2" -+ "https://www.gnu.org/software/gnuzilla/?WT.mc_ID=default1" +, "http://www.gnu.org/software/gnuzilla/addons.html?src=snippet&WT.mc_ID=default2" ]; @@ -139,33 +136,27 @@ diff -Nur a/browser/base/content/aboutHome.js b/browser/base/content/abouthome/a diff -Nur a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties --- a/browser/locales/en-US/chrome/browser-region/region.properties +++ b/browser/locales/en-US/chrome/browser-region/region.properties -@@ -1,28 +1,28 @@ +@@ -1,28 +1,19 @@ # Default search engine -browser.search.defaultenginename=Google -+browser.search.defaultenginename=Duck Duck Go (HTML) ++browser.search.defaultenginename=DuckDuckGo HTML # Search engine order (order displayed in the search bar dropdown)s -browser.search.order.1=Duck Duck Go -browser.search.order.2=Google -browser.search.order.3=Yahoo -+browser.search.order.1=Duck Duck Go (HTML) -+browser.search.order.2=Seeks Search -+browser.search.order.3=YaCy - - # This is the default set of web based feed handlers shown in the reader - # selection UI +- +-# This is the default set of web based feed handlers shown in the reader +-# selection UI -browser.contentHandlers.types.0.title=Bloglines -browser.contentHandlers.types.0.uri=http://www.bloglines.com/login?r=/sub/%s -browser.contentHandlers.types.1.title=My Yahoo -browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s -browser.contentHandlers.types.2.title=Google -browser.contentHandlers.types.2.uri=http://fusion.google.com/add?feedurl=%s -+browser.contentHandlers.types.0.title= -+browser.contentHandlers.types.0.uri=about:blank -+browser.contentHandlers.types.1.title= -+browser.contentHandlers.types.1.uri=about:blank -+browser.contentHandlers.types.2.title= -+browser.contentHandlers.types.2.uri=about:blank ++browser.search.order.1=DuckDuckGo HTML ++browser.search.order.2=DuckDuckGo Lite ++browser.search.order.3=Seeks Search # Keyword URL (for location bar searches) -keyword.URL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q= @@ -180,21 +171,11 @@ diff -Nur a/browser/locales/en-US/chrome/browser-region/region.properties b/brow # 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,3 +30,21 @@ +@@ -30,3 +21,11 @@ # means that it's not possible to update the name of existing handler, so # don't make any spelling errors here. gecko.handlerService.defaultHandlersVersion=3 + -+# The default set of protocol handlers for webcal: -+gecko.handlerService.schemes.webcal.0.name= -+gecko.handlerService.schemes.webcal.0.uriTemplate=about:blank -+ -+# The default set of protocol handlers for mailto: -+gecko.handlerService.schemes.mailto.0.name= -+gecko.handlerService.schemes.mailto.0.uriTemplate=about:blank -+gecko.handlerService.schemes.mailto.1.name= -+gecko.handlerService.schemes.mailto.1.uriTemplate=about:blank -+ +# The default set of protocol handlers for irc: +gecko.handlerService.schemes.irc.0.name=Freenode +gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/ @@ -293,25 +274,21 @@ diff -Nur a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js diff -Nur a/mobile/locales/en-US/chrome/region.properties b/mobile/locales/en-US/chrome/region.properties --- a/mobile/locales/en-US/chrome/region.properties +++ b/mobile/locales/en-US/chrome/region.properties -@@ -1,18 +1,18 @@ +@@ -1,18 +1,11 @@ # Default search engine -browser.search.defaultenginename=Google -+browser.search.defaultenginename=Duck Duck Go (HTML) ++browser.search.defaultenginename=DuckDuckGo HTML # Search engine order (order displayed in the search bar dropdown)s -browser.search.order.1=Google -+browser.search.order.1=Duck Duck Go (HTML) - - # This is the default set of web based feed handlers shown in the reader - # selection UI +- +-# This is the default set of web based feed handlers shown in the reader +-# selection UI -browser.contentHandlers.types.0.title=My Yahoo -browser.contentHandlers.types.0.uri=http://add.my.yahoo.com/rss?url=%s -browser.contentHandlers.types.1.title=Google -browser.contentHandlers.types.1.uri=http://fusion.google.com/add?feedurl=%s -+browser.contentHandlers.types.0.title= -+browser.contentHandlers.types.0.uri=about:blank -+browser.contentHandlers.types.1.title= -+browser.contentHandlers.types.1.uri=about:blank ++browser.search.order.1=DuckDuckGo HTML # Keyword URL (for location bar searches) -keyword.URL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q= @@ -319,24 +296,27 @@ diff -Nur a/mobile/locales/en-US/chrome/region.properties b/mobile/locales/en-US # 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 -@@ -22,11 +20,11 @@ +@@ -21,12 +14,11 @@ + # don't make any spelling errors here. gecko.handlerService.defaultHandlersVersion=2 - # The default set of protocol handlers for webcal: +-# The default set of protocol handlers for webcal: -gecko.handlerService.schemes.webcal.0.name=30 Boxes -gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s -+gecko.handlerService.schemes.webcal.0.name= -+gecko.handlerService.schemes.webcal.0.uriTemplate=about:blank - - # The default set of protocol handlers for mailto: +- +-# The default set of protocol handlers for mailto: -gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail -gecko.handlerService.schemes.mailto.0.uriTemplate=http://compose.mail.yahoo.com/?To=%s -gecko.handlerService.schemes.mailto.1.name=Gmail -gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s -+gecko.handlerService.schemes.mailto.0.name= -+gecko.handlerService.schemes.mailto.0.uriTemplate=about:blank -+gecko.handlerService.schemes.mailto.1.name= -+gecko.handlerService.schemes.mailto.1.uriTemplate=about:blank ++# The default set of protocol handlers for irc: ++gecko.handlerService.schemes.irc.0.name=Freenode ++gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/ ++ ++# The default set of protocol handlers for ircs: ++gecko.handlerService.schemes.ircs.0.name=Freenode ++gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/ ++ diff -Nur a/mobile/xul/app/mobile.js b/mobile/xul/app/mobile.js --- a/mobile/xul/app/mobile.js +++ b/mobile/xul/app/mobile.js @@ -382,23 +362,3 @@ diff -Nur a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js pref("keyword.enabled", false); pref("general.useragent.locale", "chrome://global/locale/intl.properties"); pref("general.useragent.compatMode.firefox", false); -diff -Naur a/toolkit/locales/en-US/chrome/global-region/region.properties b/toolkit/locales/en-US/chrome/global-region/region.properties ---- a/toolkit/locales/en-US/chrome/global-region/region.properties -+++ b/toolkit/locales/en-US/chrome/global-region/region.properties -@@ -4,10 +4,10 @@ - pluginStartupMessage=Starting Plugin for type - - # plug-ins URLs --more_plugins_label=mozilla.org --more_plugins_url=https://pfs.mozilla.org/plugins/ --pluginupdates_label=mozilla.com/plugincheck --pluginupdates_url=http://www.mozilla.com/plugincheck/ --plugindoc_label=plugindoc.mozdev.org --plugindoc_url=http://plugindoc.mozdev.org/ -+more_plugins_label= -+more_plugins_url=about:blank -+pluginupdates_label= -+pluginupdates_url=about:blank -+plugindoc_label= -+plugindoc_url=about:blank - -- cgit v1.2.3