[Pkg-haskell-commits] darcs: haskell-ltk: Add patch (changes already upstream) to fix compilation with GHC 7.6

[laney at debian.org]

Thu Apr 11 21:39:43 UTC 2013  laney at debian.org
  * Add patch (changes already upstream) to fix compilation with GHC 7.6
  Ignore-this: 480995e7ff7188d86f8797723b32c55a

    M ./changelog +4
    A ./patches/
    A ./patches/ghc-7.6-compatibility.patch
    A ./patches/series

Thu Apr 11 21:39:43 UTC 2013  laney at debian.org
  * Add patch (changes already upstream) to fix compilation with GHC 7.6
  Ignore-this: 480995e7ff7188d86f8797723b32c55a
diff -rN -u old-haskell-ltk//changelog new-haskell-ltk//changelog
--- old-haskell-ltk//changelog	2013-04-13 22:18:32.347181784 +0000
+++ new-haskell-ltk//changelog	2013-04-13 22:18:32.367021757 +0000
@@ -1,10 +1,14 @@
 haskell-ltk (0.12.1.0-1) UNRELEASED; urgency=low
 
+  [ Joachim Breitner ]
   * Depend on haskell-devscripts 0.8.13 to ensure this packages is built
     against experimental
   * Bump standards version, no change
   * New upstream release
 
+  [ Iain Lane ]
+  * Add patch (changes already upstream) to fix compilation with GHC 7.6
+
  -- Joachim Breitner <nomeata at debian.org>  Mon, 26 Nov 2012 11:23:13 +0100
 
 haskell-ltk (0.12.0.0-2) unstable; urgency=low
diff -rN -u old-haskell-ltk//patches/ghc-7.6-compatibility.patch new-haskell-ltk//patches/ghc-7.6-compatibility.patch
--- old-haskell-ltk//patches/ghc-7.6-compatibility.patch	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-ltk//patches/ghc-7.6-compatibility.patch	2013-04-13 22:18:32.363021713 +0000
@@ -0,0 +1,67 @@
+Description: Compile with the versions of some modules in GHC 7.6
+Forwarded: yes
+Author: Iain Lane <laney at debian.org>
+
+Index: b/ltk.cabal
+===================================================================
+--- a/ltk.cabal
++++ b/ltk.cabal
+@@ -16,8 +16,8 @@
+ tested-with: GHC ==6.10 || ==6.12 || ==7.0
+ 
+ Library
+-    build-depends: Cabal >=1.6.0 && <1.15, base >=4.0.0.0 && <4.6,
+-               containers >=0.2 && <0.5, filepath >=1.1.0 && <1.4,
++    build-depends: Cabal >=1.6.0 && <1.17, base >=4.0.0.0 && <4.7,
++               containers >=0.2 && <0.6, filepath >=1.1.0 && <1.4,
+                glib >=0.10.0 && <0.13, gtk >=0.10.0 && <0.13,
+                mtl >=1.1.0.2 && <2.2, parsec >=2.1.0.1 && <3.2,
+                pretty >=1.0.1.0 && <1.2, transformers >=0.2.2.0 && <0.4,
+Index: b/src/Text/PrinterParser.hs
+===================================================================
+--- a/src/Text/PrinterParser.hs
++++ b/src/Text/PrinterParser.hs
+@@ -1,4 +1,4 @@
+-{-# OPTIONS_GHC -XTypeSynonymInstances -XFlexibleInstances #-}
++{-# OPTIONS_GHC -XTypeSynonymInstances -XFlexibleInstances -XScopedTypeVariables #-}
+ --
+ -- | Module for saving and restoring preferences and settings
+ --
+@@ -49,6 +49,7 @@
+ import Data.List (foldl')
+ import qualified Text.ParserCombinators.Parsec as  P
+     ((<?>), CharParser(..), parseFromFile)
++import Control.Exception (catch, IOException)
+ 
+ 
+ type Printer beta       =   beta -> PP.Doc
+@@ -232,7 +233,7 @@
+     case res of
+                 Left pe -> error $ "Error reading file " ++ show fn ++ " " ++ show pe
+                 Right r -> return r)
+-    (\ e -> error $ "Error reading file " ++ show fn ++ " " ++ show e)
++    (\ (e :: IOException) -> error $ "Error reading file " ++ show fn ++ " " ++ show e)
+ 
+ parseFields ::  alpha ->  [FieldDescriptionS alpha] ->  P.CharParser () alpha
+ parseFields defaultValue descriptions =
+Index: b/src/Graphics/UI/Editor/Simple.hs
+===================================================================
+--- a/src/Graphics/UI/Editor/Simple.hs
++++ b/src/Graphics/UI/Editor/Simple.hs
+@@ -63,6 +63,7 @@
+ import Graphics.UI.Editor.Basics
+        (GUIEvent(..), GUIEventSelector(..), propagateAsChanged,
+         genericGUIEvents, activateEvent, Editor)
++import Control.Exception (catch, IOException)
+ 
+ -- ------------------------------------------------------------
+ -- * Simple Editors
+@@ -360,7 +361,7 @@
+         case s of
+             Nothing -> return Nothing
+             Just s -> catch (liftM Just (readIO s))
+-                            (\e -> do
++                            (\ (e :: IOException) -> do
+                                 putStrLn ("Generic editor no parse for " ++ s ++ " " ++ show e)
+                                 return Nothing)
+     return (wid,ginj,gext)
diff -rN -u old-haskell-ltk//patches/series new-haskell-ltk//patches/series
--- old-haskell-ltk//patches/series	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-ltk//patches/series	2013-04-13 22:18:32.363021713 +0000
@@ -0,0 +1 @@
+ghc-7.6-compatibility.patch