From d53c44f055929b18d7d1b25f8367ee5836c435fc Mon Sep 17 00:00:00 2001 From: root Date: Tue, 5 Nov 2013 04:22:58 -0800 Subject: Tue Nov 5 04:22:34 PST 2013 --- libre/icedove-libre/PKGBUILD | 25 ++-- libre/icedove-libre/mozconfig | 2 +- ...Make-the-Reset-Firefox-feature-more-gener.patch | 133 +++++++++++---------- libre/iceweasel-libre/PKGBUILD | 19 ++- 4 files changed, 89 insertions(+), 90 deletions(-) (limited to 'libre') diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD index fe880d03d..20dbea731 100644 --- a/libre/icedove-libre/PKGBUILD +++ b/libre/icedove-libre/PKGBUILD @@ -18,7 +18,7 @@ arch=('i686' 'x86_64' 'mips64el') license=('MPL' 'GPL' 'LGPL') url="http://packages.debian.org/experimental/${_pkgname}" depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification') -makedepends=('unzip-libre' 'zip' 'pkg-config' 'python2' 'python2-virtualenv' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt') +makedepends=('unzip-libre' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt') optdepends=('libcanberra: for sound support') replaces=('thunderbird') conflicts=('thunderbird') @@ -27,14 +27,12 @@ install=${_pkgname}.install source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.xz" "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel#deb}.debian.tar.gz" mozconfig - replace-urls.txt vendor.js ${_pkgname}.desktop) options=(!emptydirs) md5sums=('c69b05c9a1c28d455964aed4927ef916' 'c67dc2f46f0e4d463ebe1ccdbfae6392' - '5bd3b5b1c79d87d2720252e9b06ba09e' - 'e14242e651928bd658ec8d489088b6f2' + 'c46cf2a671c8fdefcabd4c87e38f3d40' '5a53179d14ae9631b7afe5e4d0fc0b25' 'e785e0c267f4435ae1a9aa0b03bcacfb') @@ -74,19 +72,20 @@ prepare() { s|include $(DEPTH)/config/rules.mk|include $(topsrcdir)/config/rules.mk|; ' mail/branding/icedove/locales/Makefile.in + # Fix package-manifest.in + sed -i '\|; Phishing Protection| s|$|\n#ifdef MOZ_SAFE_BROWSING|; + \|@BINPATH@/components/url-classifier[.]xpt| s|$|\n#endif| + ' mail/installer/package-manifest.in + # Fix branding sed -i 's|Icedove Mail/News|Icedove|' mail/branding/icedove/locales/en-US/brand.{dtd,properties} # 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} 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}