[Git][haskell-team/DHG_packages][master] Fix compilation of haskell-uuagc-cabal with ghc-8.8

[Frédéric-Emmanuel Picca]

Frédéric-Emmanuel Picca pushed to branch master at Debian Haskell Group / DHG_packages


Commits:
5e5398e8 by Picca Frédéric-Emmanuel at 2020-06-14T11:41:04+02:00
Fix compilation of haskell-uuagc-cabal with ghc-8.8

- - - - -


3 changed files:

- p/haskell-uuagc-cabal/debian/changelog
- + p/haskell-uuagc-cabal/debian/patches/fix-build-with-ghc-8.8
- + p/haskell-uuagc-cabal/debian/patches/series


Changes:

=====================================
p/haskell-uuagc-cabal/debian/changelog
=====================================
@@ -1,3 +1,9 @@
+haskell-uuagc-cabal (1.1.0.0-4) unstable; urgency=medium
+
+  * d/patches/fix-build-with-ghc-8.8: Added to fix compilation
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org>  Sun, 14 Jun 2020 11:40:05 +0200
+
 haskell-uuagc-cabal (1.1.0.0-3) unstable; urgency=medium
 
   * Remove build dependency on libghc-mtl-dev (provided by ghc-8.4.3)


=====================================
p/haskell-uuagc-cabal/debian/patches/fix-build-with-ghc-8.8
=====================================
@@ -0,0 +1,66 @@
+Index: haskell-uuagc-cabal/src/Distribution/Simple/UUAGC/UUAGC.hs
+===================================================================
+--- haskell-uuagc-cabal.orig/src/Distribution/Simple/UUAGC/UUAGC.hs
++++ haskell-uuagc-cabal/src/Distribution/Simple/UUAGC/UUAGC.hs
+@@ -6,7 +6,7 @@ module Distribution.Simple.UUAGC.UUAGC(u
+                                        uuagcFromString
+                                       ) where
+ 
+-import Distribution.Simple.BuildPaths (autogenModulesDir)
++-- import Distribution.Simple.BuildPaths (autogenComponentModulesDir)
+ import Debug.Trace
+ import Distribution.Simple
+ import Distribution.Simple.PreProcess
+@@ -104,13 +104,13 @@ uuagcLibUserHook :: ([String] -> FilePat
+ uuagcLibUserHook uuagc = hooks where
+   hooks = simpleUserHooks { hookedPreProcessors = ("ag", ag):("lag",ag):knownSuffixHandlers
+                           , buildHook = uuagcBuildHook uuagc
+-                          , sDistHook = uuagcSDistHook uuagc
++--                          , sDistHook = uuagcSDistHook uuagc
+                           }
+   ag = uuagc' uuagc
+ 
+ originalPreBuild  = preBuild simpleUserHooks
+ originalBuildHook = buildHook simpleUserHooks
+-originalSDistHook = sDistHook simpleUserHooks
++--originalSDistHook = sDistHook simpleUserHooks
+ 
+ putErrorInfo :: Handle -> IO ()
+ putErrorInfo h = hGetContents h >>= hPutStr stderr
+@@ -188,21 +188,21 @@ getOptionsFromClass classes fOpt =
+                                                    ++ show fClass
+                                                    ++ " is not defined."
+ 
+-uuagcSDistHook :: ([String] -> FilePath -> IO (ExitCode, [FilePath]))
+-     -> PackageDescription
+-     -> Maybe LocalBuildInfo
+-     -> UserHooks
+-     -> SDistFlags
+-     -> IO ()
+-uuagcSDistHook uuagc pd mbLbi uh df = do
+-  {-
+-  case mbLbi of
+-    Nothing -> warn normal "sdist: the local buildinfo was not present. Skipping AG initialization. Dist may fail."
+-    Just lbi -> let classesPath = buildDir lbi </> agClassesFile
+-                in commonHook uuagc classesPath pd lbi (sDistVerbosity df)
+-  originalSDistHook pd mbLbi uh df
+-  -}
+-  originalSDistHook pd mbLbi (uh { hookedPreProcessors = ("ag", nouuagc):("lag",nouuagc):knownSuffixHandlers }) df  -- bypass preprocessors
++-- uuagcSDistHook :: ([String] -> FilePath -> IO (ExitCode, [FilePath]))
++--      -> PackageDescription
++--      -> Maybe LocalBuildInfo
++--      -> UserHooks
++--      -> SDistFlags
++--      -> IO ()
++-- uuagcSDistHook uuagc pd mbLbi uh df = do
++--   {-
++--   case mbLbi of
++--     Nothing -> warn normal "sdist: the local buildinfo was not present. Skipping AG initialization. Dist may fail."
++--     Just lbi -> let classesPath = buildDir lbi </> agClassesFile
++--                 in commonHook uuagc classesPath pd lbi (sDistVerbosity df)
++--   originalSDistHook pd mbLbi uh df
++--   -}
++--   originalSDistHook pd mbLbi (uh { hookedPreProcessors = ("ag", nouuagc):("lag",nouuagc):knownSuffixHandlers }) df  -- bypass preprocessors
+ 
+ uuagcBuildHook
+   :: ([String] -> FilePath -> IO (ExitCode, [FilePath]))


=====================================
p/haskell-uuagc-cabal/debian/patches/series
=====================================
@@ -0,0 +1 @@
+fix-build-with-ghc-8.8



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/5e5398e8384785123ef70c019e73725ec9a5acbd

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/5e5398e8384785123ef70c019e73725ec9a5acbd
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20200614/3d1efdae/attachment-0001.html>