[DHG_packages] 01/02: yi: fix build by bumping directory bounds

Gianfranco Costamagna locutusofborg at moszumanska.debian.org
Wed Jun 21 06:58:58 UTC 2017


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

locutusofborg pushed a commit to tag haskell-aws_v0.14.1-3
in repository DHG_packages.

commit 6ec0c6d141ac6582e85c38888ff08114f01a6263
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Wed Jun 21 08:56:59 2017 +0200

    yi: fix build by bumping directory bounds
---
 p/yi/debian/changelog                              |  8 ++++
 .../9734a8827ab5423242fc571d9b8e08c9763d4763.patch | 56 ++++++++++++++++++++++
 p/yi/debian/patches/series                         |  1 +
 3 files changed, 65 insertions(+)

diff --git a/p/yi/debian/changelog b/p/yi/debian/changelog
index 4ec70a3..f8dd993 100644
--- a/p/yi/debian/changelog
+++ b/p/yi/debian/changelog
@@ -1,3 +1,11 @@
+yi (0.12.6-4) unstable; urgency=medium
+
+  * Team upload.
+  * cherry-pick upstream patch to fix build with new ghc 8.0.2
+    - debian/patches/9734a8827ab5423242fc571d9b8e08c9763d4763.patch
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Wed, 21 Jun 2017 08:55:31 +0200
+
 yi (0.12.6-3) unstable; urgency=medium
 
   * Upload to unstable as part of GHC 8 transition.
diff --git a/p/yi/debian/patches/9734a8827ab5423242fc571d9b8e08c9763d4763.patch b/p/yi/debian/patches/9734a8827ab5423242fc571d9b8e08c9763d4763.patch
new file mode 100644
index 0000000..ea14cf2
--- /dev/null
+++ b/p/yi/debian/patches/9734a8827ab5423242fc571d9b8e08c9763d4763.patch
@@ -0,0 +1,56 @@
+commit 9734a8827ab5423242fc571d9b8e08c9763d4763
+Author: Ryan Scott <ryan.gl.scott at gmail.com>
+Date:   Sat Nov 26 17:05:08 2016 +0000
+
+    Fix build with GHC 8.0.2
+
+diff --git a/yi-core/src/Yi/Buffer/Misc.hs b/yi-core/src/Yi/Buffer/Misc.hs
+index 08ebaa7..2426491 100644
+--- a/src/library/Yi/Buffer/Misc.hs
++++ b/src/library/Yi/Buffer/Misc.hs
+@@ -6,9 +6,9 @@
+ {-# LANGUAGE ExistentialQuantification  #-}
+ {-# LANGUAGE FlexibleContexts           #-}
+ {-# LANGUAGE GeneralizedNewtypeDeriving #-}
+-{-# LANGUAGE ImpredicativeTypes         #-}
+ {-# LANGUAGE LambdaCase                 #-}
+ {-# LANGUAGE OverloadedStrings          #-}
++{-# LANGUAGE RankNTypes                 #-}
+ {-# LANGUAGE ScopedTypeVariables        #-}
+ {-# LANGUAGE StandaloneDeriving         #-}
+ {-# LANGUAGE TemplateHaskell            #-}
+@@ -393,13 +393,13 @@ getPercent a b = T.justifyRight 3 ' ' (T.pack $ show p) `T.snoc` '%'
+           bb = fromIntegral b :: Double
+ 
+ queryBuffer :: (forall syntax. BufferImpl syntax -> x) -> BufferM x
+-queryBuffer = gets . queryRawbuf
++queryBuffer x = gets (queryRawbuf x)
+ 
+ modifyBuffer :: (forall syntax. BufferImpl syntax -> BufferImpl syntax) -> BufferM ()
+-modifyBuffer = modify . modifyRawbuf
++modifyBuffer x = modify (modifyRawbuf x)
+ 
+ queryAndModify :: (forall syntax. BufferImpl syntax -> (BufferImpl syntax,x)) -> BufferM x
+-queryAndModify = getsAndModify . queryAndModifyRawbuf
++queryAndModify x = getsAndModify (queryAndModifyRawbuf x)
+ 
+ -- | Adds an "overlay" to the buffer
+ addOverlayB :: Overlay -> BufferM ()
+@@ -816,7 +816,7 @@ withMode0 :: (forall syntax. Mode syntax -> a) -> FBuffer -> a
+ withMode0 f FBuffer {bmode = m} = f m
+ 
+ withModeB :: (forall syntax. Mode syntax -> BufferM a) -> BufferM a
+-withModeB = join . gets . withMode0
++withModeB x = join (gets (withMode0 x))
+ 
+ withSyntax0 :: (forall syntax. Mode syntax -> syntax -> a) -> WindowRef -> FBuffer -> a
+ withSyntax0 f wk (FBuffer bm rb _attrs) = f bm (getAst wk rb)
+@@ -830,7 +830,7 @@ focusSyntax ::  M.Map WindowRef Region -> FBuffer -> FBuffer
+ focusSyntax r = modifyRawbuf (focusAst r)
+ 
+ withSyntaxB' :: (forall syntax. Mode syntax -> syntax -> BufferM a) -> BufferM a
+-withSyntaxB' = join . withSyntaxB
++withSyntaxB' x = join (withSyntaxB x)
+ 
+ -- | Return indices of strings in buffer matched by regex in the
+ -- given region.
diff --git a/p/yi/debian/patches/series b/p/yi/debian/patches/series
index 501b3a0..07acccc 100644
--- a/p/yi/debian/patches/series
+++ b/p/yi/debian/patches/series
@@ -1,2 +1,3 @@
 xpm-icons.diff
 man-page.diff
+9734a8827ab5423242fc571d9b8e08c9763d4763.patch

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



More information about the Pkg-haskell-commits mailing list