diff options
author | Mark H Weaver <[email protected]> | 2015-07-15 15:28:36 -0400 |
---|---|---|
committer | Mark H Weaver <[email protected]> | 2015-07-15 15:43:23 -0400 |
commit | b76c4152530b81d7ecc1c958202a3f06d407587d (patch) | |
tree | 842d7c190d0b21b4f8ca0d5594151a2efbf18a8a /gnu/packages/patches/icecat-CVE-2015-2724-pt1.patch | |
parent | e03f6d5e956b348c142d0ffd9f89af845f05eb86 (diff) |
gnu: icecat: Update to 31.8.0-gnu1.
* gnu/packages/patches/icecat-enable-acceleration-and-webgl.patch: New file.
* gnu/packages/patches/icecat-CVE-2015-2722-pt1.patch,
gnu/packages/patches/icecat-CVE-2015-2722-pt2.patch,
gnu/packages/patches/icecat-CVE-2015-2724-pt1.patch,
gnu/packages/patches/icecat-CVE-2015-2724-pt2.patch,
gnu/packages/patches/icecat-CVE-2015-2724-pt3.patch,
gnu/packages/patches/icecat-CVE-2015-2724-pt4.patch,
gnu/packages/patches/icecat-CVE-2015-2728-pt1.patch,
gnu/packages/patches/icecat-CVE-2015-2728-pt2.patch,
gnu/packages/patches/icecat-CVE-2015-2733-pt1.patch,
gnu/packages/patches/icecat-CVE-2015-2733-pt2.patch,
gnu/packages/patches/icecat-CVE-2015-2735.patch,
gnu/packages/patches/icecat-CVE-2015-2736.patch,
gnu/packages/patches/icecat-CVE-2015-2738.patch,
gnu/packages/patches/icecat-CVE-2015-2739.patch,
gnu/packages/patches/icecat-CVE-2015-2740.patch,
gnu/packages/patches/icecat-CVE-2015-2743.patch: Remove files.
* gnu-system.am (dist_patch_DATA): Remove them, and add the new file.
* gnu/packages/gnuzilla.scm (icecat): Update to 31.8.0-gnu1. Remove the
outdated patches and add the new one.
Diffstat (limited to 'gnu/packages/patches/icecat-CVE-2015-2724-pt1.patch')
-rw-r--r-- | gnu/packages/patches/icecat-CVE-2015-2724-pt1.patch | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/gnu/packages/patches/icecat-CVE-2015-2724-pt1.patch b/gnu/packages/patches/icecat-CVE-2015-2724-pt1.patch deleted file mode 100644 index 0b91b1ec86..0000000000 --- a/gnu/packages/patches/icecat-CVE-2015-2724-pt1.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 6465a9f57b13fdf3d21016a41973f13d1e7f447c Mon Sep 17 00:00:00 2001 -From: Bobby Holley <[email protected]> -Date: Wed, 13 May 2015 11:08:30 -0700 -Subject: [PATCH] Bug 1164567 - Grab the principal when we need it in - MediaDecodeTask. r=jww, a=sledru - ---- - content/media/webaudio/MediaBufferDecoder.cpp | 17 ++++++++--------- - 1 file changed, 8 insertions(+), 9 deletions(-) - -diff --git a/content/media/webaudio/MediaBufferDecoder.cpp b/content/media/webaudio/MediaBufferDecoder.cpp -index b9409ad..ee6538c 100644 ---- a/content/media/webaudio/MediaBufferDecoder.cpp -+++ b/content/media/webaudio/MediaBufferDecoder.cpp -@@ -101,13 +101,6 @@ public: - { - MOZ_ASSERT(aBuffer); - MOZ_ASSERT(NS_IsMainThread()); -- -- nsCOMPtr<nsPIDOMWindow> pWindow = do_QueryInterface(mDecodeJob.mContext->GetParentObject()); -- nsCOMPtr<nsIScriptObjectPrincipal> scriptPrincipal = -- do_QueryInterface(pWindow); -- if (scriptPrincipal) { -- mPrincipal = scriptPrincipal->GetPrincipal(); -- } - } - - NS_IMETHOD Run(); -@@ -150,7 +143,6 @@ private: - WebAudioDecodeJob& mDecodeJob; - PhaseEnum mPhase; - nsCOMPtr<nsIThreadPool> mThreadPool; -- nsCOMPtr<nsIPrincipal> mPrincipal; - nsRefPtr<BufferDecoder> mBufferDecoder; - nsAutoPtr<MediaDecoderReader> mDecoderReader; - }; -@@ -179,9 +171,16 @@ MediaDecodeTask::CreateReader() - { - MOZ_ASSERT(NS_IsMainThread()); - -+ -+ nsCOMPtr<nsIPrincipal> principal; -+ nsCOMPtr<nsIScriptObjectPrincipal> sop = do_QueryInterface(mDecodeJob.mContext->GetParentObject()); -+ if (sop) { -+ principal = sop->GetPrincipal(); -+ } -+ - nsRefPtr<BufferMediaResource> resource = - new BufferMediaResource(static_cast<uint8_t*> (mBuffer), -- mLength, mPrincipal, mContentType); -+ mLength, principal, mContentType); - - MOZ_ASSERT(!mBufferDecoder); - mBufferDecoder = new BufferDecoder(resource); --- -2.4.3 - |