- Update gmp-api to 38.0

- Update Firefox to 37.0
- Update Firefox ESR and libxul to 31.6.0
- Update Thunderbird to 31.6.0
- Backport a few GTK3 fixes to Firefox 37

MFH:		2015Q1
Security:	https://vuxml.freebsd.org/freebsd/d0c97697-df2c-4b8b-bff2-cec24dc35af8.html

1 files changed, 20 insertions, 20 deletions

diff --git a/www/firefox/files/patch-bug1021761 b/www/firefox/files/patch-bug1021761
index 74a5d7a30f61..253327b733a7 100644
--- a/www/firefox/files/patch-bug1021761
+++ b/www/firefox/files/patch-bug1021761
@@ -542,42 +542,42 @@ index a962553..1f780f4 100644
      }
      alsa_locked_pcm_close(stm->pcm);
      stm->pcm = NULL;
-@@ -937,12 +1043,12 @@ alsa_get_max_channel_count(cubeb * ctx, uint32_t * max_channels)
+@@ -938,12 +1044,12 @@ alsa_get_max_channel_count(cubeb * ctx, uint32_t * max_channels)
      return CUBEB_ERROR;
    }
  
--  rv = snd_pcm_hw_params_any(stm->pcm, hw_params);
-+  rv = WRAP(snd_pcm_hw_params_any)(stm->pcm, hw_params);
-   if (rv < 0) {
+-  r = snd_pcm_hw_params_any(stm->pcm, hw_params);
++  r = WRAP(snd_pcm_hw_params_any)(stm->pcm, hw_params);
+   if (r < 0) {
      return CUBEB_ERROR;
    }
  
--  rv = snd_pcm_hw_params_get_channels_max(hw_params, max_channels);
-+  rv = WRAP(snd_pcm_hw_params_get_channels_max)(hw_params, max_channels);
-   if (rv < 0) {
+-  r = snd_pcm_hw_params_get_channels_max(hw_params, max_channels);
++  r = WRAP(snd_pcm_hw_params_get_channels_max)(hw_params, max_channels);
+   if (r < 0) {
      return CUBEB_ERROR;
    }
-@@ -962,34 +1068,34 @@ alsa_get_preferred_sample_rate(cubeb * ctx, uint32_t * rate) {
+@@ -963,34 +1069,34 @@ alsa_get_preferred_sample_rate(cubeb * ctx, uint32_t * rate) {
  
    /* get a pcm, disabling resampling, so we get a rate the
     * hardware/dmix/pulse/etc. supports. */
--  rv = snd_pcm_open(&pcm, "", SND_PCM_STREAM_PLAYBACK | SND_PCM_NO_AUTO_RESAMPLE, 0);
-+  rv = WRAP(snd_pcm_open)(&pcm, "", SND_PCM_STREAM_PLAYBACK | SND_PCM_NO_AUTO_RESAMPLE, 0);
-   if (rv < 0) {
+-  r = snd_pcm_open(&pcm, "default", SND_PCM_STREAM_PLAYBACK | SND_PCM_NO_AUTO_RESAMPLE, 0);
++  r = WRAP(snd_pcm_open)(&pcm, "default", SND_PCM_STREAM_PLAYBACK | SND_PCM_NO_AUTO_RESAMPLE, 0);
+   if (r < 0) {
      return CUBEB_ERROR;
    }
  
--  rv = snd_pcm_hw_params_any(pcm, hw_params);
-+  rv = WRAP(snd_pcm_hw_params_any)(pcm, hw_params);
-   if (rv < 0) {
+-  r = snd_pcm_hw_params_any(pcm, hw_params);
++  r = WRAP(snd_pcm_hw_params_any)(pcm, hw_params);
+   if (r < 0) {
 -    snd_pcm_close(pcm);
 +    WRAP(snd_pcm_close)(pcm);
      return CUBEB_ERROR;
    }
  
--  rv = snd_pcm_hw_params_get_rate(hw_params, rate, &dir);
-+  rv = WRAP(snd_pcm_hw_params_get_rate)(hw_params, rate, &dir);
-   if (rv >= 0) {
+-  r = snd_pcm_hw_params_get_rate(hw_params, rate, &dir);
++  r = WRAP(snd_pcm_hw_params_get_rate)(hw_params, rate, &dir);
+   if (r >= 0) {
      /* There is a default rate: use it. */
 -    snd_pcm_close(pcm);
 +    WRAP(snd_pcm_close)(pcm);
@@ -587,9 +587,9 @@ index a962553..1f780f4 100644
    /* Use a common rate, alsa may adjust it based on hw/etc. capabilities. */
    *rate = 44100;
  
--  rv = snd_pcm_hw_params_set_rate_near(pcm, hw_params, rate, NULL);
-+  rv = WRAP(snd_pcm_hw_params_set_rate_near)(pcm, hw_params, rate, NULL);
-   if (rv < 0) {
+-  r = snd_pcm_hw_params_set_rate_near(pcm, hw_params, rate, NULL);
++  r = WRAP(snd_pcm_hw_params_set_rate_near)(pcm, hw_params, rate, NULL);
+   if (r < 0) {
 -    snd_pcm_close(pcm);
 +    WRAP(snd_pcm_close)(pcm);
      return CUBEB_ERROR;