--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: jessie-pu: package conkeror/1.0~~pre-1+git141025-1+deb8u1
- From: Axel Beckert <abe@debian.org>
- Date: Tue, 08 Sep 2015 22:12:04 +0200
- Message-id: <20150908201204.7041.19366.reportbug@c-crosser.deuxchevaux.org>
Package: release.debian.org
Severity: normal
Tags: jessie
User: release.debian.org@packages.debian.org
Usertags: pu
Control: block 795597 by -1
Hi,
the upgrade of iceweasel from 31.x to 38.x broke conkeror in Jessie:
https://bugs.debian.org/795597
I've prepared an update cherry-picking an upstream fix which is
already part of conkeror in testing and unstable:
diff -Nru conkeror-1.0~~pre-1+git141025/debian/changelog conkeror-1.0~~pre-1+git141025/debian/changelog
--- conkeror-1.0~~pre-1+git141025/debian/changelog 2014-10-25 18:37:02.000000000 +0200
+++ conkeror-1.0~~pre-1+git141025/debian/changelog 2015-09-08 22:02:37.000000000 +0200
@@ -1,3 +1,11 @@
+conkeror (1.0~~pre-1+git141025-1+deb8u1) stable-proposed-updates; urgency=medium
+
+ * Cherry-pick 6906955e from upstream master branch to fix matching of
+ module load error messages to work with Firefox 36 and later
+ (including the ESR release 38.x in Debian Jessie).
+
+ -- Axel Beckert <abe@debian.org> Tue, 08 Sep 2015 22:00:42 +0200
+
conkeror (1.0~~pre-1+git141025-1) unstable; urgency=low
* New upstream snapshot
diff -Nru conkeror-1.0~~pre-1+git141025/debian/patches/cherry-pick-6906955e-fix-load-error-messages-with-ff36.diff conkeror-1.0~~pre-1+git141025/debian/patches/cherry-pick-6906955e-fix-load-error-messages-with-ff36.diff
--- conkeror-1.0~~pre-1+git141025/debian/patches/cherry-pick-6906955e-fix-load-error-messages-with-ff36.diff 1970-01-01 01:00:00.000000000 +0100
+++ conkeror-1.0~~pre-1+git141025/debian/patches/cherry-pick-6906955e-fix-load-error-messages-with-ff36.diff 2015-09-08 22:02:37.000000000 +0200
@@ -0,0 +1,26 @@
+Origin: commit 6906955ef78caeb357b729e1f608dfe1f0171dcc
+Author: Jeremy Maitin-Shepard <jeremy@jeremyms.com>
+Date: Thu Feb 26 19:10:05 2015 -0800
+Description: application.js: fix matching of module load error messages to work with Firefox 36
+ Firefox 36 includes the path in some error messages, causing them to
+ no longer precisely match the strings that had been specified. Using
+ String.prototype.startsWith fixes the problem.
+
+diff --git a/components/application.js b/components/application.js
+index 962ca73..bd9f30c 100644
+--- a/components/application.js
++++ b/components/application.js
+@@ -161,10 +161,9 @@ application.prototype = {
+ return;
+ }
+ } catch (e if (typeof e == 'string' &&
+- {"ContentLength not available (not a local URL?)":true,
+- "Error creating channel (invalid URL scheme?)":true,
+- "Error opening input stream (invalid filename?)":true}
+- [e])) {
++ (e.startsWith("ContentLength not available (not a local URL?)") ||
++ e.startsWith("Error creating channel (invalid URL scheme?)") ||
++ e.startsWith("Error opening input stream (invalid filename?)")))) {
+ // null op. (suppress error, try next path)
+ }
+ if (autoext)
diff -Nru conkeror-1.0~~pre-1+git141025/debian/patches/series conkeror-1.0~~pre-1+git141025/debian/patches/series
--- conkeror-1.0~~pre-1+git141025/debian/patches/series 2014-06-14 11:58:40.000000000 +0200
+++ conkeror-1.0~~pre-1+git141025/debian/patches/series 2015-09-08 22:02:37.000000000 +0200
@@ -1,2 +1,3 @@
sensible-editor-xdg-open.diff
deb-webjumps.diff
+cherry-pick-6906955e-fix-load-error-messages-with-ff36.diff
-- System Information:
Debian Release: 8.2
APT prefers stable
APT policy: (909, 'stable'), (902, 'stable-updates'), (901, 'proposed-updates'), (900, 'stable')
Architecture: amd64 (x86_64)
Kernel: Linux 3.16.0-4-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: sysvinit (via /sbin/init)
--- End Message ---