Merge inbound to mozilla-central. a=merge

    # Used in G_DEFINE_TYPE_EXTENDED macro, probably fixed in newer glib /

    # gobject headers. See bug 1243331 comment 3.

    CXXFLAGS += [

        '-Wno-error=unused-function',

        '-Wno-error=shadow',

        '-Wno-unused-local-typedefs',

    ]

let gPrefArray;

function onLoad() {

  gPrefArray = Services.prefs.getChildList("").map(name => ({

  gPrefArray = Services.prefs.getChildList("").map(function(name) {

    let pref = {

      name,

      value: Preferences.get(name),

      hasUserValue: Services.prefs.prefHasUserValue(name),

  }));

    };

    // Try in case it's a localized string.

    // Throws an exception if there is no equivalent value in the localized files for the pref.

    // If an execption is thrown the pref value is set to the empty string.

    try {

      if (!pref.hasUserValue && /^chrome:\/\/.+\/locale\/.+\.properties/.test(pref.value)) {

        pref.value = Services.prefs.getComplexValue(name, Ci.nsIPrefLocalizedString).data;

      }

    } catch (ex) {

      pref.value = "";

    }

    return pref;

  });

  gPrefArray.sort((a, b) => a.name > b.name);

const PAGE_URL = "chrome://browser/content/aboutconfig/aboutconfig.html";

add_task(async function setup() {

  await SpecialPowers.pushPrefEnv({

    set: [

      ["random.user.pref", "chrome://test/locale/testing.properties"],

    ],

  });

});

add_task(async function test_load_title() {

  await BrowserTestUtils.withNewTab({

    gBrowser,

      function findPref(name) {

        return list.some(e => e.textContent.trim().startsWith(name + " "));

      }

      // Test if page contains elements.

      Assert.ok(findPref("plugins.testmode"));

      Assert.ok(findPref("dom.vr.enabled"));

      Assert.ok(findPref("accessibility.AOM.enabled"));

      function containsLocalizedValue(value) {

        return list.some(e => e.textContent.trim() == value);

      }

      // Test to see if values are localized.

      Assert.ok(containsLocalizedValue("font.language.group || Default || String || x-western"));

      Assert.ok(containsLocalizedValue("intl.ellipsis || Default || String || \u2026"));

      Assert.ok(containsLocalizedValue("gecko.handlerService.schemes.mailto.1.uriTemplate || Default || String || https://mail.google.com/mail/?extsrc=mailto&url=%s"));

      // Test to see if user created value is not empty string when it matches /^chrome:\/\/.+\/locale\/.+\.properties/.

      Assert.ok(containsLocalizedValue("random.user.pref || Modified || String || chrome://test/locale/testing.properties"));

      // Test to see if empty string when value matches /^chrome:\/\/.+\/locale\/.+\.properties/ and an exception is thrown.

      Assert.ok(containsLocalizedValue("gecko.handlerService.schemes.irc.1.name || Default || String ||"));

    });

  });

});

diff -Nru glib2.0-2.38.2/debian/changelog glib2.0-2.38.2/debian/changelog

--- glib2.0-2.38.2/debian/changelog	2014-02-15 21:47:00.000000000 +0900

+++ glib2.0-2.38.2/debian/changelog	2018-11-02 09:47:49.000000000 +0900

@@ -1,3 +1,10 @@

+glib2.0 (2.38.2-5.deb7moz1) wheezy; urgency=medium

+

+  * Mozilla backport for Wheezy.

+  * debian/control: Remove :any from dependencies because it's not supported.

+

+ -- Mike Hommey <glandium@mozilla.com>  Fri, 02 Nov 2018 09:47:49 +0900

+

 glib2.0 (2.38.2-5) unstable; urgency=medium

   * Upload to unstable.

diff -Nru glib2.0-2.38.2/debian/control glib2.0-2.38.2/debian/control

--- glib2.0-2.38.2/debian/control	2014-02-15 21:50:26.000000000 +0900

+++ glib2.0-2.38.2/debian/control	2018-11-02 09:47:24.000000000 +0900

@@ -24,7 +24,7 @@

                dbus-x11,

                shared-mime-info,

                xterm,

-               python:any (>= 2.6.6-3~),

+               python (>= 2.6.6-3~),

                python-dbus,

                python-gi,

                libxml2-utils,

diff -Nru gtk+3.0-3.10.7/debian/changelog gtk+3.0-3.10.7/debian/changelog

--- gtk+3.0-3.10.7/debian/changelog	2014-02-15 22:20:29.000000000 +0900

+++ gtk+3.0-3.10.7/debian/changelog	2018-11-02 12:04:23.000000000 +0900

@@ -1,3 +1,11 @@

+gtk+3.0 (3.10.7-1.deb7moz1) wheezy; urgency=medium

+

+  * Mozilla backport for Wheezy.

+  * gtk/Makefile.am: Filter-out -fvisibility=hidden from the flags passed

+    to g-ir-scanner.

+

+ -- Mike Hommey <glandium@mozilla.com>  Fri, 02 Nov 2018 12:04:23 +0900

+

 gtk+3.0 (3.10.7-1) unstable; urgency=low

   * debian/libgtk-3-bin.install:

diff -Nru gtk+3.0-3.10.7/debian/patches/deb7moz1 gtk+3.0-3.10.7/debian/patches/deb7moz1

--- gtk+3.0-3.10.7/debian/patches/deb7moz1	1970-01-01 09:00:00.000000000 +0900

+++ gtk+3.0-3.10.7/debian/patches/deb7moz1	2018-11-02 12:04:23.000000000 +0900

@@ -0,0 +1,11 @@

+--- gtk+3.0-3.10.7.orig/gtk/Makefile.am

++++ gtk+3.0-3.10.7/gtk/Makefile.am

+@@ -1352,7 +1352,7 @@ Gtk_3_0_gir_INCLUDES += xlib-2.0

+ endif

+ Gtk_3_0_gir_SCANNERFLAGS += --c-include="gtk/gtkx.h"

+ Gtk_3_0_gir_CFLAGS = \

+-		$(AM_CPPFLAGS) \

++		$(filter-out -fvisibility=hidden,$(AM_CPPFLAGS)) \

+ 		-DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API

+ Gtk_3_0_gir_LIBS = libgtk-3.la $(top_builddir)/gdk/libgdk-3.la

+ Gtk_3_0_gir_FILES = $(introspection_files)

diff -Nru gtk+3.0-3.10.7/debian/patches/series gtk+3.0-3.10.7/debian/patches/series

--- gtk+3.0-3.10.7/debian/patches/series	2014-02-15 22:14:46.000000000 +0900

+++ gtk+3.0-3.10.7/debian/patches/series	2018-11-02 12:04:23.000000000 +0900

@@ -12,3 +12,4 @@

 061_multiarch_module_fallback.patch

 071_fix-installation-of-HTML-images.patch

 080_disable-parallel-docs-build.patch

+deb7moz1