From 3ab48878ce78bb74167cf1fc02b44f285b3b6b3a Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 11 Oct 2012 17:43:25 -0200 Subject: iceweasel-libre-16.0.1-1: updating version --- ...Make-the-Reset-Firefox-feature-more-gener.patch | 20 ++++++------ libre/iceweasel-libre/PKGBUILD | 13 +++----- libre/iceweasel-libre/libre.patch | 36 ++++++---------------- 3 files changed, 24 insertions(+), 45 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 240c3d4e8..a5fe02165 100755 --- 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 @@ -139,7 +139,7 @@ index 21cf405..f3c1a6b 100644 diff --git a/browser/locales/en-US/chrome/browser/migration/migration.properties b/browser/locales/en-US/chrome/browser/migration/migration.properties -index ab82d85..915f6b8 100644 +index 260bc29..52b32cc 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 @@ -150,7 +150,7 @@ index ab82d85..915f6b8 100644 importedBookmarksFolder=From %S -@@ -22,22 +21,22 @@ importedSafariReadingList=Reading List (From Safari) +@@ -24,22 +23,22 @@ importedSafariReadingList=Reading List (From Safari) 2_ie=Cookies 2_safari=Cookies 2_chrome=Cookies @@ -177,25 +177,25 @@ index ab82d85..915f6b8 100644 32_ie=Favorites 32_safari=Bookmarks -@@ -46,4 +45,4 @@ importedSafariReadingList=Reading List (From Safari) +@@ -48,4 +47,4 @@ importedSafariReadingList=Reading List (From Safari) 64_ie=Other Data 64_safari=Other Data 64_chrome=Other Data -64_firefox=Bookmarks Backups +64_self=Bookmarks Backups diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn -index 697b217..b6e1709 100644 +index 339ffda..6999b26 100644 --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn @@ -38,7 +38,7 @@ toolkit.jar: + content/global/mozilla.xhtml (mozilla.xhtml) - *+ content/global/nsDragAndDrop.js (nsDragAndDrop.js) + 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) + content/global/resetProfile.xul (resetProfile.xul) + content/global/resetProfileProgress.xul (resetProfileProgress.xul) + content/global/treeUtils.js (treeUtils.js) diff --git a/toolkit/content/resetProfile.js b/toolkit/content/resetProfile.js index dcb4065..09c1146 100644 --- a/toolkit/content/resetProfile.js @@ -267,10 +267,10 @@ index f35c227..7062886 100644 %{C++ diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp -index e5d3042..6de3390 100644 +index 60348b5..c240c4f 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp -@@ -3650,7 +3650,7 @@ XREMain::XRE_mainRun() +@@ -3651,7 +3651,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 8eb6ef769..322507e7b 100755 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -14,7 +14,7 @@ _pgo=false # We're getting this from Debian Experimental _debname=iceweasel -_debver=15.0.1 +_debver=16.0 _debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -48,20 +48,18 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" mozconfig.pgo xulrunner-copy-stub.patch libre.patch - iceweasel-install-dir.patch vendor.js shared-libs.patch Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch) -md5sums=('0936242388cd4c75930c1d2487e15216' - 'ce37c76476b8edf40780d00cf79d0d62' +md5sums=('da3877d360cef91eb9107d761f58dc3f' + '70c2e5736610e352454b2c3fa2304ec8' 'eab149c1994ab14392e55af3abb08e80' 'ac29b01c189f20abae2f3eef1618ffc0' 'a485a2b5dc544a8a2bd40c985d2e5813' - '6d8816d2577263556d76f1aa4527b55b' - 'e529742c0a425648087bc3ce537fe4c5' + '8768dfc39e9f1057c2956bf4405ae58e' '0d053487907de4376d67d8f499c5502b' '52e52f840a49eb1d14be1c0065b03a93' - 'c52fac65c1e06290a5108b75c31ace79') + '0a31239f1008038df5057982fe745dec') if [ "$_pkgname" != "$pkgname" ]; then provides+=("$_pkgname=$pkgver") @@ -87,7 +85,6 @@ build() { quilt push -a 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/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname patch -Np1 -i "$srcdir/xulrunner-copy-stub.patch" # small fix patch -Np1 -i "$srcdir/libre.patch" patch -Np1 -i "$srcdir/shared-libs.patch" diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch index 9ffaf3a9a..7e7b7290f 100755 --- a/libre/iceweasel-libre/libre.patch +++ b/libre/iceweasel-libre/libre.patch @@ -1,7 +1,7 @@ -diff -urN iceweasel-13.0.orig/browser/app/profile/firefox.js iceweasel-13.0/browser/app/profile/firefox.js ---- mozilla-build.orig/browser/app/profile/firefox.js 2012-06-01 09:03:47.000000000 -0300 -+++ mozilla-build/browser/app/profile/firefox.js 2012-06-05 19:53:08.847012282 -0300 -@@ -64,11 +64,11 @@ +diff -urN iceweasel-16.0.orig/browser/app/profile/firefox.js iceweasel-16.0/browser/app/profile/firefox.js +--- iceweasel-16.0.orig/browser/app/profile/firefox.js 2012-10-05 20:01:58.000000000 -0300 ++++ iceweasel-16.0/browser/app/profile/firefox.js 2012-10-11 17:19:44.984225170 -0200 +@@ -37,11 +37,11 @@ // Preferences for AMO integration pref("extensions.getAddons.cache.enabled", true); pref("extensions.getAddons.maxResults", 15); @@ -18,16 +18,7 @@ diff -urN iceweasel-13.0.orig/browser/app/profile/firefox.js iceweasel-13.0/brow // Blocklist preferences pref("extensions.blocklist.enabled", true); -@@ -92,7 +92,7 @@ - pref("extensions.autoDisableScopes", 15); - - // Dictionary download preference --pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/"); -+pref("browser.dictionaries.download.url", "about:blank"); - - // The minimum delay in seconds for the timer to fire. - // default=2 minutes -@@ -218,7 +218,7 @@ +@@ -194,7 +194,7 @@ pref("extensions.update.interval", 86400); // Check for updates to Extensions and // Themes every day // Non-symmetric (not shared by extensions) extension-specific [update] preferences @@ -36,25 +27,16 @@ diff -urN iceweasel-13.0.orig/browser/app/profile/firefox.js iceweasel-13.0/brow pref("extensions.dss.enabled", false); // Dynamic Skin Switching pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next // restart. -@@ -252,7 +252,7 @@ - // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session - // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore - pref("browser.startup.page", 1); --pref("browser.startup.homepage", "chrome://branding/locale/browserconfig.properties"); -+pref("browser.startup.homepage", "about:home"); - - // This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into - // this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream -@@ -345,7 +345,7 @@ - pref("browser.download.manager.resumeOnWakeDelay", 10000); +@@ -327,7 +327,7 @@ + pref("browser.download.panel.removeFinishedDownloads", false); // search engines URL -pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/firefox/search-engines/"); -+pref("browser.search.searchEnginesURL", "http://www.gnu.org/software/gnuzilla/addons.html"); ++pref("browser.search.searchEnginesURL", "http://www.gnu.org/software/gnuzilla/addons.html#search%20engines"); // pointer to the default engine name pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties"); -@@ -593,7 +593,7 @@ +@@ -584,7 +584,7 @@ pref("accessibility.typeaheadfind.flashBar", 1); // plugin finder service url -- cgit v1.2.3