From 1b6860ed7a33a22c4202348a4f42afbb5d26be09 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 4 Apr 2013 00:06:36 -0700 Subject: Thu Apr 4 00:06:36 PDT 2013 --- ...56390-Make-the-Reset-Firefox-feature-more-gener.patch | 12 ++++++------ libre/iceweasel-libre/PKGBUILD | 16 ++++++---------- libre/iceweasel-libre/libre.patch | 11 ++++++----- 3 files changed, 18 insertions(+), 21 deletions(-) (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 index b7bd659a0..4ca4fc704 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 @@ -80,10 +80,10 @@ index 52722e9..0448444 100644 this.NSGetFactory = XPCOMUtils.generateNSGetFactory([FirefoxProfileMigrator]); diff --git a/browser/components/migration/src/MigrationUtils.jsm b/browser/components/migration/src/MigrationUtils.jsm -index 1f60879..fc83a99 100644 +index 401623a..4ce7a3e 100644 --- a/browser/components/migration/src/MigrationUtils.jsm +++ b/browser/components/migration/src/MigrationUtils.jsm -@@ -403,11 +403,6 @@ this.MigrationUtils = Object.freeze({ +@@ -404,11 +404,6 @@ this.MigrationUtils = Object.freeze({ * @see nsIStringBundle */ getLocalizedString: function MU_getLocalizedString(aKey, aReplacements) { @@ -95,7 +95,7 @@ index 1f60879..fc83a99 100644 if (aReplacements === undefined) return getMigrationBundle().GetStringFromName(aKey); return getMigrationBundle().formatStringFromName( -@@ -622,6 +617,17 @@ this.MigrationUtils = Object.freeze({ +@@ -623,6 +618,17 @@ this.MigrationUtils = Object.freeze({ }, /** @@ -184,7 +184,7 @@ index 260bc29..52b32cc 100644 -64_firefox=Bookmarks Backups +64_self=Bookmarks Backups diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn -index 96cedd3..a0f8a75 100644 +index fa45115..1fcf3cd 100644 --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn @@ -42,7 +42,7 @@ toolkit.jar: @@ -267,10 +267,10 @@ index f35c227..7062886 100644 %{C++ diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp -index 1045665..04bd1aa 100644 +index 7665de2..4588f4a 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp -@@ -3698,7 +3698,7 @@ XREMain::XRE_mainRun() +@@ -3699,7 +3699,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 1702a17b7..6dc52a213 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -14,7 +14,7 @@ _pgo=true # We're getting this from Debian Experimental _debname=iceweasel -_debver=19.0.2 +_debver=20.0 _debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -38,6 +38,7 @@ fi optdepends=('networkmanager: Location detection via available WiFi networks') url="http://www.geticeweasel.org/" install=iceweasel.install +provides=('firefox') source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" "$_debrepo/`debfile $_debname`_$_debver-$_debrel.debian.tar.gz" mozconfig @@ -49,22 +50,17 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" shared-libs.patch replace-urls.txt Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch) -md5sums=('ceda63e01012f9940542d862fd755a65' - '7fa6e0fb544d01516d3232f26023c570' +md5sums=('22daa24b6490c654f131550cbf20fad3' + '0c70ab52f35701558081df3d360361a2' 'f90c6a70d0a6d0a9e7f9a0eed6aeffd3' 'dfeb4ab2c96aae3356a4c347eee0b97b' - '7ef2c05dbd5631741404f2589c4ea07e' + '5addd418bf32b673fdfe80c8fefbea1a' '7b9e5996dd9fe0b186a43a297db1c6b5' 'abf5ecb74caa857abb42bcfbb3442d9c' '6dd547c72bb875a3101135a1c32d4783' '52e52f840a49eb1d14be1c0065b03a93' 'a8fc4658d45b6bf9350023e5c3f34e56' - '2fde2f4bc158b217f3d71b33ef0bc626') - -if [ "$_pkgname" != "$pkgname" ]; then - provides+=("$_pkgname=$pkgver") - conflicts+=("$_pkgname") -fi + 'd0e1f2625cd9f7234abdeb55aee00529') build() { # WebRTC build tries to execute "python" and expects Python 2 diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch index 154fc3b94..9d2aa7c05 100644 --- a/libre/iceweasel-libre/libre.patch +++ b/libre/iceweasel-libre/libre.patch @@ -1,19 +1,20 @@ diff -ruN mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/browser/app/profile/firefox.js ---- mozilla-release.orig/browser/app/profile/firefox.js 2013-01-10 20:20:02.000000000 -0500 -+++ mozilla-release/browser/app/profile/firefox.js 2013-01-10 17:47:34.000000000 -0500 -@@ -1168,11 +1168,9 @@ +--- mozilla-release.orig/browser/app/profile/firefox.js 2013-03-26 19:17:35.000000000 -0300 ++++ mozilla-release/browser/app/profile/firefox.js 2013-04-03 16:10:57.681396937 -0300 +@@ -1176,12 +1176,9 @@ // (This is intentionally on the high side; see bug 746055.) pref("image.mem.max_decoded_image_kb", 256000); --// Example social provider +-// Default social providers -pref("social.manifest.facebook", "{\"origin\":\"https://www.facebook.com\",\"name\":\"Facebook Messenger\",\"workerURL\":\"https://www.facebook.com/desktop/fbdesktop2/socialfox/fbworker.js.php\",\"iconURL\":\"data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8%2F9hAAAAX0lEQVQ4jWP4%2F%2F8%2FAyUYTFhHzjgDxP9JxGeQDSBVMxgTbUBCxer%2Fr999%2BQ8DJBuArJksA9A10s8AXIBoA0B%2BR%2FY%2FjD%2BEwoBoA1yT5v3PbdmCE8MAshhID%2FUMoDgzUYIBj0Cgi7ar4coAAAAASUVORK5CYII%3D\",\"sidebarURL\":\"https://www.facebook.com/desktop/fbdesktop2/?socialfox=true\"}"); +- // Comma-separated list of nsIURI::prePaths that are allowed to activate // built-in social functionality. -pref("social.activation.whitelist", "https://www.facebook.com"); +pref("social.activation.whitelist", ""); + pref("social.sidebar.open", true); pref("social.sidebar.unload_timeout_ms", 10000); - pref("social.active", false); diff -ruN 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 2013-01-04 18:44:27.000000000 -0500 +++ mozilla-release/browser/base/content/abouthome/aboutHome.js 2013-01-10 18:26:10.000000000 -0500 -- cgit v1.2.3-54-g00ecf