[DHG_packages] 01/03: hothasktags: add 0001-update-to-haskell-src-exts-1.19.1.patch

[Sean Whitton]

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

spwhitton pushed a commit to annotated tag hothasktags_v0.3.8-1
in repository DHG_packages.

commit d106d33c3dcaaa7ab26b8abfa62e0014da3b1824
Author: Sean Whitton <spwhitton at spwhitton.name>
Date:   Fri Jul 7 22:53:05 2017 +0100

    hothasktags: add 0001-update-to-haskell-src-exts-1.19.1.patch
---
 p/hothasktags/debian/changelog                     |  2 +
 p/hothasktags/debian/control                       |  4 +-
 .../0001-update-to-haskell-src-exts-1.19.1.patch   | 70 ++++++++++++++++++++++
 p/hothasktags/debian/patches/series                |  1 +
 4 files changed, 75 insertions(+), 2 deletions(-)

diff --git a/p/hothasktags/debian/changelog b/p/hothasktags/debian/changelog
index 7c494bf..fa170a8 100644
--- a/p/hothasktags/debian/changelog
+++ b/p/hothasktags/debian/changelog
@@ -2,6 +2,8 @@ hothasktags (0.3.8-1) UNRELEASED; urgency=medium
 
   * New upstream release
     - Tighten build-dep on optparse-applicative.
+  * Add 0001-update-to-haskell-src-exts-1.19.1.patch (Closes: #867260).
+    Thanks to Joey Hess for the patch.
 
  -- Sean Whitton <spwhitton at spwhitton.name>  Wed, 05 Jul 2017 08:37:48 +0100
 
diff --git a/p/hothasktags/debian/control b/p/hothasktags/debian/control
index f6d57ea..1a37ae1 100644
--- a/p/hothasktags/debian/control
+++ b/p/hothasktags/debian/control
@@ -14,8 +14,8 @@ Build-Depends:
  libghc-glob-dev,
  libghc-optparse-applicative-dev (>= 0.13),
  libghc-split-dev,
- libghc-src-exts-dev (<< 1.18),
- libghc-src-exts-dev (>= 1.17),
+ libghc-src-exts-dev (<< 1.20),
+ libghc-src-exts-dev (>= 1.18.2),
 Standards-Version: 3.9.8
 Homepage: http://github.com/luqui/hothasktags
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-haskell/DHG_packages.git/tree/p/hothasktags
diff --git a/p/hothasktags/debian/patches/0001-update-to-haskell-src-exts-1.19.1.patch b/p/hothasktags/debian/patches/0001-update-to-haskell-src-exts-1.19.1.patch
new file mode 100644
index 0000000..4068258
--- /dev/null
+++ b/p/hothasktags/debian/patches/0001-update-to-haskell-src-exts-1.19.1.patch
@@ -0,0 +1,70 @@
+From: Joey Hess <joeyh at joeyh.name>
+Date: Fri, 7 Jul 2017 09:31:29 -0400
+Subject: update to haskell-src-exts 1.18.2 / 1.19.1
+
+Language.Haskell.Exts.Annotated has gone away, so used
+Language.Haskell.Exts.
+
+EThingAll constructor is no more, so removed that.
+
+Otherwise, just a matter of adjusting pattern matching where new fields
+have been added.
+
+Tested by running hothasktags in git-annex's source tree; the patched
+version generates an identical tags file to the old version.
+---
+ Main.hs           | 10 ++++------
+ hothasktags.cabal |  2 +-
+ 2 files changed, 5 insertions(+), 7 deletions(-)
+
+--- a/Main.hs
++++ b/Main.hs
+@@ -4,7 +4,7 @@
+ module Main where
+ 
+ import Options.Applicative
+-import qualified Language.Haskell.Exts.Annotated as L
++import qualified Language.Haskell.Exts as L
+ import System.IO
+ import GHC.IO.Handle (HandlePosition)
+ import qualified Data.Map.Strict as Map
+@@ -30,7 +30,7 @@ localDecls :: L.Module L.SrcSpanInfo -> Map.Map String Defn
+ localDecls (L.Module _ _ _ _ decls) = Map.fromList $ concatMap extract decls
+     where
+     extract (L.TypeDecl _ hd _) = extractDeclHead hd
+-    extract (L.TypeFamDecl _ hd _) = extractDeclHead hd
++    extract (L.TypeFamDecl _ hd _ _) = extractDeclHead hd
+     extract (L.DataDecl _ _ _ hd decls' _) =
+       extractDeclHead hd ++ concatMap extractQualConDecl decls'
+     extract (L.GDataDecl _ _ _ hd _ decls' _) =
+@@ -73,7 +73,7 @@ localDecls (L.Module _ _ _ _ decls) = Map.fromList $ concatMap extract decls
+ 
+     extractClassDecl (L.ClsDecl _ decl) = extract decl
+     extractClassDecl (L.ClsDataFam _ _ hd _) = extractDeclHead hd
+-    extractClassDecl (L.ClsTyFam _ hd _) = extractDeclHead hd
++    extractClassDecl (L.ClsTyFam _ hd _ _) = extractDeclHead hd
+     extractClassDecl _ = []
+ 
+     extractName (L.Ident loc name) = [(name, getLoc loc)]
+@@ -134,9 +134,7 @@ exported mod'@(L.Module _
+   where
+     matchesSpec nm (L.EVar _ (L.UnQual _ (L.Ident _ name'))) = nm == name'
+     matchesSpec nm (L.EAbs _ _ (L.UnQual _ (L.Ident _ name'))) = nm == name'
+-    matchesSpec nm (L.EThingAll _ (L.UnQual _ (L.Ident _ name'))) =
+-      nm == name' || (nm `elem` thingMembers mod' name')
+-    matchesSpec nm (L.EThingWith _ (L.UnQual _ (L.Ident _ name')) cnames) =
++    matchesSpec nm (L.EThingWith _ _ (L.UnQual _ (L.Ident _ name')) cnames) =
+       nm == name' || any (matchesCName nm) cnames
+     -- XXX this is wrong, moduleScope handles it though
+     matchesSpec _ (L.EModuleContents _ (L.ModuleName _ _)) = False
+--- a/hothasktags.cabal
++++ b/hothasktags.cabal
+@@ -38,7 +38,7 @@ executable hothasktags
+         filepath,
+         filemanip,
+         Glob,
+-        haskell-src-exts >= 1.17 && < 1.18,
++        haskell-src-exts >= 1.18.2 && < 1.20,
+         cpphs >= 1.11 && < 1.21,
+         optparse-applicative >= 0.13,
+         split
diff --git a/p/hothasktags/debian/patches/series b/p/hothasktags/debian/patches/series
new file mode 100644
index 0000000..cf71f0e
--- /dev/null
+++ b/p/hothasktags/debian/patches/series
@@ -0,0 +1 @@
+0001-update-to-haskell-src-exts-1.19.1.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git