diff -u conkeror-0.9.1+git100220/debian/changelog conkeror-0.9.1+git100220/debian/changelog --- conkeror-0.9.1+git100220/debian/changelog +++ conkeror-0.9.1+git100220/debian/changelog @@ -1,3 +1,13 @@ +conkeror (0.9.1+git100220-1ubuntu2) lucid; urgency=low + + * Backport fixes from upstream git related to xulrunner-1.9.2 (LP: #561708) + - add debian/patches/0001-buffer-set_input_mode-on-blur-event.patch + - add debian/patches/0002-fix-issue1-issue38-issue243-issue259.patch + - add debian/patches/0003-fix-issue215.patch + - add debian/patches/0004-hint_manager.generate_hints-don-t-assume-area-elemen.patch + + -- Micah Gersten Mon, 12 Apr 2010 12:07:52 -0500 + conkeror (0.9.1+git100220-1ubuntu1) lucid; urgency=low * Merge from debian testing. Remaining changes: diff -u conkeror-0.9.1+git100220/debian/patches/series conkeror-0.9.1+git100220/debian/patches/series --- conkeror-0.9.1+git100220/debian/patches/series +++ conkeror-0.9.1+git100220/debian/patches/series @@ -2,0 +3,4 @@ +0001-buffer-set_input_mode-on-blur-event.patch +0002-fix-issue1-issue38-issue243-issue259.patch +0003-fix-issue215.patch +0004-hint_manager.generate_hints-don-t-assume-area-elemen.patch only in patch2: unchanged: --- conkeror-0.9.1+git100220.orig/debian/patches/0004-hint_manager.generate_hints-don-t-assume-area-elemen.patch +++ conkeror-0.9.1+git100220/debian/patches/0004-hint_manager.generate_hints-don-t-assume-area-elemen.patch @@ -0,0 +1,36 @@ +From 63528db2bf7516836d0340a18435968888a70146 Mon Sep 17 00:00:00 2001 +From: John Foerch +Date: Sun, 11 Apr 2010 16:49:46 -0400 +Subject: [PATCH] hint_manager.generate_hints: don't assume area elements have coords + +encountered area elements without coords attribute on ebay.com +--- + modules/hints.js | 12 +++++++----- + 1 files changed, 7 insertions(+), 5 deletions(-) + +diff --git a/modules/hints.js b/modules/hints.js +index 8496cb0..2246073 100644 +--- a/modules/hints.js ++++ b/modules/hints.js +@@ -122,11 +122,13 @@ hint_manager.prototype = { + left: rect.left, + bottom: rect.bottom, + right: rect.right }; +- var coords = elem.getAttribute("coords") +- .match(/^(-?\d+)\D+(-?\d+)/); +- if (coords.length == 3) { +- rect.left += parseInt(coords[1]); +- rect.top += parseInt(coords[2]); ++ var coords = elem.getAttribute("coords"); ++ if (coords) { ++ coords = coords.match(/^(-?\d+)\D+(-?\d+)/); ++ if (coords.length == 3) { ++ rect.left += parseInt(coords[1]); ++ rect.top += parseInt(coords[2]); ++ } + } + } + if (!rect || rect.left > maxX || rect.right < minX || rect.top > maxY || rect.bottom < minY) +-- +1.7.0 + only in patch2: unchanged: --- conkeror-0.9.1+git100220.orig/debian/patches/0001-buffer-set_input_mode-on-blur-event.patch +++ conkeror-0.9.1+git100220/debian/patches/0001-buffer-set_input_mode-on-blur-event.patch @@ -0,0 +1,29 @@ +From 9d53f7416e0fd4e461d9287d2b05d5198934b036 Mon Sep 17 00:00:00 2001 +From: John Foerch +Date: Thu, 8 Apr 2010 14:58:37 -0400 +Subject: [PATCH 1/2] buffer: set_input_mode on blur event + +needed as of xulrunner 1.9.2 +--- + modules/buffer.js | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) + +diff --git a/modules/buffer.js b/modules/buffer.js +index ff60850..c274846 100644 +--- a/modules/buffer.js ++++ b/modules/buffer.js +@@ -137,6 +137,11 @@ function buffer (window, element) { + } else + buffer.set_input_mode(); + }, true); ++ ++ this.browser.addEventListener("blur", function (event) { ++ buffer.set_input_mode(); ++ }, true); ++ + this.modalities = []; + + this.override_keymaps = []; +-- +1.7.0 + only in patch2: unchanged: --- conkeror-0.9.1+git100220.orig/debian/patches/0002-fix-issue1-issue38-issue243-issue259.patch +++ conkeror-0.9.1+git100220/debian/patches/0002-fix-issue1-issue38-issue243-issue259.patch @@ -0,0 +1,33 @@ +From d5223e2eaffa62ec3637320b6e29f86bdf988c7e Mon Sep 17 00:00:00 2001 +From: John Foerch +Date: Thu, 8 Apr 2010 16:17:14 -0400 +Subject: [PATCH 2/2] fix issue1, issue38, issue243, issue259 + +it was a bug in getFocusedSelCtrl introduced in a1124373 (aug 22, 2008). +it seems to affect pages with iframe elements, when the root document had +focus. a variable used in searching for the focused docshell gets +clobbered in the search, and inadvertently used later, when it no longer +has a valid value. + + Not 100% sure about issue38, as a full stack trace was not given, but it +seems likely enough to close that bug too. +--- + modules/find.js | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/modules/find.js b/modules/find.js +index 407089a..83c4860 100644 +--- a/modules/find.js ++++ b/modules/find.js +@@ -37,7 +37,7 @@ function getFocusedSelCtrl (buffer) { + } + + // One last try +- return ds ++ return buffer.doc_shell + .QueryInterface(Ci.nsIInterfaceRequestor) + .getInterface(Ci.nsISelectionDisplay) + .QueryInterface(Ci.nsISelectionController); +-- +1.7.0 + only in patch2: unchanged: --- conkeror-0.9.1+git100220.orig/debian/patches/0003-fix-issue215.patch +++ conkeror-0.9.1+git100220/debian/patches/0003-fix-issue215.patch @@ -0,0 +1,27 @@ +From 07de65abe3ee8ddaddc45ad29543d28cf4577a9f Mon Sep 17 00:00:00 2001 +From: John Foerch +Date: Fri, 9 Apr 2010 19:30:42 -0400 +Subject: [PATCH] fix issue215 + +isearch_session.focus_link must normalize case of node.localName for +compatibility with xulrunner 1.9.2 and up. +--- + modules/find.js | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/modules/find.js b/modules/find.js +index b583966..9e91b10 100644 +--- a/modules/find.js ++++ b/modules/find.js +@@ -229,7 +229,7 @@ isearch_session.prototype = { + if (node == null) + return; + do { +- if (node.localName == "A") { ++ if (node.localName && node.localName.toLowerCase() == "a") { + if (node.hasAttributes && node.attributes.getNamedItem("href")) { + // if there is a selection, preserve it. it is up + // to the caller to decide whether or not to keep +-- +1.7.0 +