iceweasel-libre-13.0.1-1: fixing issues

3 files changed, 328 insertions, 58 deletions

diff --git a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
new file mode 100644
index 000000000..4da03a569
--- /dev/null
+++ b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
@@ -0,0 +1,271 @@
+From: Mike Hommey <mh@glandium.org>

+Date: Tue, 5 Jun 2012 08:57:06 +0200

+Subject: Bug 756390 - Make the "Reset Firefox" feature more generic

+

+---

+ browser/components/migration/content/migration.js       |   15 ++++++++++-----

+ browser/components/migration/content/migration.xul      |    2 +-

+ .../migration/src/BrowserProfileMigrators.manifest      |    2 +-

+ .../components/migration/src/FirefoxProfileMigrator.js  |    2 +-

+ browser/components/migration/src/ProfileMigrator.js     |    4 ++++

+ .../en-US/chrome/browser/migration/migration.dtd        |    2 --

+ .../en-US/chrome/browser/migration/migration.properties |   11 +++++------

+ toolkit/content/aboutSupport.js                         |    8 ++++----

+ toolkit/content/jar.mn                                  |    2 +-

+ toolkit/content/resetProfile.js                         |    6 ++----

+ toolkit/profile/nsIProfileMigrator.idl                  |   10 +++++++++-

+ toolkit/xre/nsAppRunner.cpp                             |    2 +-

+ 83 files changed, 394 insertions(+), 382 deletions(-)

+

+diff --git a/browser/components/migration/content/migration.js b/browser/components/migration/content/migration.js

+index ffb0c34..442a5ff 100644

+--- a/browser/components/migration/content/migration.js

++++ b/browser/components/migration/content/migration.js

+@@ -314,7 +314,7 @@ var MigrationWizard = {

+     }

+ 

+     var bundle = document.getElementById("brandBundle");

+-    // These strings don't exist when not using official branding. If that's

++    // These strings may not exist when not using official branding. If that's

+     // the case, just skip this page.

+     try {

+       var pageTitle = bundle.getString("homePageMigrationPageTitle");

+@@ -346,8 +346,8 @@ var MigrationWizard = {

+       case "chrome":

+         source = "sourceNameChrome";

+         break;

+-      case "firefox":

+-        source = "sourceNameFirefox";

++      case "self":

++        source = "brand";

+         break;

+     }

+ 

+@@ -357,8 +357,13 @@ var MigrationWizard = {

+     var oldHomePageURL = this._migrator.sourceHomePageURL;

+ 

+     if (oldHomePageURL && source) {

+-      var bundle2 = document.getElementById("bundle");

+-      var appName = bundle2.getString(source);

++      var appName;

++      if (source == "brand") {

++        appName = bundle.GetStringFromName("brandFullName");

++      } else {

++        var bundle2 = document.getElementById("bundle");

++        appName = bundle2.getString(source);

++      }

+       var oldHomePageLabel = bundle.getFormattedString("homePageImport",

+                                                        [appName]);

+       var oldHomePage = document.getElementById("oldHomePage");

+diff --git a/browser/components/migration/content/migration.xul b/browser/components/migration/content/migration.xul

+index f8653b1..f3ac62a 100644

+--- a/browser/components/migration/content/migration.xul

++++ b/browser/components/migration/content/migration.xul

+@@ -76,7 +76,7 @@

+ #endif

+ #endif

+       <radio id="chrome"    label="&importFromChrome.label;"    accesskey="&importFromChrome.accesskey;"/>

+-      <radio id="firefox"   label="&importFromFirefox.label;"   accesskey="&importFromFirefox.accesskey;"/>

++      <radio id="self"      hidden="true"/>

+       <radio id="fromfile"  label="&importFromHTMLFile.label;"  accesskey="&importFromHTMLFile.accesskey;" hidden="true"/>

+       <radio id="nothing"   label="&importFromNothing.label;"   accesskey="&importFromNothing.accesskey;" hidden="true"/>

+     </radiogroup>

+diff --git a/browser/components/migration/src/BrowserProfileMigrators.manifest b/browser/components/migration/src/BrowserProfileMigrators.manifest

+index f49e481..e490ddf 100644

+--- a/browser/components/migration/src/BrowserProfileMigrators.manifest

++++ b/browser/components/migration/src/BrowserProfileMigrators.manifest

+@@ -3,4 +3,4 @@ contract @mozilla.org/toolkit/profile-migrator;1 {6F8BB968-C14F-4D6F-9733-6C6737

+ component {4cec1de4-1671-4fc3-a53e-6c539dc77a26} ChromeProfileMigrator.js

+ contract @mozilla.org/profile/migrator;1?app=browser&type=chrome {4cec1de4-1671-4fc3-a53e-6c539dc77a26}

+ component {91185366-ba97-4438-acba-48deaca63386} FirefoxProfileMigrator.js

+-contract @mozilla.org/profile/migrator;1?app=browser&type=firefox {91185366-ba97-4438-acba-48deaca63386}

++contract @mozilla.org/profile/migrator;1?app=browser&type=self {91185366-ba97-4438-acba-48deaca63386}

+diff --git a/browser/components/migration/src/FirefoxProfileMigrator.js b/browser/components/migration/src/FirefoxProfileMigrator.js

+index 7b4a6e4..add5bc4 100644

+--- a/browser/components/migration/src/FirefoxProfileMigrator.js

++++ b/browser/components/migration/src/FirefoxProfileMigrator.js

+@@ -448,7 +448,7 @@ FirefoxProfileMigrator.prototype = {

+   ]),

+ 

+   classDescription: "Firefox Profile Migrator",

+-  contractID: "@mozilla.org/profile/migrator;1?app=browser&type=firefox",

++  contractID: "@mozilla.org/profile/migrator;1?app=browser&type=self",

+   classID: Components.ID("{91185366-ba97-4438-acba-48deaca63386}")

+ };

+ 

+diff --git a/browser/components/migration/src/ProfileMigrator.js b/browser/components/migration/src/ProfileMigrator.js

+index ea66675..fe4df10 100644

+--- a/browser/components/migration/src/ProfileMigrator.js

++++ b/browser/components/migration/src/ProfileMigrator.js

+@@ -51,6 +51,10 @@ ProfileMigrator.prototype = {

+                            params);

+   },

+ 

++  canMigrate: function PM__canMigrate(aMigratorKey) {

++    return "@mozilla.org/profile/migrator;1?app=browser&type=" + aMigratorKey in Cc;

++  },

++

+   _toCString: function PM__toCString(aStr) {

+     let cstr = Cc["@mozilla.org/supports-cstring;1"].

+                createInstance(Ci.nsISupportsCString);

+diff --git a/browser/locales/en-US/chrome/browser/migration/migration.dtd b/browser/locales/en-US/chrome/browser/migration/migration.dtd

+index 86e9d0b..8df7864 100644

+--- a/browser/locales/en-US/chrome/browser/migration/migration.dtd

++++ b/browser/locales/en-US/chrome/browser/migration/migration.dtd

+@@ -13,8 +13,6 @@

+ <!ENTITY importFromSafari.accesskey     "S">

+ <!ENTITY importFromChrome.label         "Chrome">

+ <!ENTITY importFromChrome.accesskey     "C">

+-<!ENTITY importFromFirefox.label        "Firefox">

+-<!ENTITY importFromFirefox.accesskey    "X">

+ <!ENTITY importFromHTMLFile.label       "From an HTML File">

+ <!ENTITY importFromHTMLFile.accesskey   "F">

+ 

+diff --git a/browser/locales/en-US/chrome/browser/migration/migration.properties b/browser/locales/en-US/chrome/browser/migration/migration.properties

+index 495ed78..0272654 100644

+--- a/browser/locales/en-US/chrome/browser/migration/migration.properties

++++ b/browser/locales/en-US/chrome/browser/migration/migration.properties

+@@ -4,7 +4,6 @@ profileName_format=%S %S

+ sourceNameIE=Internet Explorer

+ sourceNameSafari=Safari

+ sourceNameChrome=Google Chrome

+-sourceNameFirefox=Mozilla Firefox

+ 

+ importedBookmarksFolder=From %S

+ importedSearchURLsFolder=Keyword Searches (From %S)

+@@ -21,27 +20,27 @@ importedSafariBookmarks=From Safari

+ 2_ie=Cookies

+ 2_safari=Cookies

+ 2_chrome=Cookies

+-2_firefox=Cookies

++2_self=Cookies

+ 

+ 4_ie=Browsing History

+ 4_safari=Browsing History

+ 4_chrome=Browsing History

+-4_firefox=Browsing History

++4_self=Browsing History

+ 

+ 8_ie=Saved Form History

+ 8_safari=Saved Form History

+ 8_chrome=Saved Form History

+-8_firefox=Saved Form History

++8_self=Saved Form History

+ 

+ 16_ie=Saved Passwords

+ 16_safari=Saved Passwords

+ 16_chrome=Saved Passwords

+-16_firefox=Saved Passwords

++16_self=Saved Passwords

+ 

+ 32_ie=Favorites

+ 32_safari=Bookmarks

+ 32_chrome=Bookmarks

+-32_firefox=Bookmarks

++32_self=Bookmarks

+ 

+ 64_ie=Other Data

+ 64_safari=Other Data

+diff --git a/toolkit/content/aboutSupport.js b/toolkit/content/aboutSupport.js

+index c86d80c..ff1ccfe 100644

+--- a/toolkit/content/aboutSupport.js

++++ b/toolkit/content/aboutSupport.js

+@@ -608,13 +608,13 @@ function populateResetBox() {

+                          .getService(Ci.nsIToolkitProfileService);

+   let currentProfileDir = Services.dirsvc.get("ProfD", Ci.nsIFile);

+ 

+-#expand const MOZ_APP_NAME = "__MOZ_APP_NAME__";

+-#expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__";

+-

+   // Only show the reset box for the default profile if the self-migrator used for reset exists.

+   try {

+     if (!currentProfileDir.equals(profileService.selectedProfile.rootDir) ||

+-        !("@mozilla.org/profile/migrator;1?app=" + MOZ_BUILD_APP + "&type=" + MOZ_APP_NAME in Cc))

++        !("@mozilla.org/toolkit/profile-migrator;1" in Cc))

++      return;

++    let pm = Cc["@mozilla.org/toolkit/profile-migrator;1"].createInstance(Ci.nsIProfileMigrator);

++    if (!("canMigrate" in pm) || !pm.canMigrate("self"))

+       return;

+     document.getElementById("reset-box").style.visibility = "visible";

+   } catch (e) {

+diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn

+index 6f0d2d6..da7342b 100644

+--- a/toolkit/content/jar.mn

++++ b/toolkit/content/jar.mn

+@@ -38,7 +38,7 @@ toolkit.jar:

+ +  content/global/mozilla.xhtml               (mozilla.xhtml)

+ *+ content/global/nsDragAndDrop.js            (nsDragAndDrop.js)

+    content/global/resetProfile.css            (resetProfile.css)

+-*  content/global/resetProfile.js             (resetProfile.js)

++   content/global/resetProfile.js             (resetProfile.js)

+ *  content/global/resetProfile.xul            (resetProfile.xul)

+ *  content/global/treeUtils.js                (treeUtils.js)

+ *+ content/global/viewZoomOverlay.js          (viewZoomOverlay.js)

+diff --git a/toolkit/content/resetProfile.js b/toolkit/content/resetProfile.js

+index 975a9ed..d8e46b1 100644

+--- a/toolkit/content/resetProfile.js

++++ b/toolkit/content/resetProfile.js

+@@ -6,12 +6,10 @@ Components.utils.import("resource://gre/modules/Services.jsm");

+ 

+ // based on onImportItemsPageShow from migration.js

+ function onResetProfileLoad() {

+-#expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__";

+-#expand const MOZ_APP_NAME = "__MOZ_APP_NAME__";

+   const MAX_MIGRATED_TYPES = 16;

+ 

+   var migratedItems = document.getElementById("migratedItems");

+-  var bundle = Services.strings.createBundle("chrome://" + MOZ_BUILD_APP +

++  var bundle = Services.strings.createBundle("chrome://browser" +

+                                              "/locale/migration/migration.properties");

+ 

+   // Loop over possible data to migrate to give the user a list of what will be preserved. This

+@@ -21,7 +19,7 @@ function onResetProfileLoad() {

+     var itemID = Math.pow(2, i);

+     try {

+       var checkbox = document.createElement("label");

+-      checkbox.setAttribute("value", bundle.GetStringFromName(itemID + "_" + MOZ_APP_NAME));

++      checkbox.setAttribute("value", bundle.GetStringFromName(itemID + "_self"));

+       migratedItems.appendChild(checkbox);

+     } catch (x) {

+       // Catch exceptions when the string for a data type doesn't exist because it's not migrated

+diff --git a/toolkit/profile/nsIProfileMigrator.idl b/toolkit/profile/nsIProfileMigrator.idl

+index e941336..5b264af 100644

+--- a/toolkit/profile/nsIProfileMigrator.idl

++++ b/toolkit/profile/nsIProfileMigrator.idl

+@@ -69,7 +69,7 @@ interface nsIProfileStartup : nsISupports

+  * @client   Toolkit (Startup code)

+  * @obtainable service, contractid("@mozilla.org/toolkit/profile-migrator;1")

+  */

+-[scriptable, uuid(3df284a5-2258-4d46-a664-761ecdc04c22)]

++[scriptable, uuid(96d9ab66-082c-4a9e-82ad-f8c21b391342)]

+ interface nsIProfileMigrator : nsISupports 

+ {

+   /**

+@@ -92,6 +92,14 @@ interface nsIProfileMigrator : nsISupports

+    * @note The startup code ignores COM exceptions thrown from this method.

+    */

+   void migrate(in nsIProfileStartup aStartup, in ACString aKey);

++

++  /**

++   * Returns whether a given migration type is supported.

++   *

++   * @param  aKey   Migrator key

++   * @returns whether the migrator key is supported.

++   */

++  bool canMigrate(in ACString aKey);

+ };

+ 

+ %{C++

+diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp

+index 32eef5c..dbe1580 100644

+--- a/toolkit/xre/nsAppRunner.cpp

++++ b/toolkit/xre/nsAppRunner.cpp

+@@ -3561,7 +3561,7 @@ XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)

+             if (gDoProfileReset) {

+               // Automatically migrate from the current application if we just

+               // reset the profile.

+-              aKey = MOZ_APP_NAME;

++              aKey = "self";

+               pm->Migrate(&dirProvider, aKey);

+               // Set the new profile as the default after migration.

+               rv = SetCurrentProfileAsDefault(profileSvc, profD);

diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 8d0c63f13..bc2066080 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -3,6 +3,7 @@
 # Contributor: Figue <ffigue at gmail>
 # Contributor (Parabola): fauno <fauno@kiwwwi.com.ar>
 # Contributor (Parabola): vando <facundo@esdebian.org>
+# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
 # Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com>
 # Thank you very much to the older contributors:
 # Contributor: evr <evanroman at gmail>
@@ -49,17 +50,19 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
         libre.patch
         iceweasel-install-dir.patch
         region.properties
-        vendor.js)
+        vendor.js
+        Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
 md5sums=('e440446bb92dc1c0311346c68024590b'
          'cb8bfb543002a5d78db7e8661f9f87ec'
          'a9848e41461776bc4bf8d2de824b1204'
          'eab149c1994ab14392e55af3abb08e80'
          'ac29b01c189f20abae2f3eef1618ffc0'
          'a485a2b5dc544a8a2bd40c985d2e5813'
-         '64be2fab525189c285ee04495d628035'
+         '1c23b150a9c2eeb378f167a1dfa09d89'
          'e529742c0a425648087bc3ce537fe4c5'
          'f1c76e7e244257856a386ca2de69bdf0'
-         '0d053487907de4376d67d8f499c5502b')
+         '0d053487907de4376d67d8f499c5502b'
+         '41ce105f0c1877fe22e0c0ec45e09565')
 
 if [ "$_pkgname" != "$pkgname" ]; then
   provides+=("$_pkgname=$pkgver")
@@ -71,6 +74,7 @@ dpkg-source() {
   export QUILT_PATCHES=debian/patches
   export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
   export QUILT_DIFF_ARGS='--no-timestamps'
+  export DEBIAN_BRANDING_DIR="debian/branding"
   mv mozilla-release "${_debname}-${_debver}"
   mv debian "${_debname}-${_debver}"
   cd "${_debname}-${_debver}"
@@ -78,6 +82,9 @@ dpkg-source() {
 # Doesn't apply and seems unimportant
   rm -v debian/patches/l10n/Place-google-and-gmail-before-yandex.patch || true
 
+# This patch doesn't works in some parts due that has patches for others locales languages, source code doesn't has it
+  rm -v debian/patches/debian-hacks/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch || true
+
   quilt push -a
   find .pc -name .timestamp -delete # why isn't "--no-timestamps" doing this?
   cd ..
@@ -98,6 +105,10 @@ if [ $NOEXTRACT -eq 0 ]; then
   patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname
   patch -Np1 -i "$srcdir/xulrunner-copy-stub.patch" # small fix
   patch -Np1 -i "$srcdir/libre.patch"
+
+# Adding fixed Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
+  patch -Np1 -i "$srcdir/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch"
+
 fi
 
   cd "$srcdir/mozilla-build"
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index ecebbb3ce..7b4e6a395 100644
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -1,13 +1,13 @@
-diff -urN iceweasel-9.0.1.orig/browser/app/profile/firefox.js iceweasel-9.0.1/browser/app/profile/firefox.js
---- 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
+diff -urN iceweasel-13.0.orig/browser/app/profile/firefox.js iceweasel-13.0/browser/app/profile/firefox.js
+--- mozilla-build.orig/browser/app/profile/firefox.js	2012-06-01 09:03:47.000000000 -0300
++++ mozilla-build/browser/app/profile/firefox.js	2012-06-05 19:53:08.847012282 -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%");
 -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.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%&platform=%OS%&appver=%VERSION%");
 -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%/%COMPATIBILITY_MODE%");
 +pref("extensions.getAddons.get.url", "");
@@ -18,7 +18,7 @@ diff -urN iceweasel-9.0.1.orig/browser/app/profile/firefox.js iceweasel-9.0.1/br
  
  // Blocklist preferences
  pref("extensions.blocklist.enabled", true);
-@@ -80,7 +80,7 @@
+@@ -92,7 +92,7 @@
  pref("extensions.autoDisableScopes", 15);
  
  // Dictionary download preference
@@ -27,7 +27,7 @@ diff -urN iceweasel-9.0.1.orig/browser/app/profile/firefox.js iceweasel-9.0.1/br
  
  // The minimum delay in seconds for the timer to fire.
  // default=2 minutes
-@@ -200,7 +200,7 @@
+@@ -218,7 +218,7 @@
  pref("extensions.update.interval", 86400);  // Check for updates to Extensions and 
                                              // Themes every day
  // Non-symmetric (not shared by extensions) extension-specific [update] preferences
@@ -36,7 +36,7 @@ diff -urN iceweasel-9.0.1.orig/browser/app/profile/firefox.js iceweasel-9.0.1/br
  pref("extensions.dss.enabled", false);          // Dynamic Skin Switching                                               
  pref("extensions.dss.switchPending", false);    // Non-dynamic switch pending after next
                                                  // restart.
-@@ -234,7 +234,7 @@
+@@ -252,7 +252,7 @@
  // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session
  // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore
  pref("browser.startup.page",                1);
@@ -45,7 +45,7 @@ diff -urN iceweasel-9.0.1.orig/browser/app/profile/firefox.js iceweasel-9.0.1/br
  
  // This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into
  // this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream
-@@ -324,7 +324,7 @@
+@@ -345,7 +345,7 @@
  pref("browser.download.manager.resumeOnWakeDelay", 10000);
  
  // search engines URL
@@ -54,7 +54,7 @@ diff -urN iceweasel-9.0.1.orig/browser/app/profile/firefox.js iceweasel-9.0.1/br
  
  // pointer to the default engine name
  pref("browser.search.defaultenginename",      "chrome://browser-region/locale/region.properties");
-@@ -563,7 +563,7 @@
+@@ -593,7 +593,7 @@
  pref("accessibility.typeaheadfind.flashBar", 1);
  
  // plugin finder service url
@@ -63,21 +63,9 @@ diff -urN iceweasel-9.0.1.orig/browser/app/profile/firefox.js iceweasel-9.0.1/br
  
  // by default we show an infobar message when pages require plugins the user has not installed, or are outdated
  pref("plugins.hide_infobar_for_missing_plugin", false);
-diff -urN iceweasel-9.0.1.orig/browser/base/content/syncSetup.js iceweasel-9.0.1/browser/base/content/syncSetup.js
---- iceweasel-9.0.1.orig/browser/base/content/syncSetup.js	2011-12-16 20:29:12.000000000 +0000
-+++ iceweasel-9.0.1/browser/base/content/syncSetup.js	2011-12-21 10:05:15.888062669 +0000
-@@ -59,7 +59,7 @@
- // Broader than we'd like, but after this changed from api-secure.recaptcha.net
- // we had no choice. At least we only do this for the duration of setup.
- // See discussion in Bugs 508112 and 653307.
--const RECAPTCHA_DOMAIN = "https://www.google.com";
-+const RECAPTCHA_DOMAIN = "https://www.duckduckgo.com";
- 
- Cu.import("resource://services-sync/main.js");
- Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-diff -urN iceweasel-9.0.1.orig/browser/locales/en-US/chrome/browser-region/region.properties iceweasel-9.0.1/browser/locales/en-US/chrome/browser-region/region.properties
---- iceweasel-9.0.1.orig/browser/locales/en-US/chrome/browser-region/region.properties	2011-12-16 20:29:13.000000000 +0000
-+++ iceweasel-9.0.1/browser/locales/en-US/chrome/browser-region/region.properties	2011-12-21 09:55:31.032062468 +0000
+diff -urN iceweasel-13.0.orig/browser/locales/en-US/chrome/browser-region/region.properties iceweasel-13.0/browser/locales/en-US/chrome/browser-region/region.properties
+--- mozilla-build.orig/browser/locales/en-US/chrome/browser-region/region.properties	2012-06-01 09:03:48.000000000 -0300
++++ mozilla-build/browser/locales/en-US/chrome/browser-region/region.properties	2012-06-05 20:07:51.593611484 -0300
 @@ -1,8 +1,8 @@
  # Default search engine
 -browser.search.defaultenginename=Google
@@ -98,9 +86,9 @@ diff -urN iceweasel-9.0.1.orig/browser/locales/en-US/chrome/browser-region/regio
  
  # 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 
-diff -urN iceweasel-9.0.1.orig/build/pgo/blueprint/elements.html iceweasel-9.0.1/build/pgo/blueprint/elements.html
---- iceweasel-9.0.1.orig/build/pgo/blueprint/elements.html	2011-12-16 20:29:13.000000000 +0000
-+++ iceweasel-9.0.1/build/pgo/blueprint/elements.html	2011-12-21 10:04:42.988062659 +0000
+diff -urN iceweasel-13.0.orig/build/pgo/blueprint/elements.html iceweasel-13.0/build/pgo/blueprint/elements.html
+--- mozilla-build.orig/build/pgo/blueprint/elements.html	2012-06-01 09:03:49.000000000 -0300
++++ mozilla-build/build/pgo/blueprint/elements.html	2012-06-05 20:37:22.059133787 -0300
 @@ -143,7 +143,7 @@
        </p>
        <p>
@@ -110,10 +98,10 @@ diff -urN iceweasel-9.0.1.orig/build/pgo/blueprint/elements.html iceweasel-9.0.1
        </p>
        <p>
          <abbr title="extended abbr text should show when mouse over">&lt;abbr&gt; abbr - extended text when mouseover.</abbr><br>
-diff -urN iceweasel-9.0.1.orig/dom/ipc/test.xul iceweasel-9.0.1/dom/ipc/test.xul
---- iceweasel-9.0.1.orig/dom/ipc/test.xul	2011-12-16 20:29:17.000000000 +0000
-+++ iceweasel-9.0.1/dom/ipc/test.xul	2011-12-21 10:03:33.224062635 +0000
-@@ -301,6 +301,6 @@
+diff -urN iceweasel-13.0.orig/dom/ipc/test.xul iceweasel-13.0/dom/ipc/test.xul
+--- mozilla-build.orig/dom/ipc/test.xul	2012-06-01 09:03:55.000000000 -0300
++++ mozilla-build/dom/ipc/test.xul	2012-06-05 20:40:59.453890004 -0300
+@@ -294,6 +294,6 @@
                 oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/>
    </toolbar>
  
@@ -121,9 +109,9 @@ diff -urN iceweasel-9.0.1.orig/dom/ipc/test.xul iceweasel-9.0.1/dom/ipc/test.xul
 +  <browser type="content" src="http://www.duckduckgo.com/" flex="1" id="page" remote="true"/>
    <label id="messageLog" value="" crop="center"/>
  </window>
-diff -urN iceweasel-9.0.1.orig/layout/ipc/test-ipcbrowser.xul iceweasel-9.0.1/layout/ipc/test-ipcbrowser.xul
---- iceweasel-9.0.1.orig/layout/ipc/test-ipcbrowser.xul	2011-12-16 20:29:28.000000000 +0000
-+++ iceweasel-9.0.1/layout/ipc/test-ipcbrowser.xul	2011-12-21 10:03:06.408062626 +0000
+diff -urN iceweasel-13.0.orig/layout/ipc/test-ipcbrowser.xul iceweasel-13.0/layout/ipc/test-ipcbrowser.xul
+--- mozilla-build.orig/layout/ipc/test-ipcbrowser.xul	2012-06-01 09:04:06.000000000 -0300
++++ mozilla-build/layout/ipc/test-ipcbrowser.xul	2012-06-05 20:44:00.714006926 -0300
 @@ -69,6 +69,6 @@
         label="setViewportScale"/>
    </toolbar>
@@ -132,16 +120,16 @@ 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/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
-@@ -220,13 +220,12 @@
+diff -urN iceweasel-13.0.orig/mobile/xul/app/mobile.js iceweasel-13.0/mobile/xul/app/mobile.js
+--- mozilla-build.orig/mobile/xul/app/mobile.js	2012-06-01 09:04:14.000000000 -0300
++++ mozilla-build/mobile/xul/app/mobile.js	2012-06-05 20:48:20.193241600 -0300
+@@ -221,13 +221,12 @@
  /* preferences for the Get Add-ons pane */
  pref("extensions.getAddons.cache.enabled", true);
  pref("extensions.getAddons.maxResults", 15);
 -pref("extensions.getAddons.recommended.browseURL", "https://addons.mozilla.org/%LOCALE%/mobile/recommended/");
 -pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/list/featured/all/%MAX_RESULTS%/%OS%/%VERSION%");
--pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/mobile/search?q=%TERMS%");
+-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/mobile/search?q=%TERMS%&platform=%OS%&appver=%VERSION%");
 -pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%");
 -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%");
@@ -155,8 +143,8 @@ diff -urN iceweasel-9.0.1.orig/mobile/xul/app/mobile.js iceweasel-9.0.1/mobile/x
  
  /* preference for the locale picker */
  pref("extensions.getLocales.get.url", "");
-@@ -239,7 +240,7 @@
- pref("privacy.popups.showBrowserMessage", true);
+@@ -247,7 +246,7 @@
+ pref("dom.disable_window_open_dialog_feature", true);
  
  pref("keyword.enabled", true);
 -pref("keyword.URL", "http://www.google.com/m?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=");
@@ -164,9 +152,9 @@ diff -urN iceweasel-9.0.1.orig/mobile/xul/app/mobile.js iceweasel-9.0.1/mobile/x
  
  pref("accessibility.typeaheadfind", false);
  pref("accessibility.typeaheadfind.timeout", 5000);
-diff -urN iceweasel-9.0.1.orig/mobile/locales/en-US/chrome/region.properties iceweasel-9.0.1/mobile/locales/en-US/chrome/region.properties
---- iceweasel-9.0.1.orig/mobile/locales/en-US/chrome/region.properties	2011-12-16 20:29:36.000000000 +0000
-+++ iceweasel-9.0.1/mobile/locales/en-US/chrome/region.properties	2011-12-21 09:54:17.560062443 +0000
+diff -urN iceweasel-13.0.orig/mobile/locales/en-US/chrome/region.properties iceweasel-13.0/mobile/locales/en-US/chrome/region.properties
+--- mozilla-build.orig/mobile/locales/en-US/chrome/region.properties	2012-06-01 09:04:14.000000000 -0300
++++ mozilla-build/mobile/locales/en-US/chrome/region.properties	2012-06-05 20:53:03.264432170 -0300
 @@ -1,8 +1,8 @@
  # Default search engine
 -browser.search.defaultenginename=Google
@@ -187,9 +175,9 @@ diff -urN iceweasel-9.0.1.orig/mobile/locales/en-US/chrome/region.properties ice
  
  # 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
-diff -urN iceweasel-9.0.1.orig/modules/libpref/src/init/all.js iceweasel-9.0.1/modules/libpref/src/init/all.js
---- iceweasel-9.0.1.orig/modules/libpref/src/init/all.js	2011-12-21 09:07:20.000000000 +0000
-+++ iceweasel-9.0.1/modules/libpref/src/init/all.js	2011-12-21 10:09:17.136062754 +0000
+diff -urN iceweasel-13.0.orig/modules/libpref/src/init/all.js iceweasel-13.0/modules/libpref/src/init/all.js
+--- mozilla-build.orig/modules/libpref/src/init/all.js	2012-06-01 09:04:16.000000000 -0300
++++ mozilla-build/modules/libpref/src/init/all.js	2012-06-05 20:55:41.569045759 -0300
 @@ -47,7 +47,7 @@
  // SYNTAX HINTS:  dashes are delimiters.  Use underscores instead.
  //  The first character after a period must be alphabetic.
@@ -199,9 +187,9 @@ diff -urN iceweasel-9.0.1.orig/modules/libpref/src/init/all.js iceweasel-9.0.1/m
  pref("keyword.enabled", false);
  pref("general.useragent.locale", "chrome://global/locale/intl.properties");
  pref("general.useragent.compatMode.firefox", false);
-diff -urN iceweasel-9.0.1.orig/toolkit/locales/en-US/chrome/global-region/region.properties iceweasel-9.0.1/toolkit/locales/en-US/chrome/global-region/region.properties
---- iceweasel-9.0.1.orig/toolkit/locales/en-US/chrome/global-region/region.properties	2011-12-16 20:29:43.000000000 +0000
-+++ iceweasel-9.0.1/toolkit/locales/en-US/chrome/global-region/region.properties	2011-12-21 12:51:31.188066096 +0000
+diff -urN iceweasel-13.0.orig/toolkit/locales/en-US/chrome/global-region/region.properties iceweasel-13.0/toolkit/locales/en-US/chrome/global-region/region.properties
+--- mozilla-build.orig/toolkit/locales/en-US/chrome/global-region/region.properties	2012-06-01 09:04:20.000000000 -0300
++++ mozilla-build/toolkit/locales/en-US/chrome/global-region/region.properties	2012-06-05 20:58:59.068158482 -0300
 @@ -4,10 +4,10 @@
  pluginStartupMessage=Starting Plugin for type
  
@@ -219,15 +207,15 @@ diff -urN iceweasel-9.0.1.orig/toolkit/locales/en-US/chrome/global-region/region
 +plugindoc_label=gnuzilla.gnu.org
 +plugindoc_url=http://www.gnu.org/s/gnuzilla/addons.html
  
---- iceweasel-10.0.orig/browser/locales/generic/profile/bookmarks.html.in	2012-02-07 15:40:34.279657460 -0300
-+++ iceweasel-10.0/browser/locales/generic/profile/bookmarks.html.in	2012-02-07 15:40:19.226324812 -0300
-@@ -11,13 +11,13 @@
+diff -urN iceweasel-13.0.orig/browser/locales/generic/profile/bookmarks.html.in iceweasel-13.0/browser/locales/generic/profile/bookmarks.html.in
+--- mozilla-build.orig/browser/locales/generic/profile/bookmarks.html.in	2012-06-01 09:03:48.000000000 -0300
++++ mozilla-build/browser/locales/generic/profile/bookmarks.html.in	2012-06-05 21:03:38.239300038 -0300
+@@ -11,13 +11,12 @@
      <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3>
  <DD>@bookmarks_toolbarfolder_description@
      <DL><p>
 -        <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/central/" ID="rdf:#$GvPhC3">@getting_started@</A>
-+        <DT><A HREF="http://www.connochaetos.org/">ConnochaetOS</A>
-+        <DT><A HREF="https://parabolagnulinux.org/">Parabola</A>
++        <DT><A HREF="https://parabolagnulinux.org/">Parabola GNU/Linux-libre</A>
      </DL><p>
      <DT><H3 ID="rdf:#$ZvPhC3">@firefox_heading@</H3>
      <DL><p>