| 1 |
gienah 12/12/27 02:58:09 |
| 2 |
|
| 3 |
Added: wxcore-0.90.0.1-ghc-7.5.patch |
| 4 |
wxcore-0.13.2.1-ghc-7.6.patch |
| 5 |
Log: |
| 6 |
Bump wxcore to 0.13.2.1 and 0.90.0.3 |
| 7 |
|
| 8 |
(Portage version: 2.1.11.38/cvs/Linux x86_64, signed Manifest commit with key 618E971F) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 dev-haskell/wxcore/files/wxcore-0.90.0.1-ghc-7.5.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/wxcore/files/wxcore-0.90.0.1-ghc-7.5.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/wxcore/files/wxcore-0.90.0.1-ghc-7.5.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: wxcore-0.90.0.1-ghc-7.5.patch |
| 17 |
=================================================================== |
| 18 |
--- wxcore-0.90.0.1-orig/wxcore.cabal 2012-05-15 06:26:55.000000000 +1000 |
| 19 |
+++ wxcore-0.90.0.1/wxcore.cabal 2012-05-19 21:32:01.230849131 +1000 |
| 20 |
@@ -80,7 +80,7 @@ |
| 21 |
build-depends: |
| 22 |
array >= 0.2 && < 0.5, |
| 23 |
base >= 4 && < 5, |
| 24 |
- containers >= 0.2 && < 0.5 |
| 25 |
+ containers >= 0.2 && < 0.6 |
| 26 |
else |
| 27 |
build-depends: |
| 28 |
array >= 0.1 && < 0.3, |
| 29 |
--- wxcore-0.90.0.1-orig/src/haskell/Graphics/UI/WXCore/Events.hs 2012-05-15 06:26:55.000000000 +1000 |
| 30 |
+++ wxcore-0.90.0.1/src/haskell/Graphics/UI/WXCore/Events.hs 2012-05-19 21:44:09.457185166 +1000 |
| 31 |
@@ -1,4 +1,4 @@ |
| 32 |
-{-# LANGUAGE ForeignFunctionInterface #-} |
| 33 |
+{-# LANGUAGE CPP, ForeignFunctionInterface #-} |
| 34 |
----------------------------------------------------------------------------------------- |
| 35 |
{-| Module : Events |
| 36 |
Copyright : (c) Daan Leijen 2003 |
| 37 |
@@ -245,6 +245,9 @@ |
| 38 |
import Foreign.Marshal.Alloc |
| 39 |
import Foreign.Marshal.Array |
| 40 |
import Foreign.Marshal.Utils |
| 41 |
+#if (__GLASGOW_HASKELL__>=705) |
| 42 |
+import Foreign.C.Types(CInt(..)) |
| 43 |
+#endif |
| 44 |
|
| 45 |
import Data.Char ( chr ) -- used in stc |
| 46 |
import Data.Maybe ( fromMaybe, fromJust ) |
| 47 |
|
| 48 |
|
| 49 |
|
| 50 |
1.1 dev-haskell/wxcore/files/wxcore-0.13.2.1-ghc-7.6.patch |
| 51 |
|
| 52 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/wxcore/files/wxcore-0.13.2.1-ghc-7.6.patch?rev=1.1&view=markup |
| 53 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/wxcore/files/wxcore-0.13.2.1-ghc-7.6.patch?rev=1.1&content-type=text/plain |
| 54 |
|
| 55 |
Index: wxcore-0.13.2.1-ghc-7.6.patch |
| 56 |
=================================================================== |
| 57 |
--- wxcore-0.13.2.1-orig/wxcore.cabal 2012-02-07 18:27:09.000000000 +1100 |
| 58 |
+++ wxcore-0.13.2.1/wxcore.cabal 2012-11-29 17:21:49.458155692 +1100 |
| 59 |
@@ -209,7 +209,7 @@ |
| 60 |
build-depends: |
| 61 |
array >= 0.2 && < 0.5, |
| 62 |
base >= 4 && < 5, |
| 63 |
- containers >= 0.2 && < 0.5 |
| 64 |
+ containers >= 0.2 && < 0.6 |
| 65 |
else |
| 66 |
build-depends: |
| 67 |
array >= 0.1 && < 0.3, |
| 68 |
--- wxcore-0.13.2.1-orig/src/haskell/Graphics/UI/WXCore/Events.hs 2012-02-07 18:27:09.000000000 +1100 |
| 69 |
+++ wxcore-0.13.2.1/src/haskell/Graphics/UI/WXCore/Events.hs 2012-11-29 17:21:49.458155692 +1100 |
| 70 |
@@ -1,4 +1,4 @@ |
| 71 |
-{-# LANGUAGE ForeignFunctionInterface #-} |
| 72 |
+{-# LANGUAGE CPP, ForeignFunctionInterface #-} |
| 73 |
----------------------------------------------------------------------------------------- |
| 74 |
{-| Module : Events |
| 75 |
Copyright : (c) Daan Leijen 2003 |
| 76 |
@@ -240,6 +240,9 @@ |
| 77 |
import Foreign.Marshal.Alloc |
| 78 |
import Foreign.Marshal.Array |
| 79 |
import Foreign.Marshal.Utils |
| 80 |
+#if (__GLASGOW_HASKELL__>=705) |
| 81 |
+import Foreign.C.Types(CInt(..)) |
| 82 |
+#endif |
| 83 |
|
| 84 |
import Data.Char ( chr ) -- used in stc |
| 85 |
import Data.Maybe ( fromMaybe, fromJust ) |
| 86 |
--- wxcore-0.13.2.1-orig/src/haskell/Graphics/UI/WXCore/WxcTypes.hs 2012-02-07 18:27:09.000000000 +1100 |
| 87 |
+++ wxcore-0.13.2.1/src/haskell/Graphics/UI/WXCore/WxcTypes.hs 2012-11-29 17:42:22.477244493 +1100 |
| 88 |
@@ -142,7 +142,12 @@ |
| 89 |
|
| 90 |
import Data.Int |
| 91 |
import Data.Word |
| 92 |
+#ifdef MIN_VERSION_base(4,5,0) |
| 93 |
+import Debug.Trace (traceIO) |
| 94 |
+#else |
| 95 |
import Debug.Trace (putTraceMsg) |
| 96 |
+#define traceIO putTraceMsg |
| 97 |
+#endif |
| 98 |
|
| 99 |
import Graphics.UI.WXCore.WxcObject |
| 100 |
import Graphics.UI.WXCore.WxcClassTypes |
| 101 |
@@ -853,7 +858,7 @@ |
| 102 |
withCharResult io |
| 103 |
= do x <- io |
| 104 |
if (x < 0) |
| 105 |
- then do putTraceMsg ("Recieved negative unicode: " ++ (show x)) |
| 106 |
+ then do traceIO ("Recieved negative unicode: " ++ (show x)) |
| 107 |
return '\n' |
| 108 |
else return (fromCWchar x) |
Archives