[DHG_packages] 31/34: yi: Patch to build with ghc-8.0.2

[Ilias Tsitsimpis]

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

iliastsi-guest pushed a commit to branch ghc-8.0.2
in repository DHG_packages.

commit a2e72c717e9b29e651aefdc257f4609854d2e1bb
Author: Ilias Tsitsimpis <i.tsitsimpis at gmail.com>
Date:   Thu Jan 26 18:34:09 2017 +0200

    yi: Patch to build with ghc-8.0.2
---
 p/yi/debian/changelog              |  6 ++++++
 p/yi/debian/patches/ghc-8.0.2      | 43 ++++++++++++++++++++++++++++++++++++++
 p/yi/debian/patches/man-page.diff  |  6 +++---
 p/yi/debian/patches/series         |  1 +
 p/yi/debian/patches/xpm-icons.diff | 22 +++++++++----------
 5 files changed, 64 insertions(+), 14 deletions(-)

diff --git a/p/yi/debian/changelog b/p/yi/debian/changelog
index 4ec70a3..cb5af7a 100644
--- a/p/yi/debian/changelog
+++ b/p/yi/debian/changelog
@@ -1,3 +1,9 @@
+yi (0.12.6-4) unstable; urgency=medium
+
+  * Patch to build with ghc-8.0.2.
+
+ -- Ilias Tsitsimpis <i.tsitsimpis at gmail.com>  Thu, 26 Jan 2017 18:29:46 +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/ghc-8.0.2 b/p/yi/debian/patches/ghc-8.0.2
new file mode 100644
index 0000000..504f2c2
--- /dev/null
+++ b/p/yi/debian/patches/ghc-8.0.2
@@ -0,0 +1,43 @@
+Description: Fix build with GHC 8.0.2
+Author: Ilias Tsitsimpis <i.tsitsimpis at gmail.com>
+Forwarded: no
+
+Index: b/src/library/Yi/Buffer/Misc.hs
+===================================================================
+--- a/src/library/Yi/Buffer/Misc.hs
++++ b/src/library/Yi/Buffer/Misc.hs
+@@ -389,13 +389,13 @@ getPercent a b = T.justifyRight 3 ' ' (T
+           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 ()
+@@ -812,7 +812,7 @@ withMode0 :: (forall syntax. Mode syntax
+ 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)
+@@ -826,7 +826,7 @@ focusSyntax ::  M.Map WindowRef Region -
+ 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/man-page.diff b/p/yi/debian/patches/man-page.diff
index 3821c01..d67ff1b 100644
--- a/p/yi/debian/patches/man-page.diff
+++ b/p/yi/debian/patches/man-page.diff
@@ -1,7 +1,7 @@
-Index: yi-0.12.0/yi.1
+Index: b/yi.1
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ yi-0.12.0/yi.1	2015-06-14 10:05:40.248230977 +0200
+--- /dev/null
++++ b/yi.1
 @@ -0,0 +1,69 @@
 +.TH YI 1 2008-10-22 "yi version 0.1" "User Manual"
 +
diff --git a/p/yi/debian/patches/series b/p/yi/debian/patches/series
index 501b3a0..380ab4f 100644
--- a/p/yi/debian/patches/series
+++ b/p/yi/debian/patches/series
@@ -1,2 +1,3 @@
 xpm-icons.diff
 man-page.diff
+ghc-8.0.2
diff --git a/p/yi/debian/patches/xpm-icons.diff b/p/yi/debian/patches/xpm-icons.diff
index 5fdcb56..152a1fa 100644
--- a/p/yi/debian/patches/xpm-icons.diff
+++ b/p/yi/debian/patches/xpm-icons.diff
@@ -1,7 +1,7 @@
-Index: yi-0.12.0/art/yi+lambda-fat-16.xpm
+Index: b/art/yi+lambda-fat-16.xpm
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ yi-0.12.0/art/yi+lambda-fat-16.xpm	2015-06-14 10:05:37.140216146 +0200
+--- /dev/null
++++ b/art/yi+lambda-fat-16.xpm
 @@ -0,0 +1,278 @@
 +/* XPM */
 +static char *yi_lambda_fat_16[] = {
@@ -281,10 +281,10 @@ Index: yi-0.12.0/art/yi+lambda-fat-16.xpm
 +"dXfXgXhXjXkXlXzXxXcXvXbXnXmXMXNX",
 +"BXVXCXZXAXSXDXFXGXHXJXKXLXPXIXUX"
 +};
-Index: yi-0.12.0/art/yi+lambda-fat-32.xpm
+Index: b/art/yi+lambda-fat-32.xpm
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ yi-0.12.0/art/yi+lambda-fat-32.xpm	2015-06-14 10:05:37.140216146 +0200
+--- /dev/null
++++ b/art/yi+lambda-fat-32.xpm
 @@ -0,0 +1,201 @@
 +/* XPM */
 +static char *yi_lambda_fat_32[] = {
@@ -487,15 +487,15 @@ Index: yi-0.12.0/art/yi+lambda-fat-32.xpm
 +"I.A.A.A.A.A.A.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.B.3.K l 4.H.A.I.I.",
 +"A.A.A.A.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.I.H.Z.h.V.I.I.I.I."
 +};
-Index: yi-0.12.0/yi.cabal
+Index: b/yi.cabal
 ===================================================================
---- yi-0.12.0.orig/yi.cabal	2015-06-14 10:05:37.144216165 +0200
-+++ yi-0.12.0/yi.cabal	2015-06-14 10:05:37.140216146 +0200
-@@ -17,6 +17,7 @@
+--- a/yi.cabal
++++ b/yi.cabal
+@@ -17,6 +17,7 @@ build-type:     Simple
  data-files:
    art/*.png
    art/*.pdf
 +  art/*.xpm
    example-configs/*.hs
-
+ 
  extra-source-files:

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