| 1 |
gienah 12/11/25 05:42:32 |
| 2 |
|
| 3 |
Added: gtk2hs-buildtools-0.12.3.1-ghc-7.5.patch |
| 4 |
gtk2hs-buildtools-0.12.3.1-remove-conditional-compilation-as-it-is-ignored-ghc-7.6.patch |
| 5 |
Log: |
| 6 |
Patch gtk2hs-buildtools-0.12.3.1 for ghc 7.6.1 |
| 7 |
|
| 8 |
(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 618E971F) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.12.3.1-ghc-7.5.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.12.3.1-ghc-7.5.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.12.3.1-ghc-7.5.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: gtk2hs-buildtools-0.12.3.1-ghc-7.5.patch |
| 17 |
=================================================================== |
| 18 |
--- gtk2hs-buildtools-0.12.3.1-orig/c2hs/base/general/FileOps.hs 2012-05-28 08:17:27.000000000 +1000 |
| 19 |
+++ gtk2hs-buildtools-0.12.3.1/c2hs/base/general/FileOps.hs 2012-07-14 14:17:58.121511985 +1000 |
| 20 |
@@ -36,6 +36,7 @@ |
| 21 |
import System.Directory (doesFileExist) |
| 22 |
import System.IO (Handle, IOMode(..), openFile) |
| 23 |
import Control.Monad (liftM) |
| 24 |
+import qualified Control.Exception |
| 25 |
import System.Random (newStdGen, randomRs) |
| 26 |
|
| 27 |
import FNameOps (dirname, stripDirname, addPath) |
| 28 |
@@ -89,7 +90,9 @@ |
| 29 |
in do |
| 30 |
h <- openFile fname ReadWriteMode |
| 31 |
return (h, fname) |
| 32 |
- `catch` \_ -> createLoop (attempts - 1) rs' |
| 33 |
+ `Control.Exception.catch` ((\_ -> createLoop (attempts - 1) rs') :: |
| 34 |
+ Control.Exception.SomeException -> |
| 35 |
+ IO (Handle, FilePath)) |
| 36 |
-- |
| 37 |
sixChars :: [Int] -> ([Int], String) |
| 38 |
sixChars is = |
| 39 |
--- gtk2hs-buildtools-0.12.3.1-orig/c2hs/base/state/StateTrans.hs 2012-05-28 08:17:27.000000000 +1000 |
| 40 |
+++ gtk2hs-buildtools-0.12.3.1/c2hs/base/state/StateTrans.hs 2012-07-14 14:14:12.365626559 +1000 |
| 41 |
@@ -80,6 +80,7 @@ |
| 42 |
where |
| 43 |
|
| 44 |
import Control.Monad (liftM) |
| 45 |
+import qualified Control.Exception |
| 46 |
import System.IO (fixIO) |
| 47 |
import Data.IORef (IORef, newIORef, readIORef, writeIORef) |
| 48 |
|
| 49 |
@@ -337,7 +338,7 @@ |
| 50 |
ioError err |
| 51 |
Right a -> return state |
| 52 |
) |
| 53 |
- `catch` (\err -> let |
| 54 |
+ `Control.Exception.catch` (\err -> let |
| 55 |
STB handler' = handler err |
| 56 |
in |
| 57 |
handler' bs gs) |
| 58 |
--- gtk2hs-buildtools-0.12.3.1-orig/c2hs/toplevel/C2HSConfig.hs 2012-05-28 08:17:27.000000000 +1000 |
| 59 |
+++ gtk2hs-buildtools-0.12.3.1/c2hs/toplevel/C2HSConfig.hs 2012-07-14 14:12:10.172439583 +1000 |
| 60 |
@@ -46,7 +46,7 @@ |
| 61 |
|
| 62 |
import Foreign (Ptr, FunPtr) |
| 63 |
import Foreign (Storable(sizeOf, alignment), toBool) |
| 64 |
-import Foreign.C (CInt) |
| 65 |
+import Foreign.C (CInt(..)) |
| 66 |
import System.Info (os) |
| 67 |
|
| 68 |
-- program settings |
| 69 |
|
| 70 |
|
| 71 |
|
| 72 |
1.1 dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.12.3.1-remove-conditional-compilation-as-it-is-ignored-ghc-7.6.patch |
| 73 |
|
| 74 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.12.3.1-remove-conditional-compilation-as-it-is-ignored-ghc-7.6.patch?rev=1.1&view=markup |
| 75 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.12.3.1-remove-conditional-compilation-as-it-is-ignored-ghc-7.6.patch?rev=1.1&content-type=text/plain |
| 76 |
|
| 77 |
Index: gtk2hs-buildtools-0.12.3.1-remove-conditional-compilation-as-it-is-ignored-ghc-7.6.patch |
| 78 |
=================================================================== |
| 79 |
--- gtk2hs-buildtools-0.12.3.1-orig/hierarchyGen/Hierarchy.chs.template 2012-05-28 08:17:27.000000000 +1000 |
| 80 |
+++ gtk2hs-buildtools-0.12.3.1/hierarchyGen/Hierarchy.chs.template 2012-10-11 12:28:58.851901084 +1100 |
| 81 |
@@ -38,11 +38,7 @@ |
| 82 |
) where |
| 83 |
|
| 84 |
import Foreign.ForeignPtr (ForeignPtr, castForeignPtr, unsafeForeignPtrToPtr) |
| 85 |
-#if __GLASGOW_HASKELL__>=704 |
| 86 |
import Foreign.C.Types (CULong(..), CUInt(..)) |
| 87 |
-#else |
| 88 |
-import Foreign.C.Types (CULong, CUInt) |
| 89 |
-#endif |
| 90 |
import System.Glib.GType (GType, typeInstanceIsA) |
| 91 |
@MODULE_IMPORTS@ |
| 92 |
{# context lib="@CONTEXT_LIB@" prefix="@CONTEXT_PREFIX@" #} |
Archives