Wed Mar 21 00:01:20 UTC 2012

1 files changed, 22 insertions, 21 deletions

diff --git a/mozilla-testing/iceweasel-libre/libre.patch b/mozilla-testing/iceweasel-libre/libre.patch
index 935df297b..c1bb0a8c7 100644
--- a/mozilla-testing/iceweasel-libre/libre.patch
+++ b/mozilla-testing/iceweasel-libre/libre.patch
@@ -1,19 +1,20 @@
 diff -urN iceweasel-9.0.1.orig/browser/app/profile/firefox.js iceweasel-9.0.1/browser/app/profile/firefox.js
---- iceweasel-10.0.orig/browser/app/profile/firefox.js	2011-12-21 09:07:20.000000000 +0000
-+++ iceweasel-10.0/browser/app/profile/firefox.js	2011-12-21 12:54:53.816066166 +0000
-@@ -64,10 +64,11 @@
+--- mozilla-build/browser/app/profile/firefox.js.orig	2012-03-20 01:04:55.890545738 -0300
++++ mozilla-build/browser/app/profile/firefox.js	2012-03-20 01:05:03.330545430 -0300
+@@ -64,11 +64,11 @@
  // Preferences for AMO integration
  pref("extensions.getAddons.cache.enabled", true);
  pref("extensions.getAddons.maxResults", 15);
--pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
+-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%");
+-pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
 -pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%");
 -pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=firefox");
 -pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%");
-+pref("extensions.getAddons.get.url", "");
-+pref("extensions.getAddons.get.url", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.url", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.webservice.discoverURL", "http://www.gnu.org/s/gnuzilla/addons.html");
+++pref("extensions.getAddons.get.url", "");
+++pref("extensions.getAddons.get.url", "http://www.gnu.org/s/gnuzilla/addons.html");
+++pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html");
+++pref("extensions.getAddons.search.url", "http://www.gnu.org/s/gnuzilla/addons.html");
+++pref("extensions.webservice.discoverURL", "http://www.gnu.org/s/gnuzilla/addons.html");
  
  // Blocklist preferences
  pref("extensions.blocklist.enabled", true);
@@ -131,10 +132,10 @@ diff -urN iceweasel-9.0.1.orig/layout/ipc/test-ipcbrowser.xul iceweasel-9.0.1/la
 +  <browser type="content" src="http://www.duckduckgo.com/" flex="1" id="content"
             remote="true"/>
  </window>
-diff -urN iceweasel-9.0.1.orig/mobile/app/mobile.js iceweasel-9.0.1/mobile/app/mobile.js
---- iceweasel-9.0.1.orig/mobile/app/mobile.js	2011-12-16 20:29:36.000000000 +0000
-+++ iceweasel-9.0.1/mobile/app/mobile.js	2011-12-21 10:04:04.976062646 +0000
-@@ -217,12 +217,13 @@
+diff -urN iceweasel-9.0.1.orig/mobile/xul/app/mobile.js iceweasel-9.0.1/mobile/xul/app/mobile.js
+--- mozilla-build/mobile/xul/app/mobile.js.orig	2012-03-20 01:02:30.300551777 -0300
++++ mozilla-build/mobile/xul/app/mobile.js	2012-03-20 01:02:40.820551342 -0300
+@@ -218,13 +218,12 @@
  /* preferences for the Get Add-ons pane */
  pref("extensions.getAddons.cache.enabled", true);
  pref("extensions.getAddons.maxResults", 15);
@@ -143,14 +144,14 @@ diff -urN iceweasel-9.0.1.orig/mobile/app/mobile.js iceweasel-9.0.1/mobile/app/m
 -pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/mobile/search?q=%TERMS%");
 -pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%");
 -pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/mobile/");
--pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
-+
-+pref("extensions.getAddons.recommended.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.recommended.url", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.url", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.browseAddons", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.get.url", "http://www.gnu.org/s/gnuzilla/addons.html");
+-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%");
+-pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
+++pref("extensions.getAddons.recommended.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html");
+++pref("extensions.getAddons.recommended.url", "http://www.gnu.org/s/gnuzilla/addons.html");
+++pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html");
+++pref("extensions.getAddons.search.url", "http://www.gnu.org/s/gnuzilla/addons.html");
+++pref("extensions.getAddons.browseAddons", "http://www.gnu.org/s/gnuzilla/addons.html");
+++pref("extensions.getAddons.get.url", "http://www.gnu.org/s/gnuzilla/addons.html");
  
  /* preference for the locale picker */
  pref("extensions.getLocales.get.url", "");