main/firefox: upgrade to 23.0

1 files changed, 14 insertions, 24 deletions

diff --git a/main/firefox/duckduckgo.patch b/main/firefox/duckduckgo.patch
index e4dcef6221..8de4e4b270 100644
--- a/main/firefox/duckduckgo.patch
+++ b/main/firefox/duckduckgo.patch
@@ -1,11 +1,7 @@
-diff -r f2fa4ae74ee1 browser/locales/en-US/chrome/browser-region/region.properties
---- a/browser/locales/en-US/chrome/browser-region/region.properties	Mon Oct 24 22:54:18 2011 +0300
-+++ b/browser/locales/en-US/chrome/browser-region/region.properties	Tue Oct 25 21:13:40 2011 -0400
-@@ -1,15 +1,16 @@
- # Default search engine
- browser.search.defaultenginename=Google
- 
- # Search engine order (order displayed in the search bar dropdown)s
+diff -up mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties.duckduckgo mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties
+--- mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties.duckduckgo	2012-10-24 16:32:26.000000000 +0200
++++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties	2012-11-07 16:27:04.278857840 +0100
+@@ -9,6 +9,7 @@ browser.search.defaultenginename=Google
  browser.search.order.1=Google
  browser.search.order.2=Yahoo
  browser.search.order.3=Bing
@@ -13,34 +9,28 @@ diff -r f2fa4ae74ee1 browser/locales/en-US/chrome/browser-region/region.properti
  
  # This is the default set of web based feed handlers shown in the reader
  # selection UI
- browser.contentHandlers.types.0.title=Google
- browser.contentHandlers.types.0.uri=http://fusion.google.com/add?feedurl=%s
- browser.contentHandlers.types.1.title=My Yahoo!
- browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s
- 
-diff -r f2fa4ae74ee1 browser/locales/en-US/searchplugins/duckduckgo.xml
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/browser/locales/en-US/searchplugins/duckduckgo.xml	Tue Oct 25 21:13:40 2011 -0400
-@@ -0,0 +1,10 @@
+diff -up mozilla-release/browser/locales/en-US/searchplugins/duckduckgo.xml.duckduckgo mozilla-release/browser/locales/en-US/searchplugins/duckduckgo.xml
+--- mozilla-release/browser/locales/en-US/searchplugins/duckduckgo.xml.duckduckgo	2012-11-07 16:27:04.278857840 +0100
++++ mozilla-release/browser/locales/en-US/searchplugins/duckduckgo.xml	2012-11-07 16:27:04.278857840 +0100
+@@ -0,0 +1,11 @@
 +<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
 +    <ShortName>DuckDuckGo</ShortName>
 +    <Description>We believe you can get better search and privacy at the same time.</Description>
 +    <InputEncoding>UTF-8</InputEncoding>
 +    <Image height="16" width="16" type="image/x-icon">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAANcNAADXDQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJmlk8pf6+v3s/v7+++zr/fcnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnIOwBJyDscCcg7PZttJ7/7Pfs//////++xO7/S5GA/ycg7P8nIOz2JyDscCcg7AEAAAAAAAAAAAAAAAAnIOwBJyDstScg7P8nIOz/Y8p5/2fHZf9Yv0z/YcF2/1rBUv8nIOz/JyDs/ycg7P8nIOy1JyDsAQAAAAAAAAAAJyDscCcg7P8nIOz/JyDs/4jQoP/p9+n//////05X3v9LkYD/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAJyDsJicg7PYnIOz/JyDs/zUu7f/+/v////////////89N+7/JyDs/yUo7f8nIOz/JyDs/ycg7P8nIOz2JyDsJicg7IAnIOz/JyDs/ycg7P9hXPH////////////t/P//GIr2/wfD+/8Gyfz/DKv5/yM57/8nIOz/JyDs/ycg7H8nIOyzJyDs/ycg7P8nIOz/jov1////////////Otz9/w3G/P8cWfH/JSvt/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDs5icg7P8nIOz/JyDs/7u5+f///////////27l/v8E0v3/BNL9/wTQ/f8Oofn/IT7v/ycg7P8nIOz/JyDs5icg7OYnIOz/JyDs/ycg7P/p6P3/uWsC////////////5fr//6Po/f8Thfb/DKv5/w6f+f8nIOz/JyDs/ycg7OYnIOyzJyDs/ycg7P8nIOz/9/b+/////////////////7lrAv/V1Pv/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDsgCcg7P8nIOz/JyDs/8/N+///////////////////////iIX1/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDsfycg7CYnIOz2JyDs/ycg7P9FP+7/q6n4/+7u/f/n5v3/fXn0/yoj7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7CYAAAAAJyDscCcg7P8nIOz/wsD6/+no/f/Y1/z/eHTz/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAAAAAACcg7AEnIOy1JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7LUnIOwBAAAAAAAAAAAAAAAAJyDsAScg7HAnIOz2JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7HAnIOwBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJicg7IAnIOyzJyDs5icg7OYnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAA+B8AAPAPAADAAwAAwAMAAIABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAACAAQAAwAMAAMADAADwDwAA+B8AAA==</Image>
-+    <Url type="text/html" method="GET" template="https://duckduckgo.com/?q={{search}}&t=alpine">
++    <Url type="text/html" method="GET" template="https://duckduckgo.com/">
 +        <Param name="q" value="{searchTerms}"/>
++        <Param name="t" value="alpine"/>
 +    </Url>
 +    <SearchForm>https://duckduckgo.com/</SearchForm>
 +</SearchPlugin>
-diff -r f2fa4ae74ee1 browser/locales/en-US/searchplugins/list.txt
---- a/browser/locales/en-US/searchplugins/list.txt	Mon Oct 24 22:54:18 2011 +0300
-+++ b/browser/locales/en-US/searchplugins/list.txt	Tue Oct 25 21:13:40 2011 -0400
-@@ -1,7 +1,8 @@
+diff -up mozilla-release/browser/locales/en-US/searchplugins/list.txt.duckduckgo mozilla-release/browser/locales/en-US/searchplugins/list.txt
+--- mozilla-release/browser/locales/en-US/searchplugins/list.txt.duckduckgo	2012-10-24 16:32:26.000000000 +0200
++++ mozilla-release/browser/locales/en-US/searchplugins/list.txt	2012-11-07 16:27:04.279857842 +0100
+@@ -1,5 +1,6 @@
  amazondotcom
  bing
 +duckduckgo
  eBay
  google
  twitter
- wikipedia
- yahoo
\ No newline at end of file