Update to 43.0.4.deb1 rev. 2

6 files changed, 100 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 825170bef659..0c7d00e8abfe 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Fri Jan  8 13:03:06 UTC 2016
+# Sun Jan 17 18:02:58 UTC 2016
 pkgbase = iceweasel
 	pkgdesc = Debian Browser based on Mozilla Firefox
 	pkgver = 43.0.4.deb1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://packages.debian.org/source/sid/iceweasel
 	install = iceweasel.install
 	arch = i686
@@ -61,14 +61,18 @@ pkgbase = iceweasel
 	source = iceweasel.desktop
 	source = iceweasel-install-dir.patch
 	source = vendor.js
-	source = iceweasel-20.0.1-fixed-loading-icon.png
+	source = iceweasel-fixed-loading-icon.png
+	source = iceweasel-disable-GMP-PDM.patch
+	source = iceweasel-support-YUV420J-pixel-format.patch
 	md5sums = 8e39af63adc496dc3c6f1acd0f69fa0f
 	md5sums = 7c098a67f9f20d763381c28afb626cea
 	md5sums = 329ae0844819b6baac61d9a5749a6005
 	md5sums = 7b9e5996dd9fe0b186a43a297db1c6b5
 	md5sums = 1c42509891cf6843660a5f3c69896e80
-	md5sums = ced8f3b950fb819e784415e61ec91bb1
+	md5sums = 35adf69c840aadeb138d1b0be3af63b5
 	md5sums = 6e335a517c68488941340ee1c23f97b0
+	md5sums = 211de20ce4eb4944415f7cd0ccb01abe
+	md5sums = 54e636a3a191dc652decc30ffa0c96e6
 
 pkgname = iceweasel
 
diff --git a/PKGBUILD b/PKGBUILD
index abab26787bed..f47cef23eba9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -29,7 +29,7 @@ _debrepo=http://ftp.debian.org/debian/pool/main/i/
 
 pkgname=iceweasel
 pkgver=$_debver.deb$_debrel
-pkgrel=1
+pkgrel=2
 pkgdesc="Debian Browser based on Mozilla Firefox"
 arch=('i686' 'x86_64')
 license=('GPL' 'MPL' 'LGPL')
@@ -57,14 +57,18 @@ source=("${_debrepo}/${_debname}/${_debname}_${_debver}.orig.tar.xz"
         'iceweasel.desktop'
         'iceweasel-install-dir.patch'
         'vendor.js'
-		'iceweasel-20.0.1-fixed-loading-icon.png')
+		'iceweasel-fixed-loading-icon.png'
+		'iceweasel-disable-GMP-PDM.patch'
+		'iceweasel-support-YUV420J-pixel-format.patch')
 md5sums=('8e39af63adc496dc3c6f1acd0f69fa0f'
          '7c098a67f9f20d763381c28afb626cea'
          '329ae0844819b6baac61d9a5749a6005'
          '7b9e5996dd9fe0b186a43a297db1c6b5'
          '1c42509891cf6843660a5f3c69896e80'
-         'ced8f3b950fb819e784415e61ec91bb1'
-         '6e335a517c68488941340ee1c23f97b0')
+         '35adf69c840aadeb138d1b0be3af63b5'
+         '6e335a517c68488941340ee1c23f97b0'
+         '211de20ce4eb4944415f7cd0ccb01abe'
+         '54e636a3a191dc652decc30ffa0c96e6')
 
 prepare() {
   export DEBIAN_BUILD="firefox-$_debver"
@@ -78,9 +82,12 @@ prepare() {
   
   # We wont save user profile in .mozilla/iceweasel
   sed -i 's/MOZ_APP_PROFILE=mozilla\/firefox/MOZ_APP_PROFILE=mozilla\/iceweasel/g' "debian/branding/configure.sh"
-  
-  # Doesn't apply and seems unimportant, but it seems it isn't included anymore
-  # rm -v debian/patches/l10n/Place-google-and-gmail-before-yandex.patch || true
+
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1233429
+  patch -Np1 -i "$srcdir/iceweasel-disable-GMP-PDM.patch"
+
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1233340
+  patch -Np1 -i "$srcdir/iceweasel-support-YUV420J-pixel-format.patch"
 
   quilt push -av
 
@@ -105,8 +112,7 @@ prepare() {
 
   # Fix tab loading icon (flickers with libpng 1.6)
   # https://bugzilla.mozilla.org/show_bug.cgi?id=841734
-  cp "$srcdir/iceweasel-20.0.1-fixed-loading-icon.png" \
-    browser/themes/linux/tabbrowser/loading.png
+  cp "$srcdir/iceweasel-fixed-loading-icon.png" browser/themes/linux/tabbrowser/loading.png
 
 }
 
@@ -137,14 +143,17 @@ package() {
   _brandingdir=debian/branding
   brandingdir=moz-objdir/$_brandingdir
   icondir="$pkgdir/usr/share/icons/hicolor"
-  for i in 16x16 32x32 48x48 64x64; do
-    install -Dm644 "$brandingdir/default${i/x*/}.png" "$icondir/$i/apps/$pkgname.png"
+  for i in 16 22 24 32 48 64 128 192 256 384; do
+    convert -background none "$_brandingdir/${pkgname}_icon.svg" \
+      -resize ${i}x${i}^ -gravity center -extent ${i}x${i} \
+      "$brandingdir/default$i.png"
+    install -Dm644 "$brandingdir/default$i.png" "$icondir/${i}x${i}/apps/$pkgname.png"
   done
-  install -Dm644 "$brandingdir/mozicon128.png"      "$icondir/128x128/apps/$pkgname.png"
-  install -Dm644 "$_brandingdir/iceweasel_icon.svg" "$icondir/scalable/apps/$pkgname.svg"
 
-  install -d                                        "$pkgdir/usr/share/applications"
-  install -m644  "$srcdir/iceweasel.desktop"        "$pkgdir/usr/share/applications"
+  install -Dm644 "$_brandingdir/${pkgname}_icon.svg" "$icondir/scalable/apps/$pkgname.svg"
+ 
+  install -d "$pkgdir/usr/share/applications"
+  install -m644  "$srcdir/$pkgname.desktop" "$pkgdir/usr/share/applications"
   
   
   # Use system-provided dictionaries
@@ -159,12 +168,11 @@ package() {
   # Workaround for now: https://bugzilla.mozilla.org/show_bug.cgi?id=658850
   ln -sf $pkgname "$pkgdir/usr/lib/$pkgname/$pkgname-bin"
 
-  
+
   # Remove $srcdir refers
   sed -i '1d' "$pkgdir/usr/lib/$pkgname/defaults/pref/channel-prefs.js"
   
-  
-  
+    
   # Searchplugins section
   
   # According to debian choices, we prefer to use /etc/icewasel/searchplugins
diff --git a/iceweasel-disable-GMP-PDM.patch b/iceweasel-disable-GMP-PDM.patch
new file mode 100644
index 000000000000..25f7ed5d4f7a
--- /dev/null
+++ b/iceweasel-disable-GMP-PDM.patch
@@ -0,0 +1,34 @@
+# 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/iceweasel-20.0.1-fixed-loading-icon.png b/iceweasel-fixed-loading-icon.png
index 55f25e591ff5..55f25e591ff5 100644
--- a/iceweasel-20.0.1-fixed-loading-icon.png
+++ b/iceweasel-fixed-loading-icon.png
diff --git a/iceweasel-support-YUV420J-pixel-format.patch b/iceweasel-support-YUV420J-pixel-format.patch
new file mode 100644
index 000000000000..2d32fbb2be2a
--- /dev/null
+++ b/iceweasel-support-YUV420J-pixel-format.patch
@@ -0,0 +1,32 @@
+# 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/vendor.js b/vendor.js
index 2ec426b0fe06..71b96aeba9ab 100644
--- a/vendor.js
+++ b/vendor.js
@@ -1,7 +1,3 @@
-// You can make any change in here, it is the purpose of this file.
-
-pref("extensions.update.enabled", true);
-
 // Use LANG environment variable to choose locale
 pref("intl.locale.matchOS", true);