Bug#768395: unblock: iceweasel/31.2.0esr-3.1

[Samuel Thibault]

Package: release.debian.org
Severity: normal
User: release.debian.org at packages.debian.org
Usertags: unblock

unblock iceweasel/31.2.0esr-3.1

Hello,

I would like to NMU the attached changes to iceweasel.  The current
Debian version of iceweasel is currently completely inaccessible for
blind users, as reported in #743440 . This is particularly bad since
it's essentially the only browser that a blind user can use to get
decent javascript support.  This was fixed upstream in firefox 32, but
that didn't make its way into Jessie, so I'm here proposing to backport
the fix since it's quite trivial.

Samuel

-- System Information:
Debian Release: jessie/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'buildd-unstable'), (500, 'unstable'), (500, 'stable'), (500, 'oldstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.17.0 (SMP w/8 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

-- 
Samuel
<L> pour moi le seul qui est autorisé à fasciser, c moi :-)
-------------- next part --------------
diff -Nru iceweasel-31.2.0esr/debian/changelog iceweasel-31.2.0esr/debian/changelog
--- iceweasel-31.2.0esr/debian/changelog	2014-11-02 02:29:57.000000000 +0100
+++ iceweasel-31.2.0esr/debian/changelog	2014-11-06 20:46:50.000000000 +0100
@@ -1,3 +1,12 @@
+iceweasel (31.2.0esr-3.1) unstable; urgency=medium
+
+  * Non-Maintainer Upload.
+  * Bug-743580-dont-remove-atk-bridge-from-GTK_MODULES-during-startup.patch:
+    Cherry-pick patch from upstream to fix accessibility startup.
+    Closes: #743440.
+
+ -- Samuel Thibault <sthibault at debian.org>  Thu, 06 Nov 2014 20:45:15 +0100
+
 iceweasel (31.2.0esr-3) unstable; urgency=medium
 
   * debian/changelog: Add missing entries for 27.0.1-1.
diff -Nru iceweasel-31.2.0esr/debian/patches/fixes/Bug-743580-dont-remove-atk-bridge-from-GTK_MODULES-during-startup.patch iceweasel-31.2.0esr/debian/patches/fixes/Bug-743580-dont-remove-atk-bridge-from-GTK_MODULES-during-startup.patch
--- iceweasel-31.2.0esr/debian/patches/fixes/Bug-743580-dont-remove-atk-bridge-from-GTK_MODULES-during-startup.patch	1970-01-01 01:00:00.000000000 +0100
+++ iceweasel-31.2.0esr/debian/patches/fixes/Bug-743580-dont-remove-atk-bridge-from-GTK_MODULES-during-startup.patch	2014-11-06 20:44:55.000000000 +0100
@@ -0,0 +1,44 @@
+
+# HG changeset patch
+# User Trevor Saunders <trev.saunders at gmail.com>
+# Date 1399052780 14400
+# Node ID 6b3e73a12bb603a184cf3c945eb14a4d43ed5048
+# Parent  f4693085c5070693ecbbf1827c7e3f37b0d23311
+bug 743580 - don't remove atk-bridge from GTK_MODULES during startup r=ginn, karlt
+
+diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
+--- a/toolkit/xre/nsAppRunner.cpp
++++ b/toolkit/xre/nsAppRunner.cpp
+@@ -2912,29 +2912,18 @@ XREMain::XRE_mainInit(bool* aExitFlag)
+       Output(true, "Could not determine HOME directory");
+       return 1;
+     }
+     SaveWordToEnv("HOME", nsDependentCString(pw->pw_dir));
+   }
+ #endif
+ 
+ #ifdef MOZ_ACCESSIBILITY_ATK
+-  // Reset GTK_MODULES, strip atk-bridge if exists
+-  // Mozilla will load libatk-bridge.so later if necessary
+-  const char* gtkModules = PR_GetEnv("GTK_MODULES");
+-  if (gtkModules && *gtkModules) {
+-    nsCString gtkModulesStr(gtkModules);
+-    gtkModulesStr.ReplaceSubstring("atk-bridge", "");
+-    char* expr = PR_smprintf("GTK_MODULES=%s", gtkModulesStr.get());
+-    if (expr)
+-      PR_SetEnv(expr);
+-    // We intentionally leak |expr| here since it is required by PR_SetEnv.
+-  }
+-
+-  // Suppress atk-bridge init at startup, it works after GNOME 2.24.2
++  // Suppress atk-bridge init at startup, until mozilla accessibility is
++  // initialized.  This works after gnome 2.24.2.
+   SaveToEnv("NO_AT_BRIDGE=1");
+ #endif
+ 
+   // Check for application.ini overrides
+   const char* override = nullptr;
+   ar = CheckArg("override", true, &override);
+   if (ar == ARG_BAD) {
+     Output(true, "Incorrect number of arguments passed to -override");
+
diff -Nru iceweasel-31.2.0esr/debian/patches/series iceweasel-31.2.0esr/debian/patches/series
--- iceweasel-31.2.0esr/debian/patches/series	2014-11-02 02:29:06.000000000 +0100
+++ iceweasel-31.2.0esr/debian/patches/series	2014-11-06 20:45:08.000000000 +0100
@@ -2,6 +2,7 @@
 fixes/Avoid-spurious-Run-items-in-application-handlers-con.patch
 fixes/Bug-857628-Build-target-programs-as-position-indepen.patch
 fixes/Bug-1076983-Disabling-SSL-3.0-with-pref.patch
+fixes/Bug-743580-dont-remove-atk-bridge-from-GTK_MODULES-during-startup.patch
 iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.propertie.patch
 iceweasel-branding/Modify-search-plugins-depending-on-MOZ_APP_NAME.patch
 iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch