Fix build with gcc 4.9

https://bugzilla.mozilla.org/show_bug.cgi?id=999496

2 files changed, 46 insertions, 0 deletions

diff --git a/mail/thunderbird/patches/patch-mozilla_content_media_MediaData.cpp b/mail/thunderbird/patches/patch-mozilla_content_media_MediaData.cpp
new file mode 100644
index 00000000000..420532c9d5f
--- /dev/null
+++ b/mail/thunderbird/patches/patch-mozilla_content_media_MediaData.cpp
@@ -0,0 +1,24 @@
+$NetBSD: patch-mozilla_content_media_MediaData.cpp,v 1.1 2014/11/30 10:25:50 markd Exp $
+
+Fix build with gcc 4.9
+https://bugzilla.mozilla.org/show_bug.cgi?id=999496
+
+--- mozilla/content/media/MediaData.cpp.orig	2014-07-18 00:05:12.000000000 +0000
++++ mozilla/content/media/MediaData.cpp
+@@ -38,6 +38,16 @@ AudioData::EnsureAudioBuffer()
+   }
+ }
+ 
++size_t
++AudioData::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const
++{
++  size_t size = aMallocSizeOf(this) + aMallocSizeOf(mAudioData);
++  if (mAudioBuffer) {
++    size += mAudioBuffer->SizeOfIncludingThis(aMallocSizeOf);
++  }
++  return size;
++}
++
+ static bool
+ ValidatePlane(const VideoData::YCbCrBuffer::Plane& aPlane)
+ {
diff --git a/mail/thunderbird/patches/patch-mozilla_content_media_MediaData.h b/mail/thunderbird/patches/patch-mozilla_content_media_MediaData.h
new file mode 100644
index 00000000000..5c8575b0d10
--- /dev/null
+++ b/mail/thunderbird/patches/patch-mozilla_content_media_MediaData.h
@@ -0,0 +1,22 @@
+$NetBSD: patch-mozilla_content_media_MediaData.h,v 1.1 2014/11/30 10:25:50 markd Exp $
+
+Fix build with gcc 4.9 
+https://bugzilla.mozilla.org/show_bug.cgi?id=999496 
+
+--- mozilla/content/media/MediaData.h.orig	2014-07-18 00:05:12.000000000 +0000
++++ mozilla/content/media/MediaData.h
+@@ -80,13 +80,7 @@ public:
+     MOZ_COUNT_DTOR(AudioData);
+   }
+ 
+-  size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const {
+-    size_t size = aMallocSizeOf(this) + aMallocSizeOf(mAudioData);
+-    if (mAudioBuffer) {
+-      size += mAudioBuffer->SizeOfIncludingThis(aMallocSizeOf);
+-    }
+-    return size;
+-  }
++  size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const;
+ 
+   // If mAudioBuffer is null, creates it from mAudioData.
+   void EnsureAudioBuffer();