[hedgewars] 01/02: Add patch from James Cowgill to fix build

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script.

locutusofborg pushed a commit to branch master
in repository hedgewars.

commit 7fa5f6934873b6e2594eab17697bb8a76d8a0880
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Tue May 16 12:44:07 2017 +0200

    Add patch from James Cowgill to fix build
---
 debian/changelog                |  4 ++++
 debian/patches/pas2c-ghc8.patch | 27 +++++++++++++++++++++++++++
 debian/patches/series           |  1 +
 3 files changed, 32 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1052f86..8e2f6b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ hedgewars (0.9.22-dfsg-12) UNRELEASED; urgency=medium
   * Stop depending on ttf-wqy-zenhei, switch to fonts-wqy-zenhei
     (Closes: #859525). Thanks Boyuan Yang!
 
+  [ James Cowgill <jcowgill at debian.org> ]
+  * debian/patches/pas2c-ghc8.patch: fix build where fpc is not available
+    (Closes: #862728)
+
  -- Gianfranco Costamagna <locutusofborg at debian.org>  Fri, 27 Jan 2017 14:28:40 +0100
 
 hedgewars (0.9.22-dfsg-11) unstable; urgency=medium
diff --git a/debian/patches/pas2c-ghc8.patch b/debian/patches/pas2c-ghc8.patch
new file mode 100644
index 0000000..b2a2c33
--- /dev/null
+++ b/debian/patches/pas2c-ghc8.patch
@@ -0,0 +1,27 @@
+--- a/tools/pas2c/Pas2C.hs
++++ b/tools/pas2c/Pas2C.hs
+@@ -297,6 +297,7 @@ uses2C uses@(Uses unitIds) = do
+     mapM_ (id2C IOInsert . setBaseType BTUnit) unitIds
+     return $ vcat . map (\i -> text $ "#include \"" ++ i ++ ".h\"") $ uses2List uses
+     where
++    injectNamespace :: Identifier -> State RenderState ()
+     injectNamespace (Identifier i _) = do
+         getNS <- gets (flip Map.lookup . namespaces)
+         modify (\s -> s{currentScope = Map.unionWith (++) (fromMaybe Map.empty (getNS i)) $ currentScope s})
+--- a/tools/pas2c/PascalParser.hs
++++ b/tools/pas2c/PascalParser.hs
+@@ -239,10 +239,10 @@ rangeDecl = choice [
+     ] <?> "range declaration"
+     where
+     rangeft = do
+-    e1 <- initExpression
+-    string' ".."
+-    e2 <- initExpression
+-    return $ RangeFromTo e1 e2
++        e1 <- initExpression
++        string' ".."
++        e2 <- initExpression
++        return $ RangeFromTo e1 e2
+ 
+ typeVarDeclaration :: Bool -> Parsec String u [TypeVarDeclaration]
+ typeVarDeclaration isImpl = (liftM concat . many . choice) [
diff --git a/debian/patches/series b/debian/patches/series
index 7b0332b..d0ec5e8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,3 +16,4 @@ ad435d95ca4b.patch
 dc19837f6b9bccddcd2fc05e1d44255aab79b614.patch
 disable-test.patch
 fix-comment-desktop-file.patch
+pas2c-ghc8.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/hedgewars.git