[Gtk2hs-commit] (main branch): forward compatibility with new Cabal library

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

diffing dir...
Tue Mar 26 18:33:15 GMT 2013  Daniel Wagner <da...@wa...>
  * forward compatibility with new Cabal library
  Ignore-this: 4dcae380bd68c5fa713ff9a4f42f856d
    hunk ./cairo/Gtk2HsSetup.hs 1
    -{-# LANGUAGE CPP #-}
    +{-# LANGUAGE CPP, ViewPatterns #-}
    hunk ./cairo/Gtk2HsSetup.hs 32
    -import Distribution.Simple.LocalBuildInfo (LocalBuildInfo(..),
    +import Distribution.Simple.LocalBuildInfo (LocalBuildInfo(withPackageDB, buildDir, localPkgDescr, installedPkgs, withPrograms),
    hunk ./cairo/Gtk2HsSetup.hs 64
    +import qualified Distribution.Simple.LocalBuildInfo as LBI
    hunk ./cairo/Gtk2HsSetup.hs 68
    +#if CABAL_VERSION_CHECK(1,17,0)
    +libraryConfig lbi = case [clbi | (LBI.CLibName, clbi, _) <- LBI.componentsConfigs lbi] of
    +  [clbi] -> Just clbi
    +  _ -> Nothing
    +#else
    +libraryConfig = LBI.libraryConfig
    +#endif
    +
    hunk ./cairo/Gtk2HsSetup.hs 161
    -register pkg@PackageDescription { library       = Just lib  }
    -         lbi@LocalBuildInfo     { libraryConfig = Just clbi } regFlags
    +register pkg@(library       -> Just lib )
    +         lbi@(libraryConfig -> Just clbi) regFlags
    hunk ./cairo/SetupWrapper.hs 4
    +{-# LANGUAGE FlexibleInstances #-}
    hunk ./cairo/SetupWrapper.hs 33
    +-- The former instance is for Cabal < 1.17; the latter for Cabal >= 1.17. We
    +-- can't use CPP to check which version of Cabal we're up against here because
    +-- this is the file that's generating those macros.
    +class CompConf a where compConf :: a -> (Compiler, ProgramConfiguration)
    +instance CompConf (Compiler, ProgramConfiguration) where compConf = id
    +instance CompConf (Compiler, a, ProgramConfiguration) where compConf (c, a, p) = (c, p)
    +
    hunk ./cairo/SetupWrapper.hs 108
    -        (comp, conf)    <- configCompiler (Just GHC) Nothing Nothing
    +        (comp, conf)    <- compConf `fmap` configCompiler (Just GHC) Nothing Nothing
    hunk ./gio/Gtk2HsSetup.hs 1
    -{-# LANGUAGE CPP #-}
    +{-# LANGUAGE CPP, ViewPatterns #-}
    hunk ./gio/Gtk2HsSetup.hs 32
    -import Distribution.Simple.LocalBuildInfo (LocalBuildInfo(..),
    +import Distribution.Simple.LocalBuildInfo (LocalBuildInfo(withPackageDB, buildDir, localPkgDescr, installedPkgs, withPrograms),
    hunk ./gio/Gtk2HsSetup.hs 63
    +import qualified Distribution.Simple.LocalBuildInfo as LBI
    hunk ./gio/Gtk2HsSetup.hs 67
    +#if CABAL_VERSION_CHECK(1,17,0)
    +libraryConfig lbi = case [clbi | (LBI.CLibName, clbi, _) <- LBI.componentsConfigs lbi] of
    +  [clbi] -> Just clbi
    +  _ -> Nothing
    +#else
    +libraryConfig = LBI.libraryConfig
    +#endif
    +
    hunk ./gio/Gtk2HsSetup.hs 153
    -register pkg@PackageDescription { library       = Just lib  }
    -         lbi@LocalBuildInfo     { libraryConfig = Just clbi } regFlags
    +register pkg@(library       -> Just lib )
    +         lbi@(libraryConfig -> Just clbi) regFlags
    hunk ./gio/SetupWrapper.hs 4
    +{-# LANGUAGE FlexibleInstances #-}
    hunk ./gio/SetupWrapper.hs 33
    +-- The former instance is for Cabal < 1.17; the latter for Cabal >= 1.17. We
    +-- can't use CPP to check which version of Cabal we're up against here because
    +-- this is the file that's generating those macros.
    +class CompConf a where compConf :: a -> (Compiler, ProgramConfiguration)
    +instance CompConf (Compiler, ProgramConfiguration) where compConf = id
    +instance CompConf (Compiler, a, ProgramConfiguration) where compConf (c, a, p) = (c, p)
    +
    hunk ./gio/SetupWrapper.hs 108
    -        (comp, conf)    <- configCompiler (Just GHC) Nothing Nothing
    +        (comp, conf)    <- compConf `fmap` configCompiler (Just GHC) Nothing Nothing
    hunk ./glib/Gtk2HsSetup.hs 1
    -{-# LANGUAGE CPP #-}
    +{-# LANGUAGE CPP, ViewPatterns #-}
    hunk ./glib/Gtk2HsSetup.hs 32
    -import Distribution.Simple.LocalBuildInfo (LocalBuildInfo(..),
    +import Distribution.Simple.LocalBuildInfo (LocalBuildInfo(withPackageDB, buildDir, localPkgDescr, installedPkgs, withPrograms),
    hunk ./glib/Gtk2HsSetup.hs 63
    +import qualified Distribution.Simple.LocalBuildInfo as LBI
    hunk ./glib/Gtk2HsSetup.hs 67
    +#if CABAL_VERSION_CHECK(1,17,0)
    +libraryConfig lbi = case [clbi | (LBI.CLibName, clbi, _) <- LBI.componentsConfigs lbi] of
    +  [clbi] -> Just clbi
    +  _ -> Nothing
    +#else
    +libraryConfig = LBI.libraryConfig
    +#endif
    +
    hunk ./glib/Gtk2HsSetup.hs 153
    -register pkg@PackageDescription { library       = Just lib  }
    -         lbi@LocalBuildInfo     { libraryConfig = Just clbi } regFlags
    +register pkg@(library       -> Just lib )
    +         lbi@(libraryConfig -> Just clbi) regFlags
    hunk ./glib/SetupWrapper.hs 4
    +{-# LANGUAGE FlexibleInstances #-}
    hunk ./glib/SetupWrapper.hs 33
    +-- The former instance is for Cabal < 1.17; the latter for Cabal >= 1.17. We
    +-- can't use CPP to check which version of Cabal we're up against here because
    +-- this is the file that's generating those macros.
    +class CompConf a where compConf :: a -> (Compiler, ProgramConfiguration)
    +instance CompConf (Compiler, ProgramConfiguration) where compConf = id
    +instance CompConf (Compiler, a, ProgramConfiguration) where compConf (c, a, p) = (c, p)
    +
    hunk ./glib/SetupWrapper.hs 108
    -        (comp, conf)    <- configCompiler (Just GHC) Nothing Nothing
    +        (comp, conf)    <- compConf `fmap` configCompiler (Just GHC) Nothing Nothing
    hunk ./gtk/Gtk2HsSetup.hs 1
    -{-# LANGUAGE CPP #-}
    +{-# LANGUAGE CPP, ViewPatterns #-}
    hunk ./gtk/Gtk2HsSetup.hs 32
    -import Distribution.Simple.LocalBuildInfo (LocalBuildInfo(..),
    +import Distribution.Simple.LocalBuildInfo (LocalBuildInfo(withPackageDB, buildDir, localPkgDescr, installedPkgs, withPrograms),
    hunk ./gtk/Gtk2HsSetup.hs 63
    +import qualified Distribution.Simple.LocalBuildInfo as LBI
    hunk ./gtk/Gtk2HsSetup.hs 67
    +#if CABAL_VERSION_CHECK(1,17,0)
    +libraryConfig lbi = case [clbi | (LBI.CLibName, clbi, _) <- LBI.componentsConfigs lbi] of
    +  [clbi] -> Just clbi
    +  _ -> Nothing
    +#else
    +libraryConfig = LBI.libraryConfig
    +#endif
    +
    hunk ./gtk/Gtk2HsSetup.hs 153
    -register pkg@PackageDescription { library       = Just lib  }
    -         lbi@LocalBuildInfo     { libraryConfig = Just clbi } regFlags
    +register pkg@(library       -> Just lib )
    +         lbi@(libraryConfig -> Just clbi) regFlags
    hunk ./gtk/SetupWrapper.hs 4
    +{-# LANGUAGE FlexibleInstances #-}
    hunk ./gtk/SetupWrapper.hs 33
    +-- The former instance is for Cabal < 1.17; the latter for Cabal >= 1.17. We
    +-- can't use CPP to check which version of Cabal we're up against here because
    +-- this is the file that's generating those macros.
    +class CompConf a where compConf :: a -> (Compiler, ProgramConfiguration)
    +instance CompConf (Compiler, ProgramConfiguration) where compConf = id
    +instance CompConf (Compiler, a, ProgramConfiguration) where compConf (c, a, p) = (c, p)
    +
    hunk ./gtk/SetupWrapper.hs 108
    -        (comp, conf)    <- configCompiler (Just GHC) Nothing Nothing
    +        (comp, conf)    <- compConf `fmap` configCompiler (Just GHC) Nothing Nothing
    hunk ./pango/Gtk2HsSetup.hs 1
    -{-# LANGUAGE CPP #-}
    +{-# LANGUAGE CPP, ViewPatterns #-}
    hunk ./pango/Gtk2HsSetup.hs 32
    -import Distribution.Simple.LocalBuildInfo (LocalBuildInfo(..),
    +import Distribution.Simple.LocalBuildInfo (LocalBuildInfo(withPackageDB, buildDir, localPkgDescr, installedPkgs, withPrograms),
    hunk ./pango/Gtk2HsSetup.hs 63
    +import qualified Distribution.Simple.LocalBuildInfo as LBI
    hunk ./pango/Gtk2HsSetup.hs 67
    +#if CABAL_VERSION_CHECK(1,17,0)
    +libraryConfig lbi = case [clbi | (LBI.CLibName, clbi, _) <- LBI.componentsConfigs lbi] of
    +  [clbi] -> Just clbi
    +  _ -> Nothing
    +#else
    +libraryConfig = LBI.libraryConfig
    +#endif
    +
    hunk ./pango/Gtk2HsSetup.hs 153
    -register pkg@PackageDescription { library       = Just lib  }
    -         lbi@LocalBuildInfo     { libraryConfig = Just clbi } regFlags
    +register pkg@(library       -> Just lib )
    +         lbi@(libraryConfig -> Just clbi) regFlags
    hunk ./pango/SetupWrapper.hs 4
    +{-# LANGUAGE FlexibleInstances #-}
    hunk ./pango/SetupWrapper.hs 33
    +-- The former instance is for Cabal < 1.17; the latter for Cabal >= 1.17. We
    +-- can't use CPP to check which version of Cabal we're up against here because
    +-- this is the file that's generating those macros.
    +class CompConf a where compConf :: a -> (Compiler, ProgramConfiguration)
    +instance CompConf (Compiler, ProgramConfiguration) where compConf = id
    +instance CompConf (Compiler, a, ProgramConfiguration) where compConf (c, a, p) = (c, p)
    +
    hunk ./pango/SetupWrapper.hs 108
    -        (comp, conf)    <- configCompiler (Just GHC) Nothing Nothing
    +        (comp, conf)    <- compConf `fmap` configCompiler (Just GHC) Nothing Nothing