Tue Nov 5 04:22:34 PST 2013

2 files changed, 76 insertions, 76 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
index 5d56ee23b..d2716aed3 100644
--- 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
@@ -67,10 +67,10 @@ index d7fec75..d531b83 100644
  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 23e021d..469e504 100644

+index 3db6720..a3b3dda 100644

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

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

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

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

  

  

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

@@ -80,10 +80,10 @@ index 23e021d..469e504 100644
  

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

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

-index 3d23a98..4ce7a3e 100644

+index 2c91e9a..08962c4 100644

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

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

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

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

     * @see nsIStringBundle

     */

    getLocalizedString: function MU_getLocalizedString(aKey, aReplacements) {

@@ -96,7 +96,7 @@ index 3d23a98..4ce7a3e 100644
      if (aReplacements === undefined)

        return getMigrationBundle().GetStringFromName(aKey);

      return getMigrationBundle().formatStringFromName(

-@@ -624,6 +618,17 @@ this.MigrationUtils = Object.freeze({

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

    },

  

    /**

@@ -140,18 +140,10 @@ index 21cf405..f3c1a6b 100644
  <!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 b1cb03d..1755ae7 100644

+index 094a9dc..a620905 100644

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

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

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

- sourceNameIE=Internet Explorer

- sourceNameSafari=Safari

- sourceNameChrome=Google Chrome

--sourceNameFirefox=Mozilla Firefox

- 

- importedBookmarksFolder=From %S

- 

-@@ -24,22 +23,22 @@ importedSafariReadingList=Reading List (From Safari)

+@@ -24,30 +24,30 @@ importedSafariReadingList=Reading List (From Safari)

  2_ie=Cookies

  2_safari=Cookies

  2_chrome=Cookies

@@ -176,69 +168,82 @@ index b1cb03d..1755ae7 100644
 -16_firefox=Saved Passwords

 +16_self=Saved Passwords

  

- 32_ie=Favorites

+-32_ie=Favorites

++32_ie=Favourites

  32_safari=Bookmarks

-@@ -48,4 +47,4 @@ importedSafariReadingList=Reading List (From Safari)

+ 32_chrome=Bookmarks

+ 

  64_ie=Other Data

  64_safari=Other Data

  64_chrome=Other Data

 -64_firefox_other=Other Data

 +64_self=Other Data

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

-index 5c23509..54b82bd 100644

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

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

-@@ -43,7 +43,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/resetProfileProgress.xul    (resetProfileProgress.xul)

-    content/global/treeUtils.js                (treeUtils.js)

+ 

+-128_firefox=Windows and Tabs

++128_self=Windows and Tabs

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

-index dcb4065..09c1146 100644

+index d46b43b..2253994 100644

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

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

-@@ -36,13 +36,13 @@ function resetSupported() {

-                        getService(Ci.nsIToolkitProfileService);

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

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

+   populateResetPane("migratedItems");

+ }

  

--#expand const MOZ_APP_NAME = "__MOZ_APP_NAME__";

--#expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__";

--

-   // 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);

++<<<<<<< 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);

-@@ -53,9 +53,6 @@ function resetSupported() {

- function getMigratedData() {

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

- 

--#expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__";

--#expand const MOZ_APP_NAME = "__MOZ_APP_NAME__";

--

-   // From migration.properties

-   const MIGRATED_TYPES = [

-     4,  // History and Bookmarks

-@@ -68,7 +65,7 @@ function getMigratedData() {

-   let dataTypes = [];

-   for (let itemID of MIGRATED_TYPES) {

-     try {

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

++  } 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.

++      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

@@ -268,10 +273,10 @@ index f35c227..7062886 100644
  

  %{C++

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

-index cc3f65e..cdd4305 100644

+index 5f989ea..e7e21bd 100644

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

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

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

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

          if (gDoProfileReset) {

            // Automatically migrate from the current application if we just

            // reset the profile.

diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 63ae55214..9285849c3 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -55,7 +55,6 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
         iceweasel.desktop
         iceweasel-install-dir.patch
         vendor.js
-        replace-urls.txt
         iceweasel-20.0.1-fixed-loading-icon.png
         Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
 md5sums=('dd1462b582747210cc6c2ac1d01c4c17'
@@ -66,9 +65,8 @@ md5sums=('dd1462b582747210cc6c2ac1d01c4c17'
          '7b9e5996dd9fe0b186a43a297db1c6b5'
          'abf5ecb74caa857abb42bcfbb3442d9c'
          '816013881cfc9a1f4f0ede72b014f8b3'
-         'b0c23b67c247008b50fe9e7cf1e576ad'
          '6e335a517c68488941340ee1c23f97b0'
-         'f1594fa3567e5b70202c3432d7c00202')
+         'ee3279c706c3a69e6f8eda415c4d35b0')
 
 prepare() {
   export DEBIAN_BUILD="mozilla-release"
@@ -97,15 +95,12 @@ prepare() {
   sed -i "\|abouthome/snippet|d" browser/base/jar.mn
 
   # Replace common URLs
-  sed '/^#/d' ../replace-urls.txt | while read -r moz_url gnu_url; do
-    if [[ -n $moz_url ]]; then
-      printf 'liberating: %s -> %s\n' "$moz_url" "$gnu_url"
-      grep -Erl "${moz_url}" \
-        --exclude='*.'{patch,orig,rej} \
-        --exclude-dir={.pc,test,tests,testing} \
-        | xargs -d '\n' --no-run-if-empty sed -ri "s<${moz_url}<${gnu_url}<g"
-    fi
-  done
+  sed -i '\|extensions[.]getAddons[.]get[.]url| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/GNU_IceCat");|g;
+          \|extensions[.]getAddons[.]search[.]browseURL| s|https://addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/GNU_IceCat");|g;
+          \|extensions[.]getAddons[.]search[.]url| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/GNU_IceCat");|g;
+          \|extensions[.]webservice[.]discoverURL| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/GNU_IceCat");|g;
+          \|browser[.]search[.]searchEnginesURL| s|https://addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/GNU_IceCat");|g;
+         ' browser/app/profile/firefox.js
 
   cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch