Tue Dec 4 02:21:34 PST 2012

2 files changed, 143 insertions, 20 deletions

diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 357fb7321..b9515737b 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -22,7 +22,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 _pkgname=iceweasel
 pkgname=iceweasel-libre
 pkgver=${_debver}.${_debrel}
-pkgrel=1
+pkgrel=2
 
 if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi
 if $_pgo; then
@@ -57,7 +57,7 @@ md5sums=('37b9b7eafc8affa9b8a5942f8ff19f8f'
          'eab149c1994ab14392e55af3abb08e80'
          'ac29b01c189f20abae2f3eef1618ffc0'
          'a485a2b5dc544a8a2bd40c985d2e5813'
-         '1570f4402cd46ffffeb7e302b2fb285d'
+         'fbdc942afd33a4a26ea3a96b1da2cbe8'
          'abf5ecb74caa857abb42bcfbb3442d9c'
          '0d053487907de4376d67d8f499c5502b'
          '52e52f840a49eb1d14be1c0065b03a93'
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index d0f392be3..102bf59ea 100644
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -290,18 +290,16 @@ diff -urN iceweasel-14.0.1.orig/browser/locales/generic/profile/bookmarks.html.i
 +        <DT><A HREF="http://www.h-node.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAAAAABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAAAAAC7zrYAWYhNANjj1QA9fEcAEEwBAHTQkwAeVRkAPXMvALvOtwASVQEAHFcUAH/bpgB60p8AKnQmAGO1fgAjaRwALmA1AA5EAQDM2sgAN3ApAG7EjgC5zbQAVJxrAChwIgC0ya8ALmczAHXJmQBNf0EAgd6oADhwKgC8z7cA7vPtANTg0QANPwAARIhSADtyLQBzzpQAus21AEeKVQDC070AieyzALzPuAB93qEALGYvAO/z7gBEiVAAasWFAFuJTwBKil4AXotSAEuKXgAORQEAD0gBABlDFwBWpmoALGYwAGCNVQAbYBAAHGAQABBOAQCI6rIAjPG3AB1bDgAaXg4A////AGaRWwB/2qYAUYJEAEx+PwAZXAwAm7eUAD51MADN28oAJmwhACRiFAAzeTYAasaFAB9eDwBkt34Aus62AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPT09PT09PT09PT09PT09PT09PT0OIjALPRQmMkI9PT09PT09OkcHNQU+Q0oQPT09PT09PToVGDQtI0ABKz09PT09PT06JRg0Nh1ALxk9PT09PT09OiUYIS4TQC83PT09PT09PTpPSDsGG0BEAz09PT09PT06T0BGMRIsTRY9PT09PT09OgACJx8gQwooPT09PT09PToICAkJCUkkPT09PT09PT05HggETio9PT09PT09PT09Px4IERw9PT09PT09PT09PUUpCDMMPT09PT09PT09PT0NOEEEGj09PT09PT09PT09TBcPSzw9PT09PT09PT09PT09PT09PT09PT09PQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA%3D">h-node</A>
      </DL><p>
  </DL><p>
-diff -urN iceweasel-13.0.orig/browser/base/content/abouthome/aboutHome.js iceweasel-13.0/browser/base/content/abouthome/aboutHome.js
---- iceweasel-13.0.orig/browser/base/content/abouthome/aboutHome.js	2012-06-01 09:03:47.000000000 -0300
-+++ iceweasel-13.0/browser/base/content/abouthome/aboutHome.js		2012-06-13 18:07:51.217531774 -0300
-@@ -38,104 +38,6 @@
-  *
-  * ***** END LICENSE BLOCK ***** */
- 
--// If a definition requires additional params, check that the final search url
--// is handled correctly by the engine.
--const SEARCH_ENGINES = {
+diff -urN iceweasel-17.0.1.orig/browser/base/content/abouthome/aboutHome.js iceweasel-17.0.1/browser/base/content/abouthome/aboutHome.js
+--- iceweasel-17.0.1.orig/browser/base/content/abouthome/aboutHome.js	2012-11-29 02:43:23.000000000 -0200
++++ iceweasel-17.0.1/browser/base/content/abouthome/aboutHome.js	2012-12-04 02:08:18.095477555 -0200
+@@ -5,99 +5,42 @@
+ // If a definition requires additional params, check that the final search url
+ // is handled correctly by the engine.
+ const SEARCH_ENGINES = {
 -  "Google": {
--    image: "data:image/png;base64," +
++  "DuckDuckGo HTML": {
+     image: "data:image/png;base64," +
 -           "iVBORw0KGgoAAAANSUhEUgAAAEYAAAAcCAYAAADcO8kVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ" +
 -           "bWFnZVJlYWR5ccllPAAADHdJREFUeNrsWQl0VNUZvve9NzNJJpnsIkuEJMoqAVJAodCKoFUsAUFQ" +
 -           "qhig0npaRUE8Viv1FFtQWxSwLXVhEawbhOWobOICFCGiEIIQRGIgCSFjMslsb9567+1/Z+7gmIYK" +
@@ -393,17 +391,142 @@ diff -urN iceweasel-13.0.orig/browser/base/content/abouthome/aboutHome.js icewea
 -           "VAVirhYnYzsZLbgSe57nwtL375N8H+Oy3H2qKpAKEL5eVc65E04rD2NW66uWrUDobKnAnPs7PR5+" +
 -           "tLFQHjMS0knhEZLdim/8bxId+RetX/4RYACXlwEEPBQycwAAAABJRU5ErkJggg=="
 -  }
--};
--
++           "iVBORw0KGgoAAAANSUhEUgAAAC8AAAAcCAYAAADxyeavAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI" +
++           "WXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH3AwBERgxGkWttAAABtVJREFUWMPtmGtwVdUVx397n3Pu" +
++           "K8m9uXlASCHQIBqeEooEDAymUEAKEaGlUoeOtbYdnSmdYjud6fjBdhytLS0zdRzbWkAGsCBtSktr" +
++           "RRQFY4gWaQZQUJFwCUhISHLzuo9zzj67Hy4Cd+RD6XDBD90z59uZdX5rrf96nC24xkd7jtlb/7VS" +
++           "da6jQEYKQiA8nUwlzcm39oWfXnvuWn5LXCtDyk6V9N6x4FGvu2ceydQw7amA8PsNAO04rvD7E8KQ" +
++           "HxlTqncWbnnu0c8MfM+C+mfVh8fv144jfXPuwJoxA5QLUoJS4Gm0cnF27cY52IKsGOFas2ofDP/q" +
++           "yT/cMPieurmjvb7BfdhOuTl1CtbM27FfehnnjTdB6+yXLQv/nfMwqqqwd7+COtWGHDKkMfit+xYH" +
++           "V349fl3hu2fPne6dOv26UXWL36qdjtO4H/ffLWBZYBgIkW1aaw1KIQwTY9IEzPFjcfY1opXXWdS8" +
++           "t0wI4V03+PPjqm1z0kTLml5D4hdrIBRC5ueh471opUDKTzlw0QlABAIEVq4gtXELsqT4fNH+vaVX" +
++           "yyD/F/Cu22a2GUOHWOb4sQw+9jhCCNwVy8k/2Exh6zEiL2zBP6cOhMg4cnm0hEAIgU6lSG36I8EH" +
++           "v4Pu6y/pqZu/PueR75k5Z40biz2ct3oVid+tg1QK7XlQ+XkYNZLQN+4lWDcbPA/7zztIbdmK09SM" +
++           "yAt9OgtKIaNRAl9dSnLbdl18+J2wEGIgJ/D9q38UTv1pR8z/pTmFWinsV19DSIl2XOTSeoqeWpsl" +
++           "j09kM/DIT0lt3IQwzSvKyJo0AW3bYPnejv69oSYnskm/uHsWEPEvXYK98x9gGBmAihFEn3yMWDxN" +
++           "v62ywPvTinP3fRsqKtBXip4QqLPtyLIyvFNt07TWMifwwm8u9dXOEKmGv4A/gAA0IKtvpVsZ9KYV" +
++           "QTO7UC1DUHZTOaG7F2d6/hWO19GJMfxzeL29xO9e/uOcwOu0PducUo29Zy/CMi/qTuWFKMz3Ma4k" +
++           "wJneNN5lPT5gSp7Z20bnvEXgumg0WpP14HlopTKySiTrcwM/mChGCoTnwWXRdfv60I7L0XMJxjze" +
++           "RMLObtnn+9OoqjGgTUhIZL7CrEohIypjRgjUqVPIMaPxunvK/lse86pkEwrlXRBqdtrbTqNTKaqG" +
++           "5nP8J7cT8sks3f980U1AF/0L41izbMzKNKJAkdxcTLohkmmpPXFkaSnuB8fNnMBj2y5CWGid5YBx" +
++           "tp1ET5xIOExFNPDJeonu24n38SqEHQMg72EDr89AfeQj9fxQnJYQWBrQiEAAkkkIBr3cwLtuHMMM" +
++           "ak8jjMuKsqOTwY4OIiMrLkksdQgduwvdaZHYPgwZcfE6LJzDQVSrD2FqxAVO7WmM4cOxm5qRxUWD" +
++           "uek20Wird+YMxpjKi5NTC4FQCrvlUNb4xyiBYCXCL7D35ZPcWEz6n2GwBf76OP5FvWhHZEpea0RJ" +
++           "MbqrC5Rqygm81xPfYL/+BoEV90A6fWnKmSbqrX+hL/RtAOEbTnrPQ6RfihD+dRuR52IUvnCCyLMx" +
++           "Aov6UCf8F78u8vLQA4MgJb6vLN2WE9kYI0c0qw8+tIXf5zMqKlAdHQgpQUqCh48woBQFFwYXgE4G" +
++           "SawvRmwqQg51EHkeXp+B126B1AhDAwI5rAwViyFLSwbyf/C93TmJfFHjniOypORo4olfEvjuA5d2" +
++           "dinxn4zRf64jOzITxyJ8mYKk3cQ94cc7b4KpEUYmb9p28N85D/e9Y1g1U1fmdKs0J0/+snYc7R46" +
++           "jDV9Gtp1M51HStz9zbTbJzkaf4/OdC/p2qkMhH0cmhhm/iOjcE0QaITI1IZ2HPzLl+G+exRhmrGC" +
++           "36zdcVUsVwsfeX7Dma6pMx+wX35lXWjVQ2DbOM1vIywLeeAg79c6bDj+NzpUlFHBCAM/HI0oD/KO" +
++           "GKS11MfYM2mUASiFf9kSdFc3duObnlU9+R5a3sr9Pl98oHG9CATWDf7sCXwLF+BbOB8MA1/LYVwv" +
++           "YzKW+Ji23pO0lucjTYnlaoS+tEn6Fi4A18VuasJXM21lYcPW5uv6D3t+0m3biceX+ZbUC1GQj9vV" +
++           "w7HVc9iXfpfKwhqmRW+hPFRG1zNP07Dr9yxr9RMYPwFj/FjUsfexG/e71heqv1nYsHXzDbk96K6u" +
++           "uctLJDeLcEG+cfMYjPvvxf/FuViX70QDg6gdO7Hbz2K/tg8ViyFCoVZZXl4f/ev2Izf83qZryvQ1" +
++           "Opn6vo7HTQBjdCWyrAxcB9V2Gu9sO0ipZTTab42rWhHetvnFz8yl08VM1NYtIZlcrNPpm73+AQtD" +
++           "ahkOJ3HVAWtW7a7wb596lf8f+A8mm/+hmETyjwAAAABJRU5ErkJggg=="
++  },
+ };
+ 
  // The process of adding a new default snippet involves:
- //   * add a new entity to aboutHome.dtd
- //   * add a <span/> for it in aboutHome.xhtml
-@@ -143,7 +45,7 @@
+@@ -106,13 +49,15 @@
+ //   * add an entry here in the proper ordering (based on spans)
  // The <a/> 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"
-+, "http://www.gnu.org/software/gnuzilla/addons.html?src=snippet&WT.mc_ID=default2"
++  "http://packages.debian.org/experimental/iceweasel"
++, "https://www.gnu.org/software/gnuzilla/addons.html"
  ];
  
  const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day.
+ 
+-let gSearchEngine;
++// Bug with dom.storage.enabled set as false
++// We are using DDG HTML as a default in this case.
++let gSearchEngine = {"name": "DuckDuckGo HTML", "searchUrl": "https://duckduckgo.com/html/?q=_searchTerms_"};
+ 
+ document.addEventListener("DOMContentLoaded", function init() {
+   setupSearchEngine();
+@@ -142,13 +87,13 @@
+ 
+ function setupSearchEngine()
+ {
+-  gSearchEngine = JSON.parse(localStorage["search-engine"]);
+-
+-  if (!gSearchEngine)
+-    return;
++  if (localStorage && localStorage["search-engine"]) {
++        gSearchEngine = JSON.parse(localStorage["search-engine"]);
++  }
+ 
++  
+   // Look for extended information, like logo and links.
+-  let searchEngineInfo = SEARCH_ENGINES[gSearchEngine.name];
++  var searchEngineInfo = SEARCH_ENGINES[gSearchEngine.name];
+   if (searchEngineInfo) {
+     for (let prop in searchEngineInfo)
+       gSearchEngine[prop] = searchEngineInfo[prop];
+diff -urN iceweasel-17.0.1.orig/debian/branding/locales/browserconfig.properties iceweasel-17.0.1/debian/branding/locales/browserconfig.properties
+--- iceweasel-17.0.1.orig/debian/branding/locales/browserconfig.properties	2012-12-01 07:21:01.000000000 -0200
++++ iceweasel-17.0.1/debian/branding/locales/browserconfig.properties	2012-12-04 02:32:50.710792982 -0200
+@@ -1,3 +1,3 @@
+ # Do NOT localize or otherwise change these values
+ 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 06:23:43.870132762 -0200
+@@ -1,3 +1,32 @@
+ pref("startup.homepage_override_url","");
+ pref("startup.homepage_welcome_url","");
+ pref("app.releaseNotesURL", "http://mozilla.debian.net/%LOCALE%/%APP%/%VERSION%/releasenotes/");
++
++// region.properties for all locales
++pref("browser.search.defaultenginename", "DuckDuckGo HTML");
++
++pref("browser.search.order.1", "DuckDuckGo HTML");
++pref("browser.search.order.2", "DuckDuckGo Lite");
++pref("browser.search.order.3", "Seeks Search");
++
++pref("gecko.handlerService.schemes.webcal.0.name","");
++pref("gecko.handlerService.schemes.webcal.0.uriTemplate","");
++
++pref("gecko.handlerService.schemes.mailto.0.name","");
++pref("gecko.handlerService.schemes.mailto.0.uriTemplate","");
++pref("gecko.handlerService.schemes.mailto.1.name","");
++pref("gecko.handlerService.schemes.mailto.1.uriTemplate","");
++
++pref("gecko.handlerService.schemes.irc.0.name", "Freenode");
++pref("gecko.handlerService.schemes.irc.0.uriTemplate", "https://webchat.freenode.net/");
++
++pref("gecko.handlerService.schemes.ircs.0.name", "Freenode");
++pref("gecko.handlerService.schemes.ircs.0.uriTemplate", "https://webchat.freenode.net/");
++
++// 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 -urN iceweasel-17.0.1.orig/browser/base/content/abouthome/aboutHome.css iceweasel-17.0.1/browser/base/content/abouthome/aboutHome.css
+--- iceweasel-17.0.1.orig/browser/base/content/abouthome/aboutHome.css	2012-11-29 02:43:23.000000000 -0200
++++ iceweasel-17.0.1/browser/base/content/abouthome/aboutHome.css	2012-12-04 06:31:10.410410656 -0200
+@@ -66,7 +66,7 @@
+ #searchEngineLogo {
+   display: inline-block;
+   height: 28px;
+-  width: 70px;
++  width: 47px;
+ }
+ 
+ #searchText {
+@@ -79,6 +79,7 @@
+               0 0 2px hsla(210,65%,9%,.1) inset,
+               0 1px 0 hsla(0,0%,100%,.2);
+   border-radius: 2.5px 0 0 2.5px;
++  font-size:.9em;
+ }
+ 
+ #searchText:-moz-dir(rtl) {