iceweasel-1:37.0.deb1-1: updating version

3 files changed, 14 insertions, 23 deletions

diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index d2a847626..f3a7a72f8 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -16,7 +16,7 @@ _pgo=true
 
 # We're getting this from Debian Experimental
 _debname=iceweasel
-_debver=36.0.4
+_debver=37.0
 _debrel=deb1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -51,17 +51,15 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
         $pkgname.desktop
         $pkgname-install-dir.patch
         vendor.js
-        rhbz-966424.patch
         $pkgname-fixed-loading-icon.png)
-sha256sums=('acb4c0cc66b7e548b44e33c72c2d34058abc25cee91991c468f0dd0543a88436'
-            '04209b546c76b3620df6014ff1b279e6fbd3d1686a67cce8ffb633a8bbaeb8a3'
+sha256sums=('669674f7532e6be6c9041e60aeebecf33759cec9610779a39554d608bfde787b'
+            '8fe1cfd748f475b629f0fc73725c054c182f138b592e113dd64c374ca4cc1375'
             '831720c1efd6e67d54e70cf4e2b02f9554aa6c914315be6dd2ca837adbbdcabd'
-            'abaf82abe25671fd401297182cab28001dd20c54e80968e514556f88d86537f5'
+            'fcb11b3e6bef5afb2f41b631c98d05d10f30bae3afda28ad8d29b98db5187909'
             '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd'
             '0f154e69dadf5e09038d74f56d6150be4e0a55ad0ca9f8dd760d58d8f692cb8f'
             '3aea6676f1e53a09673b6ae219d281fc28054beb6002b09973611c02f827651d'
-            'bdb9123015db160e8e68b4166e5da00f49b6d407f2a9b91fe9c5487ddbdafded'
-            'd25c6e95d20ec622a51346897d986fdd97074023d6a02bee0533773a195f8233'
+            'bc9f421975efd04e437849bda7f78529835647419fdd847f109ac0a775abb5c0'
             '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213')
 
 prepare() {
@@ -86,9 +84,6 @@ prepare() {
   # Install to /usr/lib/$pkgname
   patch -Np1 -i "$srcdir/$pkgname-install-dir.patch"
 
-  # https://bugs.archlinux.org/task/41689
-  patch -Np1 -i "$srcdir/rhbz-966424.patch"
-
   # Patch and remove anything that's left
   patch -Np1 -i "$srcdir/libre.patch"
   sed -i 's|Adobe Flash|SWF Player|g;
@@ -152,15 +147,10 @@ prepare() {
   # https://bugs.archlinux.org/task/34644
   sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure
 
-  # Fix tab loading icon (flickers with libpng 1.6)
+  # Fix tab loading icon (doesn't work with libpng 1.6)
   # https://bugzilla.mozilla.org/show_bug.cgi?id=841734
-  # TODO: Remove this; Iceweasel 36 might use CSS animations for the loading icon
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=759252
   cp "$srcdir/$pkgname-fixed-loading-icon.png" \
     browser/themes/linux/tabbrowser/loading.png
-
-  # Remove non-existent file on Makefile.in
-  sed -i '\|build/pgo/blueprint/valid.png|d' build/Makefile.in
 }
 
 build() {
diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch
index 1c3abfc21..5e1f7dad4 100644
--- a/libre/iceweasel/libre.patch
+++ b/libre/iceweasel/libre.patch
@@ -1,7 +1,7 @@
 diff -Nur mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/browser/app/profile/firefox.js
---- mozilla-release.orig/browser/app/profile/firefox.js	2015-02-25 21:30:45.311891359 -0200
-+++ mozilla-release/browser/app/profile/firefox.js	2015-02-25 21:33:17.983024576 -0200
-@@ -277,11 +277,6 @@
+--- mozilla-release.orig/browser/app/profile/firefox.js	2015-04-01 18:25:46.447764363 -0300
++++ mozilla-release/browser/app/profile/firefox.js	2015-04-01 18:28:05.967491230 -0300
+@@ -279,11 +279,6 @@
  pref("browser.slowStartup.timeThreshold", 40000);
  pref("browser.slowStartup.maxSamples", 5);
  
@@ -11,8 +11,8 @@ diff -Nur mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/br
 -pref("browser.aboutHomeSnippets.updateUrl", "https://snippets.cdn.mozilla.net/%STARTPAGE_VERSION%/%NAME%/%VERSION%/%APPBUILDID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/");
 -
  pref("browser.enable_automatic_image_resizing", true);
+ pref("browser.casting.enabled", false);
  pref("browser.chrome.site_icons", true);
- pref("browser.chrome.favicons", true);
 diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozilla-release/browser/base/content/abouthome/aboutHome.css
 --- mozilla-release.orig/browser/base/content/abouthome/aboutHome.css	2015-01-09 02:38:12.000000000 -0200
 +++ mozilla-release/browser/base/content/abouthome/aboutHome.css	2015-01-16 15:03:01.408257268 -0200
@@ -158,8 +158,8 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi
  }
  
 diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozilla-release/browser/base/content/abouthome/aboutHome.js
---- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js	2015-02-23 05:39:29.000000000 -0200
-+++ mozilla-release/browser/base/content/abouthome/aboutHome.js	2015-02-25 21:37:40.631672767 -0200
+--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js	2015-03-26 23:20:16.000000000 -0300
++++ mozilla-release/browser/base/content/abouthome/aboutHome.js	2015-04-01 18:31:13.921464580 -0300
 @@ -5,155 +5,44 @@
  "use strict";
  
@@ -340,7 +340,7 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil
 -, "https://addons.mozilla.org/firefox/?utm_source=snippet&utm_medium=snippet&utm_campaign=addons"
 -];
 -
--const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day.
+-const SNIPPETS_UPDATE_INTERVAL_MS = 14400000; // 4 hours.
 -
 -// IndexedDB storage constants.
 -const DATABASE_NAME = "abouthome";
diff --git a/libre/iceweasel/vendor.js b/libre/iceweasel/vendor.js
index 5af1e8c22..c4f729b34 100644
--- a/libre/iceweasel/vendor.js
+++ b/libre/iceweasel/vendor.js
@@ -41,6 +41,7 @@ pref("browser.newtabpage.directory.ping", "");
 pref("media.gmp-manager.url.override", "data:text/plain,");
 
 // Disable openh264.
+pref("media.gmp-provider.enabled", false);
 pref("media.gmp-gmpopenh264.provider.enabled", false);
 
 // Disable the least secure encryption protocols