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

5 files changed, 12 insertions, 92 deletions

diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index 01493a283..03c01bf27 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -14,9 +14,9 @@
 
 _pgo=true
 
-# We're getting this from Debian Experimental
+# We're getting this from Debian Sid
 _debname=iceweasel
-_debver=43.0.4
+_debver=44.0
 _debrel=deb1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -31,18 +31,16 @@ 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 gtk3 hicolor-icon-theme hunspell icu=56.1 libevent libvpx=1.5.0 libxt mime-types mozilla-common nss sqlite startup-notification ttf-font)
-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)
+makedepends=(autoconf2.13 diffutils gconf 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)
   options+=(!ccache)
 fi
 optdepends=('networkmanager: Location detection via available WiFi networks'
-            'ffmpeg: H264/AAC decoding'
-            'gst-plugins-good: MP3 playback'
-            'gst-plugins-ugly: MP3 playback'
+            'ffmpeg: H264/AAC/MP3 decoding'
             'upower: Battery API')
-url="http://packages.debian.org/experimental/$pkgname"
+url="http://packages.debian.org/sid/$pkgname"
 install=$pkgname.install
 replaces=("$pkgname-libre" "$_pkgname")
 conflicts=("$pkgname-libre")
@@ -55,20 +53,16 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.xz"
         $pkgname.desktop
         $pkgname-install-dir.patch
         vendor.js
-        $pkgname-disable-GMP-PDM.patch
-        $pkgname-support-YUV420J-pixel-format.patch
         $pkgname-fixed-loading-icon.png)
-sha256sums=('10509acf085740bce9699d146851618c3abac600b701580ff0b697ca97e52b29'
-            '41cb6beb59711438c898348fa743810c56dbee232b8a1713826ecff7de95621f'
-            '351ff30a3709ea5c2336e8c5ea93d6fa24c1f34a136594ee5eae729590d18b2a'
+sha256sums=('377d040848862999407135a80c94d60640a6e3e2f28c5fb45b59ba487acd8762'
+            '9cd3bb5dadc1316c5e71baf3b50669aa1054440fc5619fb6f52bbd6c736b4f22'
+            'abc617c170b0c4d549d1995d018285e16e9a30adf5e9c116d8b4d0070758070f'
             'a28bd21522f0c7d93e9669f1fcc35309c9841d9b2332aa16b0b746ad18fc878c'
             '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd'
             '56eba484179c7f498076f8dc603d8795e99dce8c6ea1da9736318c59d666bff6'
             '2257dc69886bd0b72c48675a27c3a88b9cf6b598252c9e9f1c99763180684fc3'
             '3aea6676f1e53a09673b6ae219d281fc28054beb6002b09973611c02f827651d'
-            '815a764744eaf4efae30d61a2886cd0e2fb09146fc9e06b61e1fa3ad3c749690'
-            'fb1f631363c9b50c8246a0d8738c40570717b3e15b5457dacad9f447449d7e92'
-            '4a949e5b4281be4df0bece8087ecad0a3debb4828efc6a587bd3bd931ab70c94'
+            'e6e43c6b481891e33dbb95849865410a2a9e77165f7de2c2057d3a8bab990aec'
             '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213')
 
 prepare() {
@@ -85,12 +79,6 @@ prepare() {
   install -m644 "$srcdir/"{gnu_headshadow,drm-free}.png \
     browser/base/content/abouthome
 
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1233429
-  patch -Np1 -i "$srcdir/$pkgname-disable-GMP-PDM.patch"
-
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1233340
-  patch -Np1 -i "$srcdir/$pkgname-support-YUV420J-pixel-format.patch"
-
   # Install to /usr/lib/$pkgname
   patch -Np1 -i "$srcdir/$pkgname-install-dir.patch"
 
diff --git a/libre/iceweasel/iceweasel-disable-GMP-PDM.patch b/libre/iceweasel/iceweasel-disable-GMP-PDM.patch
deleted file mode 100644
index 25f7ed5d4..000000000
--- a/libre/iceweasel/iceweasel-disable-GMP-PDM.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-# HG changeset patch
-# User Jean-Yves Avenard <jyavenard@mozilla.com>
-
-Bug 1233429: Disable GMP PDM. r=cpearce
-
-Prevent users from shooting themselves in the foot by turning some prefs on.
-
-diff --git a/dom/media/platforms/PlatformDecoderModule.cpp b/dom/media/platforms/PlatformDecoderModule.cpp
-index 530c7b9..50933ca 100644
---- a/dom/media/platforms/PlatformDecoderModule.cpp
-+++ b/dom/media/platforms/PlatformDecoderModule.cpp
-@@ -150,20 +150,22 @@ PlatformDecoderModule::Create()
-   }
-   return CreateAgnosticDecoderModule();
- }
- 
- /* static */
- already_AddRefed<PlatformDecoderModule>
- PlatformDecoderModule::CreatePDM()
- {
-+#ifndef RELEASE_BUILD
-   if (sGMPDecoderEnabled) {
-     nsRefPtr<PlatformDecoderModule> m(new GMPDecoderModule());
-     return m.forget();
-   }
-+#endif
- #ifdef MOZ_WIDGET_ANDROID
-   if(sAndroidMCDecoderPreferred && sAndroidMCDecoderEnabled){
-     nsRefPtr<PlatformDecoderModule> m(new AndroidDecoderModule());
-     return m.forget();
-   }
- #endif
-   if (sUseBlankDecoder) {
-     return CreateBlankDecoderModule();
diff --git a/libre/iceweasel/iceweasel-support-YUV420J-pixel-format.patch b/libre/iceweasel/iceweasel-support-YUV420J-pixel-format.patch
deleted file mode 100644
index 178c5897d..000000000
--- a/libre/iceweasel/iceweasel-support-YUV420J-pixel-format.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-
-# HG changeset patch
-# User Jean-Yves Avenard <jyavenard@mozilla.com>
-# Date 1450657258 -39600
-# Node ID 8b0ced62c1957f6da6028af686c32ada1ccb570c
-# Parent  e1a98377eb38679bda820456ee6d20bdc17eaa8e
-Bug 1233340: [ffmpeg] Support YUV420J pixel format. r=kentuckyfriedtakahe
-
-YUV420J is 12bpp YUV420P.
-
-
-diff --git a/dom/media/platforms/ffmpeg/FFmpegDataDecoder.cpp b/dom/media/platforms/ffmpeg/FFmpegDataDecoder.cpp
---- a/dom/media/platforms/ffmpeg/FFmpegDataDecoder.cpp
-+++ b/dom/media/platforms/ffmpeg/FFmpegDataDecoder.cpp
-@@ -52,17 +52,17 @@ FFmpegDataDecoder<LIBAV_VER>::~FFmpegDat
-  * For now, we just look for YUV420P as it is the only non-HW accelerated format
-  * supported by FFmpeg's H264 decoder.
-  */
- static PixelFormat
- ChoosePixelFormat(AVCodecContext* aCodecContext, const PixelFormat* aFormats)
- {
-   FFMPEG_LOG("Choosing FFmpeg pixel format for video decoding.");
-   for (; *aFormats > -1; aFormats++) {
--    if (*aFormats == PIX_FMT_YUV420P) {
-+    if (*aFormats == PIX_FMT_YUV420P || *aFormats == PIX_FMT_YUVJ420P) {
-       FFMPEG_LOG("Requesting pixel format YUV420P.");
-       return PIX_FMT_YUV420P;
-     }
-   }
- 
-   NS_WARNING("FFmpeg does not share any supported pixel formats.");
-   return PIX_FMT_NONE;
- }
-
diff --git a/libre/iceweasel/mozconfig b/libre/iceweasel/mozconfig
index a2c62ecd0..84010cda2 100644
--- a/libre/iceweasel/mozconfig
+++ b/libre/iceweasel/mozconfig
@@ -32,7 +32,7 @@ ac_add_options --enable-system-pixman
 # Features
 ac_add_options --enable-startup-notification
 ac_add_options --enable-pulseaudio
-ac_add_options --enable-gstreamer=1.0
+ac_add_options --disable-gstreamer
 
 ac_add_options --disable-crashreporter
 ac_add_options --disable-updater
diff --git a/libre/iceweasel/vendor.js b/libre/iceweasel/vendor.js
index 134ff733e..40d035cac 100644
--- a/libre/iceweasel/vendor.js
+++ b/libre/iceweasel/vendor.js
@@ -70,9 +70,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:43.0) Gecko/20100101 Firefox/43.0");
+pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:44.0) Gecko/20100101 Firefox/44.0");
 pref("general.appname.override", "Netscape");
-pref("general.appversion.override", "43.0");
+pref("general.appversion.override", "44.0");
 pref("general.buildID.override", "Gecko/20100101");
 pref("general.oscpu.override", "Windows NT 6.1");
 pref("general.platform.override", "Win32");