Merge branch 'master' of ssh://parabola-git/srv/git/abslibre/abslibre

6 files changed, 147 insertions, 566 deletions

diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD
index 52b25edc3..4c43612d0 100644
--- a/libre/iceweasel-l10n/PKGBUILD
+++ b/libre/iceweasel-l10n/PKGBUILD
@@ -6,8 +6,8 @@
 # Based on icecat-l10n package, which is in turn based on firefox-i18n
 
 _debname=iceweasel
-_debver=29.0.1
-_debrel=deb2
+_debver=30.0
+_debrel=deb1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
@@ -71,85 +71,85 @@ for lang in ${_langpacks[@]}; do
 done
 
 md5sums=('a4593936bf1c7a9ec9368ff249f9cc56'
-         '5212e031eae6de237047493dd3b17839'
-         '5256c33646c811243d971c2948d4540f'
-         '1b4ebf2a5bb60a39a692e6e2bf921bc1'
-         'eff8df5362b969fad2d5035f0e293c3b'
-         '53764ab1290f283f5cb19fa7c7851b5b'
-         '286a30364cbe548b8ea7869a9ed0e714'
-         '268d68d7f7ac0c370a55fd7f3f4c494c'
-         'f06df37df6355d61b572b6088e6827e8'
-         '2c87dbb5025d05f95f001ab992ec9da5'
-         'a1b079b85c5756b1583a13cd24863e9d'
-         'b002a0c681dbac4069943b5db61c95e5'
-         '310af575e5c39d7962cdb56169262185'
-         '1f773521b7b6675582439e64d9e3d758'
-         '02879f164cb7cd9a13af3e1b46fea80d'
-         '6ea7166c043a7d4c05c210d5261c414c'
-         'f65c77f6f15c04275a008d6e58bd541c'
-         'c7aa15567191e72dd757691abb1a5ae7'
-         '46a8e0708537ea2631fe8790a383d5a7'
-         'cc693b069aa1d9b4788c02e10ab788d3'
-         '49b31e547a79005e3e2cc0506389cfff'
-         'f4f7b1752d03cb075a17fd03d2ff62de'
-         'c2339402fa423f24941cc31d8317c07d'
-         'eb95e0d926d08ad7d4d2c07dbaf95f1f'
-         '7f65d10b78824b6d68823670a2465e3e'
-         '29e6930e9614730c5a7c7af9918a6bf6'
-         '707399d8624c1d11e23449ec98ff295a'
-         '9f38ec248ce6d0effcbb8dc0a57d0451'
-         'a142fd17b8a6210b4175787e706a1dd0'
-         'f2859ececb5f37952e1251e2a4c12eb2'
-         '683cc117552326b7956735ce92a615c6'
-         'f5fb8323242af74905a252b2aedfb8ac'
-         'dd4bb43eb2667ddbce04df69d476b6eb'
-         '47bae6defee487720cf4af99d4800661'
-         '0b3140ec20919558f9ec98091701106c'
-         '82a89d3d33abee4c7a8e6c2fa85e975a'
-         'd9ca9caf4db47f7196fc6214e0a88adf'
-         '0383cd4f92605bf1f9b5ee0f65aed28c'
-         '1b223a3e494e52c035dc60c573df1e77'
-         '0ad8bf4d1654e0526046e0c029e13cf5'
-         '8429ca65a11669c1d42c6f250b650372'
-         '2cbac1603a4e4363ff7322f8a09b6a86'
-         '3825833afcd237ef7f647bdbb9b1b385'
-         '009c5f3e9e3763b7f1aacfab67b351a1'
-         'e617f501efd7546e2926dc314b6f4bb0'
-         '327748b28598bae3c3425c3392a89ee1'
-         'c3c38d1e1bff579c05fb470a44d35ea6'
-         '5d3f5c3cd1ae88ad0fb3b93da2c55089'
-         '1f8df74964bf45063dfa5d313596cbe0'
-         '35e562ca13f45c02042619bce9e92e0c'
-         '57f901a464f6d474267f03980342e4b2'
-         'f7fb39449967ad0da8aa567ba2e4cb96'
-         'bfb7ac8d35e0418ac351e2f9494eb3eb'
-         '00543f199dc9043601add130bd35cf7c'
-         '6bfe70687da3906ff8c60084e7cd11f0'
-         'b363419979847f37b61efd36d82b1b22'
-         '41cf324447d9e4d4d31dc570e013668e'
-         '3167c6aa26338edbc2fea9286b74ac92'
-         'a6d70c9fa7a4eb5c18361f206b0c2853'
-         'c22b649ed95516ab2f209d5f457fc7ec'
-         '05125f937750c8a32b21025dd795ad34'
-         '0566b26dd4ab9e407566a260b6fa437a'
-         'df14368e5407b32f35afec5983d23065'
-         '26f7f8630d2af347d30158493e72dbc6'
-         'e95a43f0267dc0208628a613ab36462d'
-         'aa4a9f335e4b16b940e95737176138fa'
-         '493018de7779e66e2bd405f9a48f583d'
-         'a7c85664f9d8d5de735ecb8c83888e34'
-         '2226e585636f8128bb2cd2bb99119798'
-         'f56cc0a56c3549f6209b8075f2c96612'
-         'b66c06b84b384ee2dff7ebfe99cfd5bd'
-         '1a7bee60f76a49385bdae30f2cba57cf'
-         'e38da54ece4d168306c36f164fda7cd6'
-         'd4d1ac230fdce90aab2a788f07b76c29'
-         'ed2daf324d05e140da7c9c3f0530a13f'
-         'ba18543af3aca23aa987c4bb1b2d721d'
-         '01782138beaa302f3937a8654d445349'
-         '39025e66895473df2a0aedb967c994ad'
-         'a6023974d5bb2536afb533f55e146f30'
-         '6b443a261b5c71861dc162e63e276411'
-         '3e0d27a1975e62b3289afce485cc6a10'
-         '4505e984500672d97b9873cdc8f9813f'
-         '261941346e68fd1d3aae024734e0f9cd')
+         'a4ebadbcd3792d8df1d9d781ed71de01'
+         'd808ad3e592e61d0b9bc221600f083ee'
+         '5d337f816a8b0a66764226b490b5e2c8'
+         '09d45c5b359b83065276ed38e70b96fb'
+         '2fbbe3cf20242b703d4435204d558bdf'
+         '41dd62eda1522717e640db9300fa8219'
+         '7a5c03ecaae02beb41400d7903af771e'
+         '24cf8ff52b7f7568735910f2272809d4'
+         '5a0e6ca6b4c3eebf2c13b0897c535168'
+         '0c997d23e45f3aa8d906c7fefd149950'
+         'f3b756e5afdf6bc5ce22e229ef9d810f'
+         '57a1e272e720b93988a6159c6865d61f'
+         'bf16f137b99e9ef816c78e5e4eded227'
+         'c503e483e5ab38e7d5fd0b4972fcbc33'
+         '765e13734512f2e0eb21305dfc8d4159'
+         '11450005daf415910863362606244dc9'
+         '2fddb79e2d9ed989313a3ef26600fdac'
+         'c89513012b9ebcd635d1d3d0af21c894'
+         '7100396629a2051ef04112c785a2659c'
+         'd239601f870a8d2d21b12fe7b498d0e5'
+         'dd0f09e577c528e259ef1cf5d5891f1c'
+         'f571a129430b6b86143ac672733e98ba'
+         '7048e50f5dfd348337c46aae445bdd38'
+         '1dccd98c3a34cd95c0a11ee49bd68f31'
+         '086c5270c7cead2207922da4d15295ab'
+         '5ddb9ac3ae4202aa619cf6c459735d3f'
+         '60cfabd429c222056a837bd7e0fed2ba'
+         'f276e31c1c9381c99c2b193c2fdeb07b'
+         '97fa118868effc7aef1099404c44d1c7'
+         '60acbd8824d0e880108c91e9c1ac1fd2'
+         '74bab6b82f4cfc053b3c3bcc6bd9ad32'
+         '577cf1c5abc7eafcd089484efba3ca73'
+         'e3c478dbc1be5dad585270de58aaa8cd'
+         '9448c177eeb1a601e540e3eb34061c8d'
+         '54238a4ddd14929278365282562b8f17'
+         '9748cdc9ac6d2f24040c7cd671952110'
+         '38154e8181ceea36939e1b2d1e9332f8'
+         '85a1bf8e27d54efccb2db596c860db38'
+         'a16e4e09c9cec0e4222aff9631605a6f'
+         'd7c50c99ccc20cf2e804d68043cbc82b'
+         '0d696d728e376fc49f04c871dab48b94'
+         '16fc03a3e98ea4a075394af4ff9380b3'
+         '895c82fed083616ac88f1f9b49469d7f'
+         '1619509e3c27400f0350b264c0002f1e'
+         'ba65d345b0ac2fbf057eccf27e8f37a0'
+         '0e3d9acc4be099621a63d48e29516e1b'
+         'c12ecc9ae543b59a8ca84f4a39ebc650'
+         'e5ab76e0f6d7a26755aff3a4719e6d23'
+         'b2e0be67e9e1d6b4791fde0fb0fb9214'
+         '1a8a299cf4b325f92d6724e8db440ce5'
+         '42674ca5e2dba846c4f9aafe17f746ef'
+         '52b261a801eac3690444282c0ce775ce'
+         '814508f80b8ee14c75f246d12f949c9f'
+         '287ac8a6e330e74e9da9da0afdb8d143'
+         'afaf98af1617be4063ac02522c4781ac'
+         '1b54b35778cd45c35e970a68dccd8b49'
+         '26ba16c8126f033e87e066a617a94aec'
+         '1c7b8f635357d12f79309957f521f6f1'
+         '5675466e6e11505e7fbddf1b3a7aabd2'
+         '53c439be649253fb58ae5cd0458d2c4d'
+         '622509371083bf62233d3489d0709360'
+         '2e2dbfd3573a8ccf3614bf9ac0619edc'
+         'be1f3d3d4aac76fe19be373dd1046859'
+         'd01fee3c62ca34fc5c06295a0401eb58'
+         'ddf3acdaecfbbe8f8828d66b1f055c51'
+         '6f21301b43463b19a4f7e73c2d0fd05b'
+         '8825499cf0120b8cf9a58693644e7b54'
+         'd07f0ca31a841317b36c6aa00c7d51b6'
+         '41435530531cea6b067c69041007ba51'
+         '3f091773b50248ec33c12e177c4073ef'
+         'd5c52bd0cb774ec9afe267d3c38aa994'
+         'c5514c3eee68b19969676b73c7c3ea42'
+         '44a311210e2e3f4b51d134498da0d0bf'
+         'e92bb2a8677c7ec8a50fa7ba35d4805f'
+         '1205b6b370499e2e0c7ef428bc4d2a3f'
+         '50297f4fda05fb09516345788938f6dc'
+         '20fe5a27307f924d5c8b4130fa34e18e'
+         '4629cdcfedd802f7d5d2b7cd0929db8a'
+         'ce4a5c30aea9212cd71af9e990e95638'
+         'd4b642858a1d8297d33223141a95199e'
+         '149b2070f4fc5116093221957bba3dfb'
+         '27b23f1040f2bfface3a13e1152a3d1a')
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
deleted file mode 100644
index 56de11354..000000000
--- a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
+++ /dev/null
@@ -1,287 +0,0 @@
-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

-

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

-index 91c5c1c..2f8bd1a 100644

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

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

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

-     }

- 

-     var brandBundle = 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 = brandBundle.getString("homePageMigrationPageTitle");

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

-       case "chrome":

-         source = "sourceNameChrome";

-         break;

--      case "firefox":

--        source = "sourceNameFirefox";

-+      case "self":

-+        source = "brand";

-         break;

-     }

- 

-@@ -292,7 +292,12 @@ var MigrationWizard = {

-     var oldHomePageURL = this._migrator.sourceHomePageURL;

- 

-     if (oldHomePageURL && source) {

--      var appName = MigrationUtils.getLocalizedString(source);

-+      var appName;

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

-+        appName = brandBundle.GetStringFromName("brandFullName");

-+      } else {

-+        appName = MigrationUtils.getLocalizedString(source);

-+      }

-       var oldHomePageLabel =

-         brandBundle.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 f030756..23e37ff 100644

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

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

-@@ -42,7 +42,7 @@

- #elifdef XP_UNIX

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

- #endif

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

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

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

-     </radiogroup>

-     <label id="noSources" hidden="true">&noMigrationSources.label;</label>

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

-index d7fec75..d531b83 100644

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

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

-@@ -3,7 +3,7 @@ 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}

- #ifdef HAS_IE_MIGRATOR

- component {3d2532e3-4932-4774-b7ba-968f5899d3a4} IEProfileMigrator.js

- contract @mozilla.org/profile/migrator;1?app=browser&type=ie {3d2532e3-4932-4774-b7ba-968f5899d3a4}

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

-index 3db6720..a3b3dda 100644

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

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

-@@ -128,7 +128,7 @@ Object.defineProperty(FirefoxProfileMigrator.prototype, "startupOnlyMigrator", {

- 

- 

- FirefoxProfileMigrator.prototype.classDescription = "Firefox Profile Migrator";

--FirefoxProfileMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?app=browser&type=firefox";

-+FirefoxProfileMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?app=browser&type=self";

- FirefoxProfileMigrator.prototype.classID = Components.ID("{91185366-ba97-4438-acba-48deaca63386}");

- 

- this.NSGetFactory = XPCOMUtils.generateNSGetFactory([FirefoxProfileMigrator]);

-diff --git a/browser/components/migration/src/MigrationUtils.jsm b/browser/components/migration/src/MigrationUtils.jsm

-index 2c91e9a..08962c4 100644

---- a/browser/components/migration/src/MigrationUtils.jsm

-+++ b/browser/components/migration/src/MigrationUtils.jsm

-@@ -405,12 +405,6 @@ this.MigrationUtils = Object.freeze({

-    * @see nsIStringBundle

-    */

-   getLocalizedString: function MU_getLocalizedString(aKey, aReplacements) {

--    const OVERRIDES = {

--      "4_firefox": "4_firefox_history_and_bookmarks",

--      "64_firefox": "64_firefox_other"

--    };

--    aKey = OVERRIDES[aKey] || aKey;

--

-     if (aReplacements === undefined)

-       return getMigrationBundle().GetStringFromName(aKey);

-     return getMigrationBundle().formatStringFromName(

-@@ -625,6 +619,17 @@ this.MigrationUtils = Object.freeze({

-   },

- 

-   /**

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

-+   *

-+   * @param  aKey   Migrator key

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

-+   */

-+  canMigrate:

-+  function MU_canMigrate(aMigratorKey) {

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

-+  },

-+

-+  /**

-    * Cleans up references to migrators and nsIProfileInstance instances.

-    */

-   finishMigration: function MU_finishMigration() {

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

-index f67823b..36016b8 100644

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

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

-@@ -12,6 +12,7 @@ function ProfileMigrator() {

- 

- ProfileMigrator.prototype = {

-   migrate: MigrationUtils.startupMigration.bind(MigrationUtils),

-+  canMigrate: MigrationUtils.canMigrate.bind(MigrationUtils),

-   QueryInterface: XPCOMUtils.generateQI([Components.interfaces.nsIProfileMigrator]),

-   classDescription: "Profile Migrator",

-   contractID: "@mozilla.org/toolkit/profile-migrator;1",

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

-index 21cf405..f3c1a6b 100644

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

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

-@@ -17,8 +17,6 @@

- <!ENTITY importFromSafari.accesskey     "S">

- <!ENTITY importFromChrome.label         "Chrome">

- <!ENTITY importFromChrome.accesskey     "C">

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

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

- 

- <!ENTITY noMigrationSources.label       "No programs that contain bookmarks, history or password data could be found.">

- 

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

-index 094a9dc..a620905 100644

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

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

-@@ -24,30 +24,30 @@ importedSafariReadingList=Reading List (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_history_and_bookmarks=Browsing History and Bookmarks

-+4_self=Browsing History and Bookmarks

- 

- 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_ie=Favourites

- 32_safari=Bookmarks

- 32_chrome=Bookmarks

- 

- 64_ie=Other Data

- 64_safari=Other Data

- 64_chrome=Other Data

--64_firefox_other=Other Data

-+64_self=Other Data

- 

--128_firefox=Windows and Tabs

-+128_self=Windows and Tabs

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

-index d46b43b..2253994 100644

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

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

-@@ -28,6 +28,58 @@ function onResetProfileLoad() {

-   populateResetPane("migratedItems");

- }

- 

-+<<<<<<< HEAD

-+=======

-+/**

-+ * Check if reset is supported for the currently running profile.

-+ *

-+ * @return boolean whether reset is supported.

-+ */

-+function resetSupported() {

-+  let profileService = Cc["@mozilla.org/toolkit/profile-service;1"].

-+                       getService(Ci.nsIToolkitProfileService);

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

-+

-+  // Reset is only supported for the default profile if the self-migrator used for reset exists.

-+  try {

-+    if (currentProfileDir.equals(profileService.selectedProfile.rootDir) &&

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

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

-+      return ("canMigrate" in pm) && pm.canMigrate("self");

-+    }

-+  } catch (e) {

-+    // Catch exception when there is no selected profile.

-+    Cu.reportError(e);

-+  }

-+  return false;

-+}

-+

-+function getMigratedData() {

-+  Components.utils.import("resource:///modules/MigrationUtils.jsm");

-+

-+  // From migration.properties

-+  const MIGRATED_TYPES = [

-+    4,  // History and Bookmarks

-+    16, // Passwords

-+    8,  // Form History

-+    2,  // Cookies

-+  ];

-+

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

-+  let dataTypes = [];

-+  for (let itemID of MIGRATED_TYPES) {

-+    try {

-+      let typeName = MigrationUtils.getLocalizedString(itemID + "_self");

-+      dataTypes.push(typeName);

-+    } catch (x) {

-+      // Catch exceptions when the string for a data type doesn't exist.

-+      Components.utils.reportError(x);

-+    }

-+  }

-+  return dataTypes;

-+}

-+

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

- function onResetProfileAccepted() {

-   let retVals = window.arguments[0];

-   retVals.reset = true;

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

-index f35c227..7062886 100644

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

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

-@@ -37,7 +37,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 

- {

-   /**

-@@ -60,6 +60,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 fe66f3b..2ddcd3b 100644

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

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

-@@ -3952,7 +3952,7 @@ XREMain::XRE_mainRun()

-         if (gDoProfileReset) {

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

-           // reset the profile.

--          aKey = MOZ_APP_NAME;

-+          aKey = "self";

-         }

-         pm->Migrate(&mDirProvider, aKey);

-       }

diff --git a/libre/iceweasel-libre/Fixup-Reset-Firefox-after-bad-merge.patch b/libre/iceweasel-libre/Fixup-Reset-Firefox-after-bad-merge.patch
deleted file mode 100644
index c7c4c355b..000000000
--- a/libre/iceweasel-libre/Fixup-Reset-Firefox-after-bad-merge.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From: Mike Hommey <mh@glandium.org>
-Date: Sat, 16 Nov 2013 13:01:17 +0900
-Subject: Fixup "Reset Firefox" after bad merge
-
----
- toolkit/content/resetProfile.js  | 52 ----------------------------------------
- toolkit/modules/ResetProfile.jsm | 11 +++++----
- 2 files changed, 6 insertions(+), 57 deletions(-)
-
-diff --git a/toolkit/content/resetProfile.js b/toolkit/content/resetProfile.js
-index 2253994..d46b43b 100644
---- a/toolkit/content/resetProfile.js
-+++ b/toolkit/content/resetProfile.js
-@@ -28,58 +28,6 @@ function onResetProfileLoad() {
-   populateResetPane("migratedItems");
- }
- 
--<<<<<<< HEAD
--=======
--/**
-- * Check if reset is supported for the currently running profile.
-- *
-- * @return boolean whether reset is supported.
-- */
--function resetSupported() {
--  let profileService = Cc["@mozilla.org/toolkit/profile-service;1"].
--                       getService(Ci.nsIToolkitProfileService);
--  let currentProfileDir = Services.dirsvc.get("ProfD", Ci.nsIFile);
--
--  // Reset is only supported for the default profile if the self-migrator used for reset exists.
--  try {
--    if (currentProfileDir.equals(profileService.selectedProfile.rootDir) &&
--        "@mozilla.org/toolkit/profile-migrator;1" in Cc) {
--      let pm = Cc["@mozilla.org/toolkit/profile-migrator;1"].createInstance(Ci.nsIProfileMigrator);
--      return ("canMigrate" in pm) && pm.canMigrate("self");
--    }
--  } catch (e) {
--    // Catch exception when there is no selected profile.
--    Cu.reportError(e);
--  }
--  return false;
--}
--
--function getMigratedData() {
--  Components.utils.import("resource:///modules/MigrationUtils.jsm");
--
--  // From migration.properties
--  const MIGRATED_TYPES = [
--    4,  // History and Bookmarks
--    16, // Passwords
--    8,  // Form History
--    2,  // Cookies
--  ];
--
--  // Loop over possible data to migrate to give the user a list of what will be preserved.
--  let dataTypes = [];
--  for (let itemID of MIGRATED_TYPES) {
--    try {
--      let typeName = MigrationUtils.getLocalizedString(itemID + "_self");
--      dataTypes.push(typeName);
--    } catch (x) {
--      // Catch exceptions when the string for a data type doesn't exist.
--      Components.utils.reportError(x);
--    }
--  }
--  return dataTypes;
--}
--
-->>>>>>> Bug 756390 - Make the "Reset Firefox" feature more generic
- function onResetProfileAccepted() {
-   let retVals = window.arguments[0];
-   retVals.reset = true;
-diff --git a/toolkit/modules/ResetProfile.jsm b/toolkit/modules/ResetProfile.jsm
-index db57f2a..d618d08 100644
---- a/toolkit/modules/ResetProfile.jsm
-+++ b/toolkit/modules/ResetProfile.jsm
-@@ -7,8 +7,6 @@
- this.EXPORTED_SYMBOLS = ["ResetProfile"];
- 
- const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
--#expand const MOZ_APP_NAME = "__MOZ_APP_NAME__";
--#expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__";
- 
- Cu.import("resource://gre/modules/Services.jsm");
- 
-@@ -25,8 +23,11 @@ this.ResetProfile = {
- 
-     // Reset is only supported for the default profile if the self-migrator used for reset exists.
-     try {
--      return currentProfileDir.equals(profileService.selectedProfile.rootDir) &&
--        ("@mozilla.org/profile/migrator;1?app=" + MOZ_BUILD_APP + "&type=" + MOZ_APP_NAME in Cc);
-+      if (currentProfileDir.equals(profileService.selectedProfile.rootDir) &&
-+          "@mozilla.org/toolkit/profile-migrator;1" in Cc) {
-+        let pm = Cc["@mozilla.org/toolkit/profile-migrator;1"].createInstance(Ci.nsIProfileMigrator);
-+        return ("canMigrate" in pm) && pm.canMigrate("self");
-+      }
-     } catch (e) {
-       // Catch exception when there is no selected profile.
-       Cu.reportError(e);
-@@ -50,7 +51,7 @@ this.ResetProfile = {
-     let dataTypes = [];
-     for (let itemID of MIGRATED_TYPES) {
-       try {
--        let typeName = MigrationUtils.getLocalizedString(itemID + "_" + MOZ_APP_NAME);
-+        let typeName = MigrationUtils.getLocalizedString(itemID + "_self");
-         dataTypes.push(typeName);
-       } catch (x) {
-         // Catch exceptions when the string for a data type doesn't exist.
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 083262b48..0a4127d60 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -14,8 +14,8 @@ _pgo=true
 
 # We're getting this from Debian Sid
 _debname=iceweasel
-_debver=29.0.1
-_debrel=deb2
+_debver=30.0
+_debrel=deb1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
@@ -29,19 +29,16 @@ pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based o
 arch=(i686 x86_64 mips64el)
 license=(MPL GPL LGPL)
 depends=(alsa-lib dbus-glib desktop-file-utils gtk2 hicolor-icon-theme hunspell icu libevent libnotify libvpx libxt mime-types mozilla-common mozilla-searchplugins nss sqlite startup-notification)
-makedepends=(autoconf2.13 clang diffutils gstreamer0.10-base imagemagick imake inetutils libidl2 libpulse librsvg libxslt mesa pkg-config python2 quilt unzip zip)
+makedepends=(autoconf2.13 diffutils gst-plugins-base-libs imagemagick imake inetutils libidl2 libpulse librsvg libxslt mesa pkg-config python2 quilt unzip zip)
 [ "$CARCH" != "mips64el" ] && makedepends+=('yasm')
-options=(!emptydirs !makeflags)
+options=(!emptydirs !makeflags debug)
 if $_pgo; then
   makedepends+=(xorg-server-xvfb)
   options+=(!ccache)
 fi
 optdepends=('networkmanager: Location detection via available WiFi networks'
-            'gstreamer0.10-base-plugins: vorbis decoding, ogg demuxing'
-            'gstreamer0.10-good-plugins: webm and mp4 demuxing'
-            'gstreamer0.10-bad-plugins: aac, vp8 and opus decoding'
-            'gstreamer0.10-ugly-plugins: h.264 and mp3 decoding'
-            'gstreamer0.10-ffmpeg: more decoders'
+            'gst-plugins-good: h.264 video'
+            'gst-libav: h.264 video'
             'libpulse: PulseAudio audio driver')
 url="http://packages.debian.org/sid/${_pkgname}"
 install=iceweasel.install
@@ -57,21 +54,17 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
         iceweasel.desktop
         iceweasel-install-dir.patch
         vendor.js
-        iceweasel-20.0.1-fixed-loading-icon.png
-        Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
-        Fixup-Reset-Firefox-after-bad-merge.patch)
-md5sums=('4db358c753cb15a526dfe79c6602c886'
-         '4d786ae63da53ba6da8105fbb50cbad9'
-         '92a08a18995b915d6a6d0dab93ec6c1d'
+        iceweasel-20.0.1-fixed-loading-icon.png)
+md5sums=('3a603dbbfc9c7e56a8e58cede90a9b0b'
+         '89e7b2ed2e84fdefcc1eca7d076b72c2'
+         '2f5cb3df42b09fbfeaee5e72e5433ab9'
          'df08eaa1ac3bc6c2356be4fbf8ec8932'
-         '5d22063ebea2472dd0b1163b32b2050b'
+         '21d3ffb77ea84ce897016bc713b52ef4'
          'b03a979a78484503ba8dddad4f2c96d1'
          '7b9e5996dd9fe0b186a43a297db1c6b5'
          '1c42509891cf6843660a5f3c69896e80'
          '783a5927246f014855b96a3abb92566b'
-         '6e335a517c68488941340ee1c23f97b0'
-         '9d1cc7b80085a4438305e9e37d42745b'
-         '8e165ef85ddd72491f0b48f8954afca6')
+         '6e335a517c68488941340ee1c23f97b0')
 
 prepare() {
   export DEBIAN_BUILD="mozilla-release"
@@ -86,18 +79,10 @@ prepare() {
   # Doesn't apply and seems unimportant
   rm -v debian/patches/l10n/Place-google-and-gmail-before-yandex.patch || true
 
-  # Doesn't works in some parts due it has patches for others locales languages, source code hasn't it
-  rm -v debian/patches/debian-hacks/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch || true
-
-  # It needs to be patched after Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
-  rm -v debian/patches/debian-hacks/Fixup-Reset-Firefox-after-bad-merge.patch || true
-
   quilt push -av
 
   install -m644 "$srcdir/gnu_headshadow.png" browser/base/content/abouthome # Put gnu_headshadow.png on the source code
 
-  patch -Np1 -i "$srcdir/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch" # Adding fixed Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
-  patch -Np1 -i "$srcdir/Fixup-Reset-Firefox-after-bad-merge.patch"
   patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname
 
   # Patch and remove anything that's left
@@ -186,8 +171,6 @@ build() {
   export PATH="$srcdir/path:$PATH"
   export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname"
   export PYTHON="/usr/bin/python2"
-  export CC=clang
-  export CXX=clang++
 
   if [[ $CARCH == i686 ]]; then
     # Work around memory address space exhaustion during linking on i686
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index 29b8e9457..71f401e05 100644
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -1,8 +1,7 @@
-diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
-index 171c78a..a02efa8 100644
---- a/browser/app/profile/firefox.js
-+++ b/browser/app/profile/firefox.js
-@@ -273,11 +273,6 @@ pref("browser.slowStartup.notificationDisabled", false);
+diff -Nur mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/browser/app/profile/firefox.js
+--- mozilla-release.orig/browser/app/profile/firefox.js	2014-06-11 23:44:43.729632510 -0300
++++ mozilla-release/browser/app/profile/firefox.js	2014-06-11 23:54:32.231213278 -0300
+@@ -281,11 +281,6 @@
  pref("browser.slowStartup.timeThreshold", 60000);
  pref("browser.slowStartup.maxSamples", 5);
  
@@ -14,24 +13,24 @@ index 171c78a..a02efa8 100644
  pref("browser.enable_automatic_image_resizing", true);
  pref("browser.chrome.site_icons", true);
  pref("browser.chrome.favicons", true);
-@@ -1298,11 +1293,7 @@ pref("shumway.disabled", true);
+@@ -1486,12 +1481,7 @@
  // (This is intentionally on the high side; see bug 746055.)
  pref("image.mem.max_decoded_image_kb", 256000);
  
 -// Default social providers
 -pref("social.manifest.facebook", "{\"origin\":\"https://www.facebook.com\",\"name\":\"Facebook Share\",\"shareURL\":\"https://www.facebook.com/sharer/sharer.php?u=%{url}\",\"iconURL\":\"data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8%2F9hAAAAX0lEQVQ4jWP4%2F%2F8%2FAyUYTFhHzjgDxP9JxGeQDSBVMxgTbUBCxer%2Fr999%2BQ8DJBuArJksA9A10s8AXIBoA0B%2BR%2FY%2FjD%2BEwoBoA1yT5v3PbdmCE8MAshhID%2FUMoDgzUYIBj0Cgi7ar4coAAAAASUVORK5CYII%3D\",\"icon32URL\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAAAsTAAALEwEAmpwYAAADbklEQVRYCc1Xv08UQRj99tctexAuCEFjRE0kGBEtLDSGqIWNxkYKbTAxNlY2JhaGWltNtNFeKgsKKxITK43/gCYW+IsoRhA4D47bH7fn9+bcvdm5JR7sefolC3Ozu9978+bNN7PayUv3HN3umdY0Y6IWBtSJ0HSTarXqTOiuTep6Lj+tdxAcA8RAgSmwdd2aCDs0clldYALb/FvgYVhjmfliVA2XpjEgWo0Attn42Z6WH1RFor5ehwo9XQIUZMoVn4qlCoVMSo62EvD8Kh0b3U2Xz43R2PBO6mUCGDlAf65V6MadZzT/rUimoccc2kYA4BfPHqJb105RzjJigKhRq9kEJUBIjgYVuXeL7SAI6eD+Abp5dTwVHOmEHxT50d8WBYJqSOdPj5BjW8gZR8UNqFR2xagx/65XFYaMH+BGWwiYpi4UkBPPLxTp9v1Z+lHc4DWvCQXWmIy6EjITgKowVd5Jjv7N3Hd6y5esigoOwpkJIAmMpZpLJGdiaaC4F0UmAj6bD84GCEwmB/qxMmRilmnwb/mpjAocHh4UEoNAt5NLZB7oy9OJo0PxqkAtePdhiSqunyC1LQUwWMPQaOr6GRre258Ajn4cP7KHcEXhsxpXbj+lT19X2TMNGTLVAcjcalS8gDwsQ2UOMhH4k8FkcrEn5E5ub2sKohxLK2VR77Hl9RUcsrgeRIEiVOT6z+tDbIeLy+vk+kGTCbXxycet6xhl//3f6bJEkdHYhA+mLtDIvoH4ieev5+juoxdk5+pjhALYEdXIpEB5w+NlSKSzqVQ/+H7IO6BLtl3fngGMiqhGJgIwlM6qpyUGFjySdk8m0Zg0ubeD7X9OIDEFajltRQgUJaUKx69tdgaQa0FMADuahZPMFtcEwNPm2hA7ZI5sK4aoE2NvYI+o8hkCIe7CwTv68zS0q9Dk5vpbm/8FXxitSzmMFHpsGj0wyLUheTwD2Y9fVgh1Ae0EPUgD9241ZEnld+v5kgnVZ/8fE0brVh5BK+1oCqKKF72Dk7HwBsssB/pklU1dfChy3S659H5+uelgIb+8WRv1/uGTV9Sdb5wJFlfW6fPCalMhwhSU1j2xKwKbP838GcOwJja4TqO0bjdmXxYTy1EYjFdCWoCEYZhseH/GDL3yJPHnuW6YmT7P1SlIA4768Hke4vOcsX8BE346lLHhDUQAAAAASUVORK5CYII=\", \"icon64URL\":\"data:image/png;base64,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\", \"description\":\"Easily share the web to your Facebook friends.\",\"author\":\"Facebook\",\"homepageURL\":\"https://www.facebook.com\",\"builtin\":\"true\",\"version\":1}");
 -
--pref("social.sidebar.open", true);
 -pref("social.sidebar.unload_timeout_ms", 10000);
+-
+-pref("dom.identity.enabled", false);
 +// Removed Facebook sidebar with Iceweasel.
  
- pref("social.allowMultipleWorkers", true);
- 
-diff --git a/browser/base/content/abouthome/aboutHome.css b/browser/base/content/abouthome/aboutHome.css
-index c270318..049fe6e 100644
---- a/browser/base/content/abouthome/aboutHome.css
-+++ b/browser/base/content/abouthome/aboutHome.css
-@@ -49,11 +49,6 @@ a {
+ // Turn on the CSP 1.0 parser for Content Security Policy headers
+ pref("security.csp.speccompliant", true);
+diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozilla-release/browser/base/content/abouthome/aboutHome.css
+--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.css	2014-06-05 22:15:17.000000000 -0300
++++ mozilla-release/browser/base/content/abouthome/aboutHome.css	2014-06-11 23:51:17.732797819 -0300
+@@ -49,11 +49,6 @@
    background-repeat: no-repeat;
  }
  
@@ -43,7 +42,7 @@ index c270318..049fe6e 100644
  #searchForm {
    display: -moz-box;
  }
-@@ -72,8 +67,7 @@ a {
+@@ -72,8 +67,7 @@
  #searchEngineLogo {
    display: inline-block;
    height: 28px;
@@ -53,7 +52,7 @@ index c270318..049fe6e 100644
  }
  
  #searchText {
-@@ -145,48 +139,6 @@ a {
+@@ -145,48 +139,6 @@
    transition-duration: 0ms;
  }
  
@@ -102,7 +101,7 @@ index c270318..049fe6e 100644
  #launcher {
    display: -moz-box;
    -moz-box-align: center;
-@@ -335,26 +287,25 @@ body[narrow] #restorePreviousSession::before {
+@@ -335,26 +287,25 @@
    width: 32px;
  }
  
@@ -135,7 +134,7 @@ index c270318..049fe6e 100644
  }
  
  /* [HiDPI]
-@@ -366,26 +317,6 @@ body[narrow] #restorePreviousSession::before {
+@@ -366,26 +317,6 @@
      background-image: url("chrome://branding/content/about-logo@2x.png");
    }
  
@@ -162,7 +161,7 @@ index c270318..049fe6e 100644
    #downloads::before {
      content: url("chrome://browser/content/abouthome/downloads@2x.png");
    }
-@@ -421,9 +352,5 @@ body[narrow] #restorePreviousSession::before {
+@@ -421,9 +352,5 @@
    body[narrow] #restorePreviousSession::before {
      content: url("chrome://browser/content/abouthome/restore@2x.png");
    }
@@ -172,10 +171,9 @@ index c270318..049fe6e 100644
 -  }
  }
  
-diff --git a/browser/base/content/abouthome/aboutHome.js b/browser/base/content/abouthome/aboutHome.js
-index 432fcdc..bd1692a 100644
---- a/browser/base/content/abouthome/aboutHome.js
-+++ b/browser/base/content/abouthome/aboutHome.js
+diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozilla-release/browser/base/content/abouthome/aboutHome.js
+--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js	2014-06-05 22:15:17.000000000 -0300
++++ mozilla-release/browser/base/content/abouthome/aboutHome.js	2014-06-11 23:51:17.769464803 -0300
 @@ -3,152 +3,44 @@
   * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
  
@@ -363,7 +361,7 @@ index 432fcdc..bd1692a 100644
  // This global tracks if the page has been set up before, to prevent double inits
  let gInitialized = false;
  let gObserver = new MutationObserver(function (mutations) {
-@@ -156,7 +48,6 @@ let gObserver = new MutationObserver(function (mutations) {
+@@ -156,7 +48,6 @@
      if (mutation.attributeName == "searchEngineName") {
        setupSearchEngine();
        if (!gInitialized) {
@@ -371,7 +369,7 @@ index 432fcdc..bd1692a 100644
          gInitialized = true;
        }
        return;
-@@ -181,117 +72,6 @@ window.addEventListener("pagehide", function() {
+@@ -181,117 +72,6 @@
    window.removeEventListener("resize", fitToWidth);
  });
  
@@ -489,7 +487,7 @@ index 432fcdc..bd1692a 100644
  function onSearchSubmit(aEvent)
  {
    let searchTerms = document.getElementById("searchText").value;
-@@ -350,147 +130,6 @@ function loadSucceeded()
+@@ -350,147 +130,6 @@
    document.dispatchEvent(event);
  }
  
@@ -637,10 +635,9 @@ index 432fcdc..bd1692a 100644
  function fitToWidth() {
    if (window.scrollMaxX) {
      document.body.setAttribute("narrow", "true");
-diff --git a/browser/base/content/abouthome/aboutHome.xhtml b/browser/base/content/abouthome/aboutHome.xhtml
-index 1d03d38..5d808db 100644
---- a/browser/base/content/abouthome/aboutHome.xhtml
-+++ b/browser/base/content/abouthome/aboutHome.xhtml
+diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.xhtml mozilla-release/browser/base/content/abouthome/aboutHome.xhtml
+--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.xhtml	2014-06-05 22:15:17.000000000 -0300
++++ mozilla-release/browser/base/content/abouthome/aboutHome.xhtml	2014-06-11 23:51:17.789464976 -0300
 @@ -43,15 +43,6 @@
            <input id="searchSubmit" type="submit" value="&abouthome.searchEngineButton.label;"/>
          </form>
@@ -665,11 +662,10 @@ index 1d03d38..5d808db 100644
 +    <a id="aboutGNU" href="http://gnu.org"></a>
    </body>
  </html>
-diff --git a/browser/base/jar.mn b/browser/base/jar.mn
-index 0870527..301c8cb 100644
---- a/browser/base/jar.mn
-+++ b/browser/base/jar.mn
-@@ -33,7 +33,7 @@ browser.jar:
+diff -Nur mozilla-release.orig/browser/base/jar.mn mozilla-release/browser/base/jar.mn
+--- mozilla-release.orig/browser/base/jar.mn	2014-06-05 22:15:17.000000000 -0300
++++ mozilla-release/browser/base/jar.mn	2014-06-11 23:51:17.812798511 -0300
+@@ -32,7 +32,7 @@
          content/browser/abouthome/settings.png        (content/abouthome/settings.png)
          content/browser/abouthome/restore.png         (content/abouthome/restore.png)
          content/browser/abouthome/restore-large.png   (content/abouthome/restore-large.png)
@@ -678,7 +674,7 @@ index 0870527..301c8cb 100644
          content/browser/abouthome/snippet1@2x.png      (content/abouthome/snippet1@2x.png)
          content/browser/abouthome/snippet2@2x.png      (content/abouthome/snippet2@2x.png)
          content/browser/abouthome/downloads@2x.png     (content/abouthome/downloads@2x.png)
-@@ -45,7 +45,6 @@ browser.jar:
+@@ -44,7 +44,6 @@
          content/browser/abouthome/settings@2x.png      (content/abouthome/settings@2x.png)
          content/browser/abouthome/restore@2x.png       (content/abouthome/restore@2x.png)
          content/browser/abouthome/restore-large@2x.png (content/abouthome/restore-large@2x.png)
@@ -686,10 +682,9 @@ index 0870527..301c8cb 100644
  #ifdef MOZ_SERVICES_HEALTHREPORT
          content/browser/abouthealthreport/abouthealth.xhtml   (content/abouthealthreport/abouthealth.xhtml)
          content/browser/abouthealthreport/abouthealth.js      (content/abouthealthreport/abouthealth.js)
-diff --git a/browser/locales/en-US/chrome/browser/aboutHome.dtd b/browser/locales/en-US/chrome/browser/aboutHome.dtd
-index e84341f..5476d32 100644
---- a/browser/locales/en-US/chrome/browser/aboutHome.dtd
-+++ b/browser/locales/en-US/chrome/browser/aboutHome.dtd
+diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/aboutHome.dtd mozilla-release/browser/locales/en-US/chrome/browser/aboutHome.dtd
+--- mozilla-release.orig/browser/locales/en-US/chrome/browser/aboutHome.dtd	2014-06-05 22:15:18.000000000 -0300
++++ mozilla-release/browser/locales/en-US/chrome/browser/aboutHome.dtd	2014-06-11 23:51:17.836132046 -0300
 @@ -13,17 +13,6 @@
  
  <!ENTITY abouthome.searchEngineButton.label "Search">
@@ -708,10 +703,9 @@ index e84341f..5476d32 100644
  <!ENTITY abouthome.bookmarksButton.label "Bookmarks">
  <!ENTITY abouthome.historyButton.label   "History">
  <!ENTITY abouthome.settingsButton.label  "Settings">
-diff --git a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties
-index 087cc50..5654eb9 100644
---- a/browser/locales/en-US/chrome/browser-region/region.properties
-+++ b/browser/locales/en-US/chrome/browser-region/region.properties
+diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties
+--- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties	2014-06-05 22:15:18.000000000 -0300
++++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties	2014-06-11 23:51:17.842798771 -0300
 @@ -3,17 +3,12 @@
  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
@@ -734,7 +728,7 @@ index 087cc50..5654eb9 100644
  
  # 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 
-@@ -22,20 +17,10 @@ browser.contentHandlers.types.0.uri=http://add.my.yahoo.com/rss?url=%s
+@@ -22,20 +17,10 @@
  # don't make any spelling errors here.
  gecko.handlerService.defaultHandlersVersion=4
  
@@ -759,10 +753,9 @@ index 087cc50..5654eb9 100644
 -gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s
 +gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC
 +gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net
-diff --git a/browser/locales/generic/profile/bookmarks.html.in b/browser/locales/generic/profile/bookmarks.html.in
-index e925c1e..8c121fc 100644
---- a/browser/locales/generic/profile/bookmarks.html.in
-+++ b/browser/locales/generic/profile/bookmarks.html.in
+diff -Nur mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in mozilla-release/browser/locales/generic/profile/bookmarks.html.in
+--- mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in	2014-06-05 22:15:18.000000000 -0300
++++ mozilla-release/browser/locales/generic/profile/bookmarks.html.in	2014-06-11 23:51:17.869465669 -0300
 @@ -15,13 +15,20 @@
      <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3>
  <DD>@bookmarks_toolbarfolder_description@
@@ -790,11 +783,10 @@ index e925c1e..8c121fc 100644
 +        <DT><A HREF="http://www.h-node.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABgElEQVQ4jaXRz2uSARzHcb0vlRGEzTVWISU1BVkFYTIyjNK1pKcxHA+yhWMWIamHYikFgpoLIi9jwegi3QbL9SzdLmMbM9J+DkJBgm5RDvEPeHeQHOyQz0OH9+V7ePGBr0pqpPmfVPsP8a0AR4MnMEwf48x9K0s/E8oAY9iEMOvD+8yP2qVjrhhRBnSN61n5sIpULqC+pGHh8wNlgEY8jPQXcGh4VXukDND5evYAl46odIuXtYdKAANSudAChO52/XeMZMohecCbcoGdH99Y+7LO72adT9+/4nh8nYOjBl7/SsoB8gBkpHk8T0S2K++pN3fRin3cfnFDHvCuWkI9rEMvHGEo5gbAHnXhnLF1BpZLeRaLOVT2A8Q3A5wMngXgWtKLxX9KPqC+rCWQvYkpeK4NWKcGOgO50ts2MJJ0cPreeQDciTHMchZYIhcwh2wcuqjn+ccwGm9v6wsTxxn0dVgQXZ7Ek3Agpq6QrcaQGmmebtxFSDkRU1fJVmL/BpT2ByV/3eDMhinRAAAAAElFTkSuQmCC">h-node</A>
      </DL><p>
  </DL><p>
-diff --git a/browser/modules/AboutHome.jsm b/browser/modules/AboutHome.jsm
-index c3dc6b2..df312e3 100644
---- a/browser/modules/AboutHome.jsm
-+++ b/browser/modules/AboutHome.jsm
-@@ -8,7 +8,7 @@ let Cc = Components.classes;
+diff -Nur mozilla-release.orig/browser/modules/AboutHome.jsm mozilla-release/browser/modules/AboutHome.jsm
+--- mozilla-release.orig/browser/modules/AboutHome.jsm	2014-06-05 22:15:18.000000000 -0300
++++ mozilla-release/browser/modules/AboutHome.jsm	2014-06-11 23:51:17.926132826 -0300
+@@ -8,7 +8,7 @@
  let Ci = Components.interfaces;
  let Cu = Components.utils;
  
@@ -803,9 +795,9 @@ index c3dc6b2..df312e3 100644
  
  Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
  Components.utils.import("resource://gre/modules/Services.jsm");
-@@ -16,66 +16,6 @@ Components.utils.import("resource://gre/modules/Services.jsm");
- XPCOMUtils.defineLazyModuleGetter(this, "PrivateBrowsingUtils",
-   "resource://gre/modules/PrivateBrowsingUtils.jsm");
+@@ -18,66 +18,6 @@
+ XPCOMUtils.defineLazyModuleGetter(this, "fxAccounts",
+   "resource://gre/modules/FxAccounts.jsm");
  
 -// Url to fetch snippets, in the urlFormatter service format.
 -const SNIPPETS_URL_PREF = "browser.aboutHomeSnippets.updateUrl";
@@ -870,7 +862,7 @@ index c3dc6b2..df312e3 100644
  /**
   * This code provides services to the about:home page. Whenever
   * about:home needs to do something chrome-privileged, it sends a
-@@ -186,18 +126,9 @@ let AboutHome = {
+@@ -202,18 +142,9 @@
      ss.promiseInitialized.then(function() {
        let data = {
          showRestoreLastSession: ss.canRestoreLastSession,
diff --git a/libre/iceweasel-libre/mozconfig b/libre/iceweasel-libre/mozconfig
index 8b2b2a5e3..37ad56fda 100644
--- a/libre/iceweasel-libre/mozconfig
+++ b/libre/iceweasel-libre/mozconfig
@@ -26,6 +26,7 @@ ac_add_options --enable-system-pixman
 # Features
 ac_add_options --enable-startup-notification
 ac_add_options --enable-pulseaudio
+ac_add_options --enable-gstreamer=1.0
 
 ac_add_options --disable-crashreporter
 ac_add_options --disable-updater