From 5d1eac6bc7b0336a940caf78d09102cf3d2bf4ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Mon, 16 Dec 2013 00:49:42 -0200 Subject: iceweasel-libre-1:26.0.deb1-1: updating version --- ...Make-the-Reset-Firefox-feature-more-gener.patch | 4 +- .../Fixup-Reset-Firefox-after-bad-merge.patch | 108 +++++++++++++++++++++ libre/iceweasel-libre/PKGBUILD | 53 +++++----- libre/iceweasel-libre/iceweasel-install-dir.patch | 22 ++--- libre/iceweasel-libre/iceweasel.install | 4 +- libre/iceweasel-libre/libre.patch | 96 ++++++++++-------- libre/iceweasel-libre/mozconfig | 1 + libre/iceweasel-libre/replace-urls.txt | 25 ----- 8 files changed, 207 insertions(+), 106 deletions(-) create mode 100644 libre/iceweasel-libre/Fixup-Reset-Firefox-after-bad-merge.patch delete mode 100644 libre/iceweasel-libre/replace-urls.txt 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 d2716aed3..c9df18dc4 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 @@ -273,10 +273,10 @@ index f35c227..7062886 100644 %{C++ diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp -index 5f989ea..e7e21bd 100644 +index 42fbd15..6c3dbfe 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp -@@ -3733,7 +3733,7 @@ XREMain::XRE_mainRun() +@@ -3737,7 +3737,7 @@ XREMain::XRE_mainRun() if (gDoProfileReset) { // Automatically migrate from the current application if we just // reset the profile. diff --git a/libre/iceweasel-libre/Fixup-Reset-Firefox-after-bad-merge.patch b/libre/iceweasel-libre/Fixup-Reset-Firefox-after-bad-merge.patch new file mode 100644 index 000000000..c7c4c355b --- /dev/null +++ b/libre/iceweasel-libre/Fixup-Reset-Firefox-after-bad-merge.patch @@ -0,0 +1,108 @@ +From: Mike Hommey +Date: Sat, 16 Nov 2013 13:01:17 +0900 +Subject: Fixup "Reset Firefox" after bad merge + +--- + toolkit/content/resetProfile.js | 52 ---------------------------------------- + toolkit/modules/ResetProfile.jsm | 11 +++++---- + 2 files changed, 6 insertions(+), 57 deletions(-) + +diff --git a/toolkit/content/resetProfile.js b/toolkit/content/resetProfile.js +index 2253994..d46b43b 100644 +--- a/toolkit/content/resetProfile.js ++++ b/toolkit/content/resetProfile.js +@@ -28,58 +28,6 @@ function onResetProfileLoad() { + populateResetPane("migratedItems"); + } + +-<<<<<<< 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); +- } +- 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. +- 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/modules/ResetProfile.jsm b/toolkit/modules/ResetProfile.jsm +index db57f2a..d618d08 100644 +--- a/toolkit/modules/ResetProfile.jsm ++++ b/toolkit/modules/ResetProfile.jsm +@@ -7,8 +7,6 @@ + this.EXPORTED_SYMBOLS = ["ResetProfile"]; + + const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components; +-#expand const MOZ_APP_NAME = "__MOZ_APP_NAME__"; +-#expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__"; + + Cu.import("resource://gre/modules/Services.jsm"); + +@@ -25,8 +23,11 @@ this.ResetProfile = { + + // 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); ++ 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); +@@ -50,7 +51,7 @@ this.ResetProfile = { + let dataTypes = []; + for (let itemID of MIGRATED_TYPES) { + try { +- let typeName = MigrationUtils.getLocalizedString(itemID + "_" + MOZ_APP_NAME); ++ let typeName = MigrationUtils.getLocalizedString(itemID + "_self"); + dataTypes.push(typeName); + } catch (x) { + // Catch exceptions when the string for a data type doesn't exist. diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 9f3ee6be8..968c3d122 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=25.0 +_debver=26.0 _debrel=deb1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -23,7 +23,7 @@ _pkgname=iceweasel pkgname=iceweasel-libre epoch=1 pkgver=$_debver.$_debrel -pkgrel=3 +pkgrel=1 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox." arch=(i686 x86_64 mips64el) @@ -38,9 +38,10 @@ if $_pgo; then fi optdepends=('networkmanager: Location detection via available WiFi networks' 'gstreamer0.10-base-plugins: vorbis decoding, ogg demuxing' - 'gstreamer0.10-bad-libre-plugins: aac, vp8 and opus decoding' 'gstreamer0.10-good-plugins: webm and mp4 demuxing' - 'gstreamer0.10-ugly-plugins: h.264 decoding' + 'gstreamer0.10-bad-libre-plugins: aac, vp8 and opus decoding' + 'gstreamer0.10-ugly-plugins: h.264 and mp3 decoding' + 'gstreamer0.10-ffmpeg: more decoders' 'libpulse: PulseAudio audio driver') url="http://packages.debian.org/experimental/${_pkgname}" install=iceweasel.install @@ -56,17 +57,19 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" iceweasel-install-dir.patch vendor.js iceweasel-20.0.1-fixed-loading-icon.png - Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch) -md5sums=('dd1462b582747210cc6c2ac1d01c4c17' - '4f4cde44b6e83cf78ff5d6e757d1913c' - '350feec44d359c31679dbec3de6685df' + Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch + Fixup-Reset-Firefox-after-bad-merge.patch) +md5sums=('219cf21e0642e8a364365286f23d0624' + '2001d0477bcefd0eeaab584402133691' + '023120a970670dc85cea19393f0b94b6' 'df08eaa1ac3bc6c2356be4fbf8ec8932' - '8c11b80574b11e96c2ef44fa16f4b844' + 'aeb2feb0955248e087f2b0cdd73e3e4c' '7b9e5996dd9fe0b186a43a297db1c6b5' - 'abf5ecb74caa857abb42bcfbb3442d9c' + '6620e724ec9a1be74e65089d81d802f7' '816013881cfc9a1f4f0ede72b014f8b3' '6e335a517c68488941340ee1c23f97b0' - 'ee3279c706c3a69e6f8eda415c4d35b0') + 'dbf1c021e5f7ac323197b219bf213c50' + '8e165ef85ddd72491f0b48f8954afca6') prepare() { export DEBIAN_BUILD="mozilla-release" @@ -81,12 +84,16 @@ prepare() { # Doesn't apply and seems unimportant rm -v debian/patches/l10n/Place-google-and-gmail-before-yandex.patch || true - # This patch doesn't works in some parts due that has patches for others locales languages, source code hasn't it + # Doesn't works in some parts due it has patches for others locales languages, source code hasn't it rm -v debian/patches/debian-hacks/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch || true + # It needs to be patched after Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch + rm -v debian/patches/debian-hacks/Fixup-Reset-Firefox-after-bad-merge.patch || true + quilt push -av 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/Fixup-Reset-Firefox-after-bad-merge.patch" patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname # Patch and remove anything that's left @@ -177,20 +184,16 @@ build() { fi if $_pgo; then - if [[ $CARCH != i686 ]]; then - # Set up PGO - export DISPLAY=:99 - Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY & - - if ! make -f client.mk build MOZ_PGO=1; then - kill $! - return 1 - fi - - kill $! || true - else - make -f client.mk build + # Set up PGO + export DISPLAY=:99 + Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY & + + if ! make -f client.mk build MOZ_PGO=1; then + kill $! + return 1 fi + + kill $! || true else make -f client.mk build fi diff --git a/libre/iceweasel-libre/iceweasel-install-dir.patch b/libre/iceweasel-libre/iceweasel-install-dir.patch index a44aef496..3938c0b3e 100644 --- a/libre/iceweasel-libre/iceweasel-install-dir.patch +++ b/libre/iceweasel-libre/iceweasel-install-dir.patch @@ -1,9 +1,8 @@ -diff -Nur iceweasel-16.0.1.orig/config/baseconfig.mk iceweasel-16.0.1/config/baseconfig.mk ---- iceweasel-16.0.1.orig/config/baseconfig.mk 2012-10-10 19:42:45.000000000 -0200 -+++ iceweasel-16.0.1/config/baseconfig.mk 2012-10-12 05:40:32.346949927 -0200 -@@ -1,10 +1,10 @@ - INCLUDED_AUTOCONF_MK = 1 - +diff --git a/config/baseconfig.mk b/config/baseconfig.mk +index 9c70e24..eff0fd2 100644 +--- a/config/baseconfig.mk ++++ b/config/baseconfig.mk +@@ -1,8 +1,8 @@ MOZ_APP_BASE_VERSION = $(firstword $(subst ., ,$(MOZ_APP_VERSION))).$(word 2,$(subst ., ,$(MOZ_APP_VERSION))) -includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION) -idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION) @@ -16,12 +15,11 @@ diff -Nur iceweasel-16.0.1.orig/config/baseconfig.mk iceweasel-16.0.1/config/bas DIST = $(DEPTH)/dist # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't -diff -Nur iceweasel-16.0.1.orig/js/src/config/baseconfig.mk iceweasel-16.0.1/js/src/config/baseconfig.mk ---- iceweasel-16.0.1.orig/js/src/config/baseconfig.mk 2012-10-10 19:43:05.000000000 -0200 -+++ iceweasel-16.0.1/js/src/config/baseconfig.mk 2012-10-12 05:08:23.064066227 -0200 -@@ -1,7 +1,7 @@ - INCLUDED_AUTOCONF_MK = 1 - +diff --git a/js/src/config/baseconfig.mk b/js/src/config/baseconfig.mk +index 1ff076c..5386569 100644 +--- a/js/src/config/baseconfig.mk ++++ b/js/src/config/baseconfig.mk +@@ -1,5 +1,5 @@ -installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) +installdir = $(libdir)/$(MOZ_APP_NAME) diff --git a/libre/iceweasel-libre/iceweasel.install b/libre/iceweasel-libre/iceweasel.install index c1fe8284a..1a1f4b16b 100644 --- a/libre/iceweasel-libre/iceweasel.install +++ b/libre/iceweasel-libre/iceweasel.install @@ -4,10 +4,10 @@ post_install() { } post_upgrade() { - post_install $1 + post_install } post_remove() { - post_install $1 + post_install } diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch index e5632c667..744ecaef3 100644 --- a/libre/iceweasel-libre/libre.patch +++ b/libre/iceweasel-libre/libre.patch @@ -1,7 +1,8 @@ -diff -Nur mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/browser/app/profile/firefox.js ---- mozilla-release.orig/browser/app/profile/firefox.js 2013-11-05 03:52:59.229583495 -0200 -+++ mozilla-release/browser/app/profile/firefox.js 2013-11-05 03:57:12.955661016 -0200 -@@ -1269,14 +1269,6 @@ +diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js +index 331edc8..e18bd20 100644 +--- a/browser/app/profile/firefox.js ++++ b/browser/app/profile/firefox.js +@@ -1283,14 +1283,6 @@ pref("pdfjs.previousHandler.alwaysAskBeforeHandling", false); // (This is intentionally on the high side; see bug 746055.) pref("image.mem.max_decoded_image_kb", 256000); @@ -16,10 +17,11 @@ diff -Nur mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/br // Turn on the CSP 1.0 parser for Content Security Policy headers pref("security.csp.speccompliant", true); -diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozilla-release/browser/base/content/abouthome/aboutHome.css ---- mozilla-release.orig/browser/base/content/abouthome/aboutHome.css 2013-10-25 20:27:08.000000000 -0200 -+++ mozilla-release/browser/base/content/abouthome/aboutHome.css 2013-11-05 03:57:12.958994121 -0200 -@@ -49,11 +49,6 @@ +diff --git a/browser/base/content/abouthome/aboutHome.css b/browser/base/content/abouthome/aboutHome.css +index c270318..8a647c7 100644 +--- a/browser/base/content/abouthome/aboutHome.css ++++ b/browser/base/content/abouthome/aboutHome.css +@@ -49,11 +49,6 @@ a { background-repeat: no-repeat; } @@ -31,7 +33,7 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi #searchForm { display: -moz-box; } -@@ -72,8 +67,7 @@ +@@ -72,8 +67,7 @@ a { #searchEngineLogo { display: inline-block; height: 28px; @@ -41,7 +43,7 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi } #searchText { -@@ -145,48 +139,6 @@ +@@ -145,48 +139,6 @@ a { transition-duration: 0ms; } @@ -90,7 +92,7 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi #launcher { display: -moz-box; -moz-box-align: center; -@@ -366,20 +318,6 @@ +@@ -366,20 +318,6 @@ body[narrow] #restorePreviousSession::before { background-image: url("chrome://branding/content/about-logo@2x.png"); } @@ -111,9 +113,10 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi .launchButton::before, #aboutMozilla::before { transform: scale(.5); -diff -Nur 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-10-25 20:27:08.000000000 -0200 -+++ mozilla-release/browser/base/content/abouthome/aboutHome.js 2013-11-05 04:10:11.565757913 -0200 +diff --git a/browser/base/content/abouthome/aboutHome.js b/browser/base/content/abouthome/aboutHome.js +index 432fcdc..bd1692a 100644 +--- a/browser/base/content/abouthome/aboutHome.js ++++ b/browser/base/content/abouthome/aboutHome.js @@ -3,152 +3,44 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ @@ -301,15 +304,15 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil // This global tracks if the page has been set up before, to prevent double inits let gInitialized = false; let gObserver = new MutationObserver(function (mutations) { -@@ -156,7 +48,6 @@ - if (mutation.attributeName == "searchEngineURL") { +@@ -156,7 +48,6 @@ let gObserver = new MutationObserver(function (mutations) { + if (mutation.attributeName == "searchEngineName") { setupSearchEngine(); if (!gInitialized) { - ensureSnippetsMapThen(loadSnippets); gInitialized = true; } return; -@@ -177,117 +68,6 @@ +@@ -181,117 +72,6 @@ window.addEventListener("pagehide", function() { window.removeEventListener("resize", fitToWidth); }); @@ -427,8 +430,8 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil function onSearchSubmit(aEvent) { let searchTerms = document.getElementById("searchText").value; -@@ -372,140 +152,6 @@ - +@@ -350,147 +130,6 @@ function loadSucceeded() + document.dispatchEvent(event); } -/** @@ -440,6 +443,10 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil - if (!gSnippetsMap) - throw new Error("Snippets map has not properly been initialized"); - +- // Allow tests to modify the snippets map before using it. +- var event = new CustomEvent("AboutHomeLoadSnippets", {bubbles:true}); +- document.dispatchEvent(event); +- - // Check cached snippets version. - let cachedVersion = gSnippetsMap.get("snippets-cached-version") || 0; - let currentVersion = document.documentElement.getAttribute("snippetsVersion"); @@ -460,6 +467,7 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil - xhr.open("GET", updateURL, true); - } catch (ex) { - showSnippets(); +- loadSucceeded(); - return; - } - // Even if fetching should fail we don't want to spam the server, thus @@ -475,10 +483,12 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil - gSnippetsMap.set("snippets-cached-version", currentVersion); - } - showSnippets(); +- loadSucceeded(); - }; - xhr.send(null); - } else { - showSnippets(); +- loadSucceeded(); - } -} - @@ -568,9 +578,10 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil function fitToWidth() { if (window.scrollMaxX) { document.body.setAttribute("narrow", "true"); -diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.xhtml mozilla-release/browser/base/content/abouthome/aboutHome.xhtml ---- mozilla-release.orig/browser/base/content/abouthome/aboutHome.xhtml 2013-10-25 20:27:08.000000000 -0200 -+++ mozilla-release/browser/base/content/abouthome/aboutHome.xhtml 2013-11-05 03:57:12.962327229 -0200 +diff --git a/browser/base/content/abouthome/aboutHome.xhtml b/browser/base/content/abouthome/aboutHome.xhtml +index 1d03d38..e3cd254 100644 +--- a/browser/base/content/abouthome/aboutHome.xhtml ++++ b/browser/base/content/abouthome/aboutHome.xhtml @@ -43,15 +43,6 @@ @@ -587,9 +598,10 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.xhtml mo
-diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties ---- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties 2013-10-25 20:27:09.000000000 -0200 -+++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2013-11-05 04:16:11.884325686 -0200 +diff --git a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties +index 087cc50..5654eb9 100644 +--- a/browser/locales/en-US/chrome/browser-region/region.properties ++++ b/browser/locales/en-US/chrome/browser-region/region.properties @@ -3,17 +3,12 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. @@ -612,7 +624,7 @@ diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser-region/regio # increment this number when anything gets changed in the list below. This will # cause Firefox to re-read these prefs and inject any new handlers into the -@@ -22,20 +17,10 @@ +@@ -22,20 +17,10 @@ browser.contentHandlers.types.0.uri=http://add.my.yahoo.com/rss?url=%s # don't make any spelling errors here. gecko.handlerService.defaultHandlersVersion=4 @@ -637,9 +649,10 @@ diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser-region/regio -gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s +gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC +gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net -diff -Nur mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in mozilla-release/browser/locales/generic/profile/bookmarks.html.in ---- mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in 2013-10-25 20:27:09.000000000 -0200 -+++ mozilla-release/browser/locales/generic/profile/bookmarks.html.in 2013-11-05 03:57:12.972326552 -0200 +diff --git a/browser/locales/generic/profile/bookmarks.html.in b/browser/locales/generic/profile/bookmarks.html.in +index e925c1e..5101035 100644 +--- a/browser/locales/generic/profile/bookmarks.html.in ++++ b/browser/locales/generic/profile/bookmarks.html.in @@ -15,13 +15,20 @@

@bookmarks_toolbarfolder@

@bookmarks_toolbarfolder_description@ @@ -657,7 +670,7 @@ diff -Nur mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in +
Parabola GNU/Linux-libre +
Parabola GNU/Linux-libre Packages +
Parabola GNU/Linux-libre Wiki -+
Parabola GNU/Linux-libre Labs ++
Parabola GNU/Linux-libre Labs +

+

Free Software Foundation

+

@@ -667,9 +680,10 @@ diff -Nur mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in +

h-node

-diff -Nur mozilla-release.orig/dom/ipc/test.xul mozilla-release/dom/ipc/test.xul ---- mozilla-release.orig/dom/ipc/test.xul 2013-10-25 20:27:14.000000000 -0200 -+++ mozilla-release/dom/ipc/test.xul 2013-11-05 03:57:12.982325866 -0200 +diff --git a/dom/ipc/test.xul b/dom/ipc/test.xul +index 3eede17..1b47a70 100644 +--- a/dom/ipc/test.xul ++++ b/dom/ipc/test.xul @@ -302,6 +302,6 @@ oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/> @@ -678,9 +692,10 @@ diff -Nur mozilla-release.orig/dom/ipc/test.xul mozilla-release/dom/ipc/test.xul +