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

3 files changed, 31 insertions, 34 deletions

diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index 341c954c2..9ab4537ea 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -16,8 +16,8 @@ _pgo=true
 
 # We're getting this from Debian Experimental
 _debname=iceweasel
-_debver=40.0.3
-_debrel=deb3
+_debver=41.0
+_debrel=deb1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
@@ -30,7 +30,7 @@ pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based o
 arch=(i686 x86_64)
 license=(MPL GPL LGPL)
 depends=(alsa-lib dbus-glib desktop-file-utils gtk2 hicolor-icon-theme hunspell icu=55.1 libevent libvpx=1.4.0 libxt mime-types mozilla-common nss sqlite startup-notification)
-makedepends=(autoconf2.13 diffutils gst-plugins-base-libs imagemagick imake inetutils libidl2 libpulse librsvg libxslt mesa mozilla-searchplugins pkg-config python2 quilt unzip yasm zip)
+makedepends=(autoconf2.13 diffutils gconf gst-plugins-base-libs imagemagick imake inetutils libidl2 libpulse librsvg libxslt mesa mozilla-searchplugins pkg-config python2 quilt unzip yasm zip)
 options=(!emptydirs !makeflags debug)
 if $_pgo; then
   makedepends+=(xorg-server-xvfb)
@@ -43,7 +43,7 @@ url="http://packages.debian.org/experimental/${pkgname}"
 install=$pkgname.install
 replaces=("${pkgname}-libre" 'firefox')
 conflicts=("${pkgname}-libre")
-source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
+source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.xz"
         "$_debrepo/`debfile $_debname`_$_debver-${_debrel#deb}.debian.tar.xz"
         mozconfig
         libre.patch
@@ -53,15 +53,15 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
         $pkgname-install-dir.patch
         vendor.js
         $pkgname-fixed-loading-icon.png)
-sha256sums=('2a2ded339bf491c4072fdcdc79cdc906733deffb8bcfa1d4fd9243e7f4ff9ee9'
-            '3098ccfab025999b166876fce8fda2d52fbd8ebd32d0a872a86238aa6c5a2e24'
+sha256sums=('2274baa823b5de03732e120f3278c81f6fdc5bb67ab3b219903f89206487a256'
+            '991cc1e92a9d579b2bb7a2091f5aafc29b2b7bf75e97e428343dfc38ea5003c6'
             '8e0b2aa899f9c71dfabf61e8e3427bda9a6ef76330bda4428d1badddcfc331a5'
-            '1811eec7a02411295affc6ee66e3e4b9fd636b0bfbd313ce2a132beb124612d8'
+            '49566ee824f0b40d4eb90c20bc23dc2a4caca47ceee4554936d020575dda0598'
             '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd'
             '56eba484179c7f498076f8dc603d8795e99dce8c6ea1da9736318c59d666bff6'
             '2257dc69886bd0b72c48675a27c3a88b9cf6b598252c9e9f1c99763180684fc3'
             '3aea6676f1e53a09673b6ae219d281fc28054beb6002b09973611c02f827651d'
-            '0171656480113c6fabfdf5b14effe4ac67fda667682eb692badac81562afa696'
+            'b078b1abbbcda77a0d116878b999496e65f6cff9cf60e0fbb7ce6977f767f1de'
             '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213')
 
 prepare() {
@@ -74,9 +74,6 @@ prepare() {
   mv debian "$srcdir/$DEBIAN_BUILD"
   cd "$srcdir/$DEBIAN_BUILD"
 
-  # Doesn't apply and seems unimportant
-  rm -v debian/patches/l10n/Place-google-and-gmail-before-yandex.patch || true
-
   quilt push -av
 
   # Put gnu_headshadow.png and drm-free.png in the source code
diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch
index e465b3e41..96e62e380 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-08-14 02:22:36.676626042 -0300
-+++ mozilla-release/browser/app/profile/firefox.js	2015-08-14 02:23:52.119613185 -0300
-@@ -283,11 +283,6 @@
+--- mozilla-release.orig/browser/app/profile/firefox.js	2015-09-25 00:51:23.690788053 -0300
++++ mozilla-release/browser/app/profile/firefox.js	2015-09-25 00:53:28.874699117 -0300
+@@ -281,11 +281,6 @@
  pref("browser.slowStartup.timeThreshold", 40000);
  pref("browser.slowStartup.maxSamples", 5);
  
@@ -179,8 +179,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-08-07 12:54:06.000000000 -0300
-+++ mozilla-release/browser/base/content/abouthome/aboutHome.js	2015-08-14 02:30:21.304032046 -0300
+--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js	2015-09-17 19:13:23.000000000 -0300
++++ mozilla-release/browser/base/content/abouthome/aboutHome.js	2015-09-25 00:53:28.894698145 -0300
 @@ -5,155 +5,54 @@
  "use strict";
  
@@ -508,7 +508,7 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil
  function onSearchSubmit(aEvent)
  {
    let searchText = document.getElementById("searchText");
-@@ -381,144 +167,6 @@
+@@ -389,144 +175,6 @@
    document.dispatchEvent(event);
  }
  
@@ -748,18 +748,18 @@ diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/sou
  
  # LOCALIZATION NOTE The correct localization of this file might be to keep it
 diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd mozilla-release/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd
---- mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd	2015-08-07 12:54:09.000000000 -0300
-+++ mozilla-release/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd	2015-08-14 02:23:52.122946356 -0300
-@@ -86,7 +86,7 @@
+--- mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd	2015-09-17 19:13:28.000000000 -0300
++++ mozilla-release/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd	2015-09-25 00:53:28.894698145 -0300
+@@ -90,7 +90,7 @@
    -  checkbox that toggles remote debugging, i.e. devtools.debugger.remote-enabled
    -  boolean preference in about:config, in the options panel. -->
  <!ENTITY options.enableRemote.label3    "Enable remote debugging">
 -<!ENTITY options.enableRemote.tooltip   "Turning this option on will allow the developer tools to debug remote Firefox instance like Firefox OS">
 +<!ENTITY options.enableRemote.tooltip   "Turning this option on will allow the developer tools to debug remote Iceweasel instance like Iceweasel OS">
  
- <!-- LOCALIZATION NOTE (options.disableJavaScript.label,
-   -  options.disableJavaScript.tooltip): This is the options panel label and
-@@ -109,7 +109,7 @@
+ <!-- LOCALIZATION NOTE (options.enableWorkers.label): This is the label for the
+   -  checkbox that toggles worker debugging, i.e. devtools.debugger.workers
+@@ -119,7 +119,7 @@
  <!-- LOCALIZATION NOTE (options.selectDefaultTools.label): This is the label for
    -  the heading of group of checkboxes corresponding to the default developer
    -  tools. -->
@@ -790,8 +790,8 @@ diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/web
  <!ENTITY key_quit "W">
  <!-- open menu -->
 diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/webide.properties mozilla-release/browser/locales/en-US/chrome/browser/devtools/webide.properties
---- mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/webide.properties	2015-08-07 12:54:09.000000000 -0300
-+++ mozilla-release/browser/locales/en-US/chrome/browser/devtools/webide.properties	2015-08-14 02:23:52.122946356 -0300
+--- mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/webide.properties	2015-09-17 19:13:28.000000000 -0300
++++ mozilla-release/browser/locales/en-US/chrome/browser/devtools/webide.properties	2015-09-25 00:53:28.894698145 -0300
 @@ -2,8 +2,8 @@
  # License, v. 2.0. If a copy of the MPL was not distributed with this
  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -803,7 +803,7 @@ diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/devtools/web
  
  runtimeButton_label=Select Runtime
  projectButton_label=Open App
-@@ -50,10 +50,10 @@
+@@ -54,10 +54,10 @@
  addons_stable=stable
  addons_unstable=unstable
  # LOCALIZATION NOTE (addons_simulator_label): This label is shown as the name of
@@ -867,13 +867,13 @@ diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser-region/regio
 +gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC
 +gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net
 diff -Nur mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in mozilla-release/browser/locales/generic/profile/bookmarks.html.in
---- mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in	2015-05-08 13:55:16.000000000 -0300
-+++ mozilla-release/browser/locales/generic/profile/bookmarks.html.in	2015-05-15 07:20:33.941389259 -0300
+--- mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in	2015-09-17 19:13:28.000000000 -0300
++++ mozilla-release/browser/locales/generic/profile/bookmarks.html.in	2015-09-25 00:59:56.402632811 -0300
 @@ -15,13 +15,20 @@
      <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3>
  <DD>@bookmarks_toolbarfolder_description@
      <DL><p>
--        <DT><A HREF="https://www.mozilla.org/@AB_CD@/firefox/central/" ID="rdf:#$GvPhC3">@getting_started@</A>
+-        <DT><A HREF="https://www.mozilla.org/@AB_CD@/firefox/central/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAz5JREFUeNpcU0toXFUY/s49596588ikySSmM8rk0UkJEirVTVEjYk1NUdRFFgouXZQI2k2hUCjdiYIuCi4Kuig0DbqQYgU3Yi0iFRuRCBMwaZvMZDTNY95z3/fM8b8jldpzOeeee/i/737n+/+f4ZExf730rkiaZ9NJMx/nmk5HypMqqLr+ZuD4F67N5ZYejmfRsnvhyKsLhSs3zP70SubgYKHSdFENu+gXAprQIGnvBi5ez0m1b6u7M399+PTx+UvtCKtFi2F6195qXK2byir88esy5ksfYND5DhuhRCtUKBNB0Q7w5Z8ee2GgWdjOn250fn5v5j8F5dOHlZD0kWRgAwp3hrKY0S9BJWKIcQ5PShhNG4+1bHx+IocT+RXcrRSDMfFNRvvt3Oyp/icIrRhUl9hoO4kt3F55Bxf3LkLV20jWOohbDjzXxyc/lMH0cRSyCd1xq+dFhu986t7T0CUwIzB8EkW3O5ibhj44ib7NJhiBKRoB/aS4ZWHjbxtjGQYP7nGRTjim1SaQqYiAVAREpHG8vzWJn+6PQ6CF0HPR7nQQczpYeEWHyWMUkwU8MSECGwgJxAWp9xWKNzkuH3oet+JDlIE9Momedh1G4CN0bfhVG9nsS0BQQthJx0V7j3elq7ihqV5ezQTwZmodP9ZGkU/bOPr4Nr53xtDYsaD7Dg4nNqFaH5OCYSSdGhf7daNmuv6wEKqXk/yExKGBHSznFsH6FFpKQ/JAA0ulUejWLt44lkHXsqDaX6C6Nl4Rnq8vK8s/KThDMlJhkI91YOO+iR3XwEelCdTCBLSgijNzd6DLNfhlHfZ6FtWiWBQpq/V2LdSrrNPljBQkoOjuCiPxAMutOIbkPqYSEqeequGZaTLzdhZhS0PlnlB9bvhtr5CuHj3y2Qj8hVQ/kEopxONEEsO/0yATDYXYAdWrE69JEElXq7Hyk0tro+xBU1yZmr4xrIcvptIRCZlJJAYBmRGRkD08aivA7VDvWPqt564Xn41w/AHB1/u7l1/uGxGU8mNcgodUNDIq0JDeLnpzc1uo1Qr76rWbqyf/142PjsXJqdkmN2YDnQ9oGkJNU+t57q7qUv4y9/t64+HYfwQYAN7OczrzUDvGAAAAAElFTkSuQmCC" ID="rdf:#$GvPhC3">@getting_started@</A>
 +        <DT><A HREF="https://www.parabola.nu/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre</A>
      </DL><p>
 -    <DT><H3 ID="rdf:#$ZvPhC3">@firefox_heading@</H3>
@@ -897,8 +897,8 @@ diff -Nur mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in
      </DL><p>
  </DL><p>
 diff -Nur mozilla-release.orig/browser/modules/AboutHome.jsm mozilla-release/browser/modules/AboutHome.jsm
---- mozilla-release.orig/browser/modules/AboutHome.jsm	2015-06-30 19:57:56.000000000 -0300
-+++ mozilla-release/browser/modules/AboutHome.jsm	2015-07-05 23:14:31.182948763 -0300
+--- mozilla-release.orig/browser/modules/AboutHome.jsm	2015-09-17 19:13:28.000000000 -0300
++++ mozilla-release/browser/modules/AboutHome.jsm	2015-09-25 00:53:28.918030343 -0300
 @@ -8,7 +8,7 @@
  let Ci = Components.interfaces;
  let Cu = Components.utils;
@@ -977,7 +977,7 @@ diff -Nur mozilla-release.orig/browser/modules/AboutHome.jsm mozilla-release/bro
  /**
   * This code provides services to the about:home page. Whenever
   * about:home needs to do something chrome-privileged, it sends a
-@@ -249,18 +187,9 @@
+@@ -264,18 +202,9 @@
      }).then(function(engineName) {
        let data = {
          showRestoreLastSession: ss.canRestoreLastSession,
diff --git a/libre/iceweasel/vendor.js b/libre/iceweasel/vendor.js
index 3b04e96b4..39f38088f 100644
--- a/libre/iceweasel/vendor.js
+++ b/libre/iceweasel/vendor.js
@@ -97,9 +97,9 @@ pref("app.update.url", "http://127.0.0.1/");"
 // Spoof the useragent to a generic one
 pref("general.useragent.compatMode.firefox", true);
 // Spoof the useragent to a generic one
-pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:40.0) Gecko/20100101 Firefox/40.0");
+pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:41.0) Gecko/20100101 Firefox/41.0");
 pref("general.appname.override", "Netscape");
-pref("general.appversion.override", "40.0");
+pref("general.appversion.override", "41.0");
 pref("general.buildID.override", "Gecko/20100101");
 pref("general.oscpu.override", "Windows NT 6.1");
 pref("general.platform.override", "Win32");