tag 393642 patch usertag 393642 supplied-patch Hi, I have prepared a little patch to fix the FTBFS with ghc6 6.6. The patch is attached.
Greetings Arjan
haskell-src-exts (0.2-5.1) unstable; urgency=low
* Non-maintainer upload.
* Fix FTBFS with ghc6 6.6 (Closes: #393642)
- src/haskell-src-exts/Language/Haskell/Hsx/Lexer.hs: hide isSymbol
when compiling with GHC 6.6.
- src/haskell-src-exts/haskell-src-exts.cabal: add CPP extension which
is needed for the change above.
- /src/haskell-src-exts/Language/Haskell/Hsx/{Transform.hs,Pretty.hs}:
modify some strings to keep cpp remove an invalid UTF sequence which
upsets GHC 6.6
- debian/rules: call ghc-pkg with --force-files when the
haskell-src-exts library is registered during as some directories
are missing.
diff -u haskell-src-exts-0.2/debian/changelog haskell-src-exts-0.2/debian/changelog
--- haskell-src-exts-0.2/debian/changelog
+++ haskell-src-exts-0.2/debian/changelog
@@ -1,3 +1,20 @@
+haskell-src-exts (0.2-5.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix FTBFS with ghc6 6.6 (Closes: #393642)
+ - src/haskell-src-exts/Language/Haskell/Hsx/Lexer.hs: hide isSymbol
+ when compiling with GHC 6.6.
+ - src/haskell-src-exts/haskell-src-exts.cabal: add CPP extension which
+ is needed for the change above.
+ - /src/haskell-src-exts/Language/Haskell/Hsx/{Transform.hs,Pretty.hs}:
+ modify some strings to keep cpp remove an invalid UTF sequence which
+ upsets GHC 6.6
+ - debian/rules: call ghc-pkg with --force-files when the
+ haskell-src-exts library is registered during as some directories
+ are missing.
+
+ -- Arjan Oosting <[EMAIL PROTECTED]> Fri, 20 Oct 2006 14:54:07 +0000
+
haskell-src-exts (0.2-5) unstable; urgency=low
* Removed bashism from debian/buildmod.sh (Closes: #376701).
diff -u haskell-src-exts-0.2/debian/rules haskell-src-exts-0.2/debian/rules
--- haskell-src-exts-0.2/debian/rules
+++ haskell-src-exts-0.2/debian/rules
@@ -32,7 +32,7 @@
sed "s,/usr/lib/haskell-packages/ghc6/lib/haskell-src-exts-$(version)/ghc-$(ghc6_version),`pwd`/src/haskell-src-exts/dist/build,g" < src/haskell-src-exts/.installed-pkg-config > debian/tmp-installed-pkg
echo '[]' > debian/tmp-package-conf
- ghc-pkg -f debian/tmp-package-conf register debian/tmp-installed-pkg
+ ghc-pkg --force-files -f debian/tmp-package-conf register debian/tmp-installed-pkg
for MOD in $(MODULES); do sh debian/buildmod.sh $$MOD; done
only in patch2:
unchanged:
--- haskell-src-exts-0.2.orig/src/haskell-src-exts/Language/Haskell/Hsx/Lexer.hs
+++ haskell-src-exts-0.2/src/haskell-src-exts/Language/Haskell/Hsx/Lexer.hs
@@ -23,7 +23,11 @@
import Language.Haskell.Hsx.ParseMonad
+#if __GLASGOW_HASKELL__ >= 604
+import Data.Char hiding (isSymbol)
+#else
import Data.Char
+#endif
import Data.Ratio
data Token
only in patch2:
unchanged:
--- haskell-src-exts-0.2.orig/src/haskell-src-exts/Language/Haskell/Hsx/Transform.hs
+++ haskell-src-exts-0.2/src/haskell-src-exts/Language/Haskell/Hsx/Transform.hs
@@ -381,8 +381,7 @@
let gs' = case gs of
[] -> []
[g] -> [mkDeclGuard g ws]
- _ -> error "This should not happen since we \
- \ have called renameLetDecls already!"
+ _ -> error "This should not happen since we have called renameLetDecls already!"
-- Generated attribute guards should also be added as declarations,
-- but with no where clauses.
ags' = map (flip mkDeclGuard $ []) ags
@@ -1269,8 +1268,7 @@
| otherwise -> case v of
HsIdent n -> fail $ "Attempting to bind variable "++n++
" inside the context of a numerable regular pattern"
- _ -> fail $ "This should never ever ever happen...\
- \ how the €#% did you do it??!?"
+ _ -> fail $ "This should never ever ever happen... how the #### did you do it??!?"
where -- | Generate a declaration for a @ binding.
mkAsDecl :: SrcLoc -> MFunMetaInfo -> Tr HsName
only in patch2:
unchanged:
--- haskell-src-exts-0.2.orig/src/haskell-src-exts/Language/Haskell/Hsx/Pretty.hs
+++ haskell-src-exts-0.2/src/haskell-src-exts/Language/Haskell/Hsx/Pretty.hs
@@ -703,8 +703,7 @@
prettyChildren p = case p of
HsPList ps -> map prettyChild ps
HsPRPat _ _ -> [pretty p]
- _ -> error "The pattern representing the children of an xml pattern\
- \ should always be a list."
+ _ -> error "The pattern representing the children of an xml pattern should always be a list."
prettyChild :: HsPat -> Doc
prettyChild p = case p of
only in patch2:
unchanged:
--- haskell-src-exts-0.2.orig/src/haskell-src-exts/haskell-src-exts.cabal
+++ haskell-src-exts-0.2/src/haskell-src-exts/haskell-src-exts.cabal
@@ -13,3 +13,4 @@
Language.Haskell.Hsx.Lexer,
Language.Haskell.Hsx.ParseUtils
Build-Depends: base, haskell98
+Extensions: CPP
signature.asc
Description: Dit berichtdeel is digitaal ondertekend
