From b76c4152530b81d7ecc1c958202a3f06d407587d Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Wed, 15 Jul 2015 15:28:36 -0400
Subject: 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.
---
 .../patches/icecat-CVE-2015-2722-pt2.patch         | 73 ----------------------
 1 file changed, 73 deletions(-)
 delete mode 100644 gnu/packages/patches/icecat-CVE-2015-2722-pt2.patch

(limited to 'gnu/packages/patches/icecat-CVE-2015-2722-pt2.patch')

diff --git a/gnu/packages/patches/icecat-CVE-2015-2722-pt2.patch b/gnu/packages/patches/icecat-CVE-2015-2722-pt2.patch
deleted file mode 100644
index c82d0f7e6f..0000000000
--- a/gnu/packages/patches/icecat-CVE-2015-2722-pt2.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 6eb772aa6a0c1b21aafcfa606cc3bf07659b53b9 Mon Sep 17 00:00:00 2001
-From: Wes Kocher <wkocher@mozilla.com>
-Date: Wed, 27 May 2015 14:33:22 -0700
-Subject: [PATCH] Bug 1166924 part 1 r=baku a=lizzard
-
---HG--
-extra : source : 528d47773256bfee72e7adedc78b89c9fa573b7b
----
- dom/workers/XMLHttpRequest.cpp | 20 ++++++++++++--------
- 1 file changed, 12 insertions(+), 8 deletions(-)
-
-diff --git a/dom/workers/XMLHttpRequest.cpp b/dom/workers/XMLHttpRequest.cpp
-index 8e4200a..bf0cd3f 100644
---- a/dom/workers/XMLHttpRequest.cpp
-+++ b/dom/workers/XMLHttpRequest.cpp
-@@ -140,7 +140,7 @@ public:
-   Init();
- 
-   void
--  Teardown();
-+  Teardown(bool aSendUnpin);
- 
-   bool
-   AddRemoveEventListeners(bool aUpload, bool aAdd);
-@@ -308,7 +308,9 @@ private:
-   {
-     AssertIsOnMainThread();
- 
--    mProxy->Teardown();
-+    // This means the XHR was GC'd, so we can't be pinned, and we don't need to
-+    // try to unpin.
-+    mProxy->Teardown(/* aSendUnpin */ false);
-     mProxy = nullptr;
- 
-     return NS_OK;
-@@ -563,7 +565,7 @@ private:
-   virtual nsresult
-   MainThreadRun() MOZ_OVERRIDE
-   {
--    mProxy->Teardown();
-+    mProxy->Teardown(/* aSendUnpin */ true);
-     MOZ_ASSERT(!mProxy->mSyncLoopTarget);
-     return NS_OK;
-   }
-@@ -935,7 +937,7 @@ Proxy::Init()
- }
- 
- void
--Proxy::Teardown()
-+Proxy::Teardown(bool aSendUnpin)
- {
-   AssertIsOnMainThread();
- 
-@@ -948,10 +950,12 @@ Proxy::Teardown()
-     mXHR->Abort();
- 
-     if (mOutstandingSendCount) {
--      nsRefPtr<XHRUnpinRunnable> runnable =
--        new XHRUnpinRunnable(mWorkerPrivate, mXMLHttpRequestPrivate);
--      if (!runnable->Dispatch(nullptr)) {
--        NS_RUNTIMEABORT("We're going to hang at shutdown anyways.");
-+      if (aSendUnpin) {
-+        nsRefPtr<XHRUnpinRunnable> runnable =
-+          new XHRUnpinRunnable(mWorkerPrivate, mXMLHttpRequestPrivate);
-+        if (!runnable->Dispatch(nullptr)) {
-+          NS_RUNTIMEABORT("We're going to hang at shutdown anyways.");
-+        }
-       }
- 
-       if (mSyncLoopTarget) {
--- 
-2.4.3
-
-- 
cgit v1.2.3