--- Begin Message ---
Package: release.debian.org
Severity: normal
Tags: jessie
User: release.debian....@packages.debian.org
Usertags: pu
With the update to Firefox 45 in Jessie, it once again caused
regressions in depending packages due to removed features. For
conkeror it's this time the removal of some specific syntactic sugar
around the "let" construct.
Cherry-picking the according upstream fix solves the issue also in
Jessie. I've prepared and tested an upload for that and would like to
upload this to jessie-proposed-updates.
Full source debdiff:
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 2016-02-23
21:01:37.000000000 +0100
+++ conkeror-1.0~~pre-1+git141025/debian/changelog 2016-07-04
16:59:43.000000000 +0200
@@ -1,3 +1,11 @@
+conkeror (1.0~~pre-1+git141025-1+deb8u2) jessie; urgency=medium
+
+ * Cherry-pick 631644f5 from upstream master branch to remove "let"
+ expressions to support Firefox 44 and later (including the ESR release
+ 45.x in Debian Jessie). (Closes: #813039)
+
+ -- Axel Beckert <a...@debian.org> Fri, 17 Jun 2016 19:26:15 +0200
+
conkeror (1.0~~pre-1+git141025-1+deb8u1) jessie; urgency=medium
* Cherry-pick 6906955e from upstream master branch to fix matching of
diff -Nru
conkeror-1.0~~pre-1+git141025/debian/patches/cherry-pick-631644f5-remove-let-expressions-for-ff44.diff
conkeror-1.0~~pre-1+git141025/debian/patches/cherry-pick-631644f5-remove-let-expressions-for-ff44.diff
---
conkeror-1.0~~pre-1+git141025/debian/patches/cherry-pick-631644f5-remove-let-expressions-for-ff44.diff
1970-01-01 01:00:00.000000000 +0100
+++
conkeror-1.0~~pre-1+git141025/debian/patches/cherry-pick-631644f5-remove-let-expressions-for-ff44.diff
2016-07-04 16:59:43.000000000 +0200
@@ -0,0 +1,197 @@
+Origin: commit 631644f5c4a6bc544312603eab8ae4deed0f125e
+Author: Istvan Marko <mi-...@kismala.com>
+Description: Remove let expressions
+ SpiderMonkey no longer supports them since Firefox 44, see
+ https://bugzilla.mozilla.org/show_bug.cgi?id=1023609
+Bug: http://bugs.conkeror.org/issue498
+Bug-Debian: https://bugs.debian.org/813039
+Reviewed-By: Axel Beckert <a...@debian.org>
+
+diff --git a/modules/block-content-focus-change.js
b/modules/block-content-focus-change.js
+index ce20fb1..b245c71 100644
+--- a/modules/block-content-focus-change.js
++++ b/modules/block-content-focus-change.js
+@@ -58,7 +58,8 @@ function block_content_focus_change_buffer_teardown (buffer)
{
+ true);
+ }
+
+-let (foo = browser_set_element_focus) {
++{
++ let foo = browser_set_element_focus;
+ define_global_mode("block_content_focus_change_mode",
+ function () { // enable
+ for_each_buffer(function (buffer) {
+diff --git a/modules/buffer.js b/modules/buffer.js
+index 8d02a97..667aef2 100644
+--- a/modules/buffer.js
++++ b/modules/buffer.js
+@@ -757,7 +757,8 @@ function create_buffer (window, creator, target) {
+ }
+ }
+
+-let (queued_buffer_creators = null) {
++{
++ let queued_buffer_creators = null;
+ function create_buffer_in_current_window (creator, target,
focus_existing) {
+ function process_queued_buffer_creators (window) {
+ for (var i = 0; i < queued_buffer_creators.length; ++i) {
+diff --git a/modules/debug.js b/modules/debug.js
+index 7f989b8..2fb2d4a 100644
+--- a/modules/debug.js
++++ b/modules/debug.js
+@@ -83,8 +83,9 @@ const DEBUG_HERE = "function (__DEBUG_HERE) { return
eval(__DEBUG_HERE); }";
+
+
+
+-let (console = Cc["@mozilla.org/consoleservice;1"]
+- .getService(Ci.nsIConsoleService)) {
++{
++ let console = Cc["@mozilla.org/consoleservice;1"]
++ .getService(Ci.nsIConsoleService);
+ console.registerListener({
+ observe: function (msg) {
+ if (msg instanceof Ci.nsIScriptError) {
+diff --git a/modules/env.js b/modules/env.js
+index 73d32c1..270d6f7 100644
+--- a/modules/env.js
++++ b/modules/env.js
+@@ -11,8 +11,9 @@
+ * get_os returns a string identifying the current OS.
+ * possible values include 'Darwin', 'Linux' and 'WINNT'.
+ */
+-let (xul_runtime = Cc['@mozilla.org/xre/app-info;1']
+- .getService(Ci.nsIXULRuntime)) {
++{
++ let xul_runtime = Cc['@mozilla.org/xre/app-info;1']
++ .getService(Ci.nsIXULRuntime);
+ function get_os () {
+ return xul_runtime.OS;
+ }
+@@ -37,8 +38,9 @@ function get_mozilla_version () {
+ * getenv returns the value of a named environment variable or null if
+ * the environment variable does not exist.
+ */
+-let (env = Cc['@mozilla.org/process/environment;1']
+- .getService(Ci.nsIEnvironment)) {
++{
++ let env = Cc['@mozilla.org/process/environment;1']
++ .getService(Ci.nsIEnvironment);
+ function getenv (variable) {
+ if (env.exists(variable))
+ return env.get(variable);
+@@ -75,7 +77,8 @@ function get_home_directory () {
+ * not be depended on for anything important. It is mainly intended for
+ * decoration of the window title and mode-line.
+ */
+-let (profile_name = null) {
++{
++ let profile_name = null;
+ function get_current_profile () {
+ if (profile_name)
+ return profile_name;
+diff --git a/modules/favicon.js b/modules/favicon.js
+index ea606b2..0f7230d 100644
+--- a/modules/favicon.js
++++ b/modules/favicon.js
+@@ -17,7 +17,8 @@ define_variable("favicon_image_max_size", 1024,
+ "is considered for use as a favicon.");
+
+
+-let (favicon_set_internal) {
++{
++ let favicon_set_internal;
+ if (version_compare(get_mozilla_version(), "18.0") >= 0) {
+ favicon_set_internal = function (buffer, icon_url) {
+ favicon_service.setAndFetchFaviconForPage(
+diff --git a/modules/input.js b/modules/input.js
+index 3b1cdbb..df6a553 100644
+--- a/modules/input.js
++++ b/modules/input.js
+@@ -252,7 +252,8 @@ sequence:
+ }
+ break;
+ case "command":
+- let (command = event.command) {
++ {
++ let command = event.command;
+ window.input.help_displayed = false;
+ input_help_timer_clear(window);
+ window.minibuffer.clear();
+diff --git a/modules/keymap.js b/modules/keymap.js
+index 3aad138..bf47d7d 100644
+--- a/modules/keymap.js
++++ b/modules/keymap.js
+@@ -10,8 +10,9 @@
+ /* Generate vk name table */
+ var keycode_to_vk_name = [];
+ var vk_name_to_keycode = {};
+-let (KeyEvent = Ci.nsIDOMKeyEvent,
+- prefix = "DOM_VK_") {
++{
++ let KeyEvent = Ci.nsIDOMKeyEvent,
++ prefix = "DOM_VK_";
+ for (var i in KeyEvent) {
+ /* Check if this is a key binding */
+ if (i.substr(0, prefix.length) == prefix) {
+diff --git a/modules/page-modes/reddit.js b/modules/page-modes/reddit.js
+index 17ab375..1578f6d 100644
+--- a/modules/page-modes/reddit.js
++++ b/modules/page-modes/reddit.js
+@@ -109,10 +109,10 @@ function reddit_next_link (I) {
+ if (reddit_end_behavior == 'wrap')
+ next = first;
+ if (reddit_end_behavior == 'page') {
+- let (xpr = doc.evaluate(
+- '//span[@class="nextprev"]/a[contains(text(),"next")]',
doc, null,
+- Ci.nsIDOMXPathResult.ORDERED_NODE_ITERATOR_TYPE, null))
+ {
++ let xpr = doc.evaluate(
++
'//span[@class="nextprev"]/a[contains(text(),"next")]', doc, null,
++ Ci.nsIDOMXPathResult.ORDERED_NODE_ITERATOR_TYPE,
null);
+ var nextpage;
+ if (xpr && (nextpage = xpr.iterateNext())) {
+ dom_remove_class(current, "last-clicked");
+@@ -332,10 +332,10 @@ function reddit_prev_link (I) {
+ prev = links[llen - 1];
+ }
+ } else if (reddit_end_behavior == 'page') {
+- let (xpr = doc.evaluate(
+- '//span[@class="nextprev"]/a[contains(text(),"prev")]', doc,
null,
+- Ci.nsIDOMXPathResult.ORDERED_NODE_ITERATOR_TYPE, null))
+ {
++ let xpr = doc.evaluate(
++ '//span[@class="nextprev"]/a[contains(text(),"prev")]',
doc, null,
++ Ci.nsIDOMXPathResult.ORDERED_NODE_ITERATOR_TYPE, null);
+ var prevpage;
+ if (xpr && (prevpage = xpr.iterateNext())) {
+ dom_remove_class(current, "last-clicked");
+diff --git a/modules/rc.js b/modules/rc.js
+index 0eae25d..1001e28 100644
+--- a/modules/rc.js
++++ b/modules/rc.js
+@@ -7,7 +7,8 @@
+ * COPYING file.
+ **/
+
+-let (default_rc = get_home_directory()) {
++{
++ let default_rc = get_home_directory();
+ default_rc.appendRelativePath(".conkerorrc");
+ default_pref("conkeror.rcfile", default_rc.path);
+ }
+diff --git a/modules/session.js b/modules/session.js
+index d0fddd3..0075083 100644
+--- a/modules/session.js
++++ b/modules/session.js
+@@ -104,9 +104,9 @@
+ buffer_idx : window.buffers.count;
+
+ // first kill special buffers slated for recycling.
+- let (b, i = (bi == 0 ? 1 : bi),
+- safe2kill = bi > 0)
+ {
++ let b, i = (bi == 0 ? 1 : bi),
++ safe2kill = bi > 0;
+ while ((b = window.buffers.get_buffer(i))) {
+ if (b instanceof content_buffer) {
+ safe2kill = true;
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 2016-02-23
18:51:14.000000000 +0100
+++ conkeror-1.0~~pre-1+git141025/debian/patches/series 2016-07-04
16:59:43.000000000 +0200
@@ -1,3 +1,4 @@
sensible-editor-xdg-open.diff
deb-webjumps.diff
cherry-pick-6906955e-fix-load-error-messages-with-ff36.diff
+cherry-pick-631644f5-remove-let-expressions-for-ff44.diff
-- System Information:
Debian Release: 8.5
APT prefers stable-updates
APT policy: (500, 'stable-updates'), (500, 'proposed-updates'), (500,
'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 ---
