main/firefox: upgrade to 23.0

3 files changed, 22 insertions, 59 deletions

diff --git a/main/firefox/APKBUILD b/main/firefox/APKBUILD
index 3923c21fe..88a99238c 100644
--- a/main/firefox/APKBUILD
+++ b/main/firefox/APKBUILD
@@ -1,10 +1,10 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=firefox
-pkgver=21.0
+pkgver=23.0
 _pkgver=$pkgver
 _xulver=$pkgver
-pkgrel=1
+pkgrel=0
 pkgdesc="firefox web browser"
 url="http://www.firefox.com"
 arch="all"
@@ -50,7 +50,6 @@ source="ftp://ftp.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgve
 	mozconfig
 	firefox-5.0-asciidel.patch
 	duckduckgo.patch
-	searchbox.patch
 	vendor.js
 	firefox.desktop
 	firefox-safe.desktop"
@@ -132,27 +131,24 @@ pdfjs() {
 		"$subpkgdir"/$_mozappdir/browser/chrome/
 }
 
-md5sums="6e2510e9466b280c367de0e4c05a8840  firefox-21.0.source.tar.bz2
+md5sums="794e0139c4df0392146353c655d94bb9  firefox-23.0.source.tar.bz2
 98bcd8b2d33037f12ca513882fc5d831  mozconfig
 2328df219e042f6aaec361cbf83cf9e9  firefox-5.0-asciidel.patch
-7341e290faecd9a827c4d580142699a5  duckduckgo.patch
-13a5af940423990db48c81434adeb17c  searchbox.patch
+6b8d481d8fba55fa0ad4f26c02164da8  duckduckgo.patch
 1515663477ce427cbdc42f04d8d5ca4e  vendor.js
 ba96924ece1d77453e462429037a2ce5  firefox.desktop
 6f38a5899034b7786cb1f75ad42032b8  firefox-safe.desktop"
-sha256sums="3909031cb5d403b12c796afb7775b4950f0347786ffd06028761852a1074d91c  firefox-21.0.source.tar.bz2
+sha256sums="2d64bd12cfa80c57e4a7f4156c7b4fde725a6173dfe48e2fac12e1927faf563e  firefox-23.0.source.tar.bz2
 0988b03a0532293fbacfd995cdc93df2a10b873cebf4912e1a96cb86f2321312  mozconfig
 e1e5b6ab3337a6af5c74be392d32fccfa315191191c622dac4f660157ebf4e7a  firefox-5.0-asciidel.patch
-034587def9ddd665cc67ebf03db1aae25749ed646e7e8d5758e1278fc75a0f8e  duckduckgo.patch
-4d3e1219c43b522f56f090dcad3570720ea8097332032046f2dcdb1ec120bffa  searchbox.patch
+db057fd5448c3e4d40459fb8ee178296cc723e19efadb1e02a85a4e22a6e560a  duckduckgo.patch
 d72ca759792cc8c88efc664d30087a139fed7fc3d7d058e4cd9ab287bb80ea46  vendor.js
 b571c4a49884a3c98806246c9cc3e60c73d5a8f4aeb7f96217db0be1d6210eda  firefox.desktop
 4b6de45753856a890f4482055666e77f9b01bdfb7e0df08bafaa3a4d9937eed3  firefox-safe.desktop"
-sha512sums="0607e587a03c7402b186bc6e254f79a6cc29dfdd1836d3857233a0175e0d7e9f03ab69261e98b503ae6b5b47deac8ebbb982649729e3ed4d9e646f13073e0822  firefox-21.0.source.tar.bz2
+sha512sums="da1e07a1350d17d11847da89fd9320c81579bba2d589cf5330570f2955ec93bf8aded3937023d0f708f5deccfe74acec620fdb6989a2e1d769e568bcac21a1f3  firefox-23.0.source.tar.bz2
 f5a3842a04d3fbf433f70fbbbefbf8ee2fce2f25fa041bf4920f99c8842c8a16e0aeaf44e64af14cffcb743c8816ba7aebbbe13e07d0b17ee6a50dbad8f7f645  mozconfig
 9ccc74883fa4f3861a5ddde1af9c3c0d151fda8ff64df979ee0565ecd2013a875894e5670a0c1d0a28fbb81fb88759777ce7fcb196e582caeb903c760859a1b1  firefox-5.0-asciidel.patch
-d6907d87c14647e3670aef7d55140990e9132f852a097cdc82f4f6f3c6676f1cb6b4ec5aba40d6bec8e9ad45af5e90c9572c1d11c22f2e96bb1bbf3e1bbbefb0  duckduckgo.patch
-a06be073ede41762ba42d8c57a114899f2aa341a29826e2c840ffbcb9f1e09fbbace0a4b2fd72736703e6ce652fe39ba63b8ffd70d34f83733d9805c39e58af6  searchbox.patch
+a7d6a0420f70374a2fa6a74a18ab15c77451f45dc9226ec251f5635a970dbd45ed6cf571ae5ab81b8126951667fc61b1fc5dfb7b8a4d7cc6d465d39e842dc985  duckduckgo.patch
 93570f821e59af4d233fc4b1df85e1d145a5e041ad402fd72921987a5a2f5218538d7a13d59bbf0bda5e7df1d5281407674a3765625936340106d1185b15b5d8  vendor.js
 f3b7c3e804ce04731012a46cb9e9a6b0769e3772aef9c0a4a8c7520b030fdf6cd703d5e9ff49275f14b7d738fe82a0a4fde3bc3219dff7225d5db0e274987454  firefox.desktop
 5dcb6288d0444a8a471d669bbaf61cdb1433663eff38b72ee5e980843f5fc07d0d60c91627a2c1159215d0ad77ae3f115dcc5fdfe87e64ca704b641aceaa44ed  firefox-safe.desktop"
diff --git a/main/firefox/duckduckgo.patch b/main/firefox/duckduckgo.patch
index e4dcef622..8de4e4b27 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
diff --git a/main/firefox/searchbox.patch b/main/firefox/searchbox.patch
deleted file mode 100644
index 9330c3db1..000000000
--- a/main/firefox/searchbox.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -rc /tmp/mozilla-release/browser/base/content/browser.js mozilla-release/browser/base/content/browser.js
-*** /tmp/mozilla-release/browser/base/content/browser.js        2013-05-11 14:19:21.000000000 -0500
---- mozilla-release/browser/base/content/browser.js     2013-05-19 01:42:13.778359190 -0500
-***************
-*** 3559,3568 ****
-     */
-    recordSearchInHealthReport: function (engine, source) {
-  #ifdef MOZ_SERVICES_HEALTHREPORT
-!     let reporter = Cc["@mozilla.org/datareporting/service;1"]
-!                      .getService()
-!                      .wrappedJSObject
-!                      .healthReporter;
-  
-      // This can happen if the FHR component of the data reporting service is
-      // disabled. This is controlled by a pref that most will never use.
---- 3559,3565 ----
-     */
-    recordSearchInHealthReport: function (engine, source) {
-  #ifdef MOZ_SERVICES_HEALTHREPORT
-!       return;
-  
-      // This can happen if the FHR component of the data reporting service is
-      // disabled. This is controlled by a pref that most will never use.