From 04c8955a74d466f3642e94a8da2aecc23b7a7b0e Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 5 Jun 2012 18:21:59 -0300 Subject: iceweasel-13.0.1-1: updating version --- libre/iceweasel-libre/PKGBUILD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libre/iceweasel-libre') diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 85ede7409..8d0c63f13 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -12,8 +12,8 @@ _pgo=false # We're getting this from Debian Sid _debname=iceweasel -_debver=12.0 -_debrel=7 +_debver=13.0 +_debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -50,9 +50,9 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" iceweasel-install-dir.patch region.properties vendor.js) -md5sums=('b45f57bfe21b0e6db4f0683e794917cb' - '08aa0a949d9cbb26116490f7878a62fe' - 'd7ad1c025d2442427a06cc702906ef0d' +md5sums=('e440446bb92dc1c0311346c68024590b' + 'cb8bfb543002a5d78db7e8661f9f87ec' + 'a9848e41461776bc4bf8d2de824b1204' 'eab149c1994ab14392e55af3abb08e80' 'ac29b01c189f20abae2f3eef1618ffc0' 'a485a2b5dc544a8a2bd40c985d2e5813' -- cgit v1.2.3-54-g00ecf From 36c538f1b0b84cc8fe8895553f9348ba68f1b09e Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 5 Jun 2012 22:11:10 -0300 Subject: iceweasel-libre-13.0.1-1: fixing issues --- ...Make-the-Reset-Firefox-feature-more-gener.patch | 271 +++++++++++++++++++++ libre/iceweasel-libre/PKGBUILD | 17 +- libre/iceweasel-libre/libre.patch | 98 ++++---- 3 files changed, 328 insertions(+), 58 deletions(-) create mode 100644 libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch (limited to 'libre/iceweasel-libre') 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 +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 + +- ++