Fixes for GHC 8.0.1

1 files changed, 45 insertions, 6 deletions

diff --git a/threepenny.patch b/threepenny.patch
index 1feb733..5dbb84f 100644
--- a/threepenny.patch
+++ b/threepenny.patch
@@ -1,7 +1,46 @@
-From 480675cba32803ab74ec064e14ed6b2001c8e071 Mon Sep 17 00:00:00 2001
+From 86574dffb26128252159a6f25a3ea29be965047f Mon Sep 17 00:00:00 2001
+From: Heinrich Apfelmus <apfelmus@quantentunnel.de>
+Date: Fri, 27 May 2016 22:47:04 +0200
+Subject: [PATCH 1/3] Fix #138: Update the use of `GHC.mkWeak#` to GHC 8.0.1
+
+---
+ src/Foreign/RemotePtr.hs | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/src/Foreign/RemotePtr.hs b/src/Foreign/RemotePtr.hs
+index b534b74..fce37bc 100644
+--- a/src/Foreign/RemotePtr.hs
++++ b/src/Foreign/RemotePtr.hs
+@@ -33,14 +33,18 @@ import qualified GHC.IORef as GHC
+ import qualified GHC.STRef as GHC
+ 
+ mkWeakIORefValue :: IORef a -> value -> IO () -> IO (Weak value)
+-mkWeakIORefValue r@(GHC.IORef (GHC.STRef r#)) v f = GHC.IO $ \s ->
+-  case GHC.mkWeak# r# v f s of (# s1, w #) -> (# s1, GHC.Weak w #)
+-
+ #if CABAL
+ #if MIN_VERSION_base(4,6,0)
+ #else
+ atomicModifyIORef' = atomicModifyIORef
+ #endif
++#if MIN_VERSION_base(4,9,0)
++mkWeakIORefValue r@(GHC.IORef (GHC.STRef r#)) v (GHC.IO f) = GHC.IO $ \s ->
++  case GHC.mkWeak# r# v f s of (# s1, w #) -> (# s1, GHC.Weak w #)
++#endif
++#else
++mkWeakIORefValue r@(GHC.IORef (GHC.STRef r#)) v f = GHC.IO $ \s ->
++  case GHC.mkWeak# r# v f s of (# s1, w #) -> (# s1, GHC.Weak w #)
+ #endif
+ 
+ type Map = Map.Map
+-- 
+2.9.0
+
+
+From 0ed2c2ebb64b24fdcded4e273bfda1583763a815 Mon Sep 17 00:00:00 2001
 From: Gregor Kleen <gkleen@yggdrasil.li>
 Date: Tue, 23 Feb 2016 18:14:48 +0000
-Subject: [PATCH 1/2] Switched to using location.host
+Subject: [PATCH 2/3] Switched to using location.host
 
 ---
  js/comm.js | 2 +-
@@ -21,13 +60,13 @@ index 2d24f08..01763ba 100644
    
    // Close WebSocket when the browser window is closed.
 -- 
-2.7.0
+2.9.0
 
 
-From 52f45089ccf786c13d185faf1ad7436a63c13002 Mon Sep 17 00:00:00 2001
+From 4fb9b3304467a48d8ebeec85803464ec1a2aeeb6 Mon Sep 17 00:00:00 2001
 From: Gregor Kleen <gkleen@yggdrasil.li>
 Date: Tue, 1 Mar 2016 00:22:01 +0100
-Subject: [PATCH 2/2] Now manipulating the location object
+Subject: [PATCH 3/3] Now manipulating the location object
 
 ---
  js/comm.js                          |  3 +-
@@ -148,5 +187,5 @@ index 0d2a564..ceec6f4 100644
      , [include|js/comm.js|]
      , [include|js/ffi.js|]
 -- 
-2.7.0
+2.9.0