[Pkg-haskell-commits] darcs: yi: Update vty-5.1 compatibility patch by Marcel Fourné
Joachim Breitner
mail at joachim-breitner.de
Sun Oct 26 10:20:21 UTC 2014
Sun Oct 26 09:54:02 UTC 2014 Joachim Breitner <mail at joachim-breitner.de>
* Update vty-5.1 compatibility patch by Marcel Fourn[_<U+00E9>_]
M ./changelog +6
M ./control -113 +116
M ./patches/vty-5.1-compat -319 +335
Sun Oct 26 09:54:02 UTC 2014 Joachim Breitner <mail at joachim-breitner.de>
* Update vty-5.1 compatibility patch by Marcel Fourné
diff -rN -u old-yi/changelog new-yi/changelog
--- old-yi/changelog 2014-10-26 10:20:21.804410882 +0000
+++ new-yi/changelog 2014-10-26 10:20:21.816410878 +0000
@@ -1,3 +1,9 @@
+yi (0.7.1-5) UNRELEASED; urgency=medium
+
+ * Update vty-5.1 compatibility patch by Marcel Fourné
+
+ -- Joachim Breitner <nomeata at debian.org> Sun, 26 Oct 2014 10:53:44 +0100
+
yi (0.7.1-4) unstable; urgency=medium
* Rebuild to closes: #763461
diff -rN -u old-yi/control new-yi/control
--- old-yi/control 2014-10-26 10:20:21.804410882 +0000
+++ new-yi/control 2014-10-26 10:20:21.808410881 +0000
@@ -4,120 +4,123 @@
Maintainer: Debian Haskell Group <pkg-haskell-maintainers at lists.alioth.debian.org>
Uploaders: Masayuki Hatta (mhatta) <mhatta at debian.org>
Build-Depends: debhelper (>= 9)
- , haskell-devscripts (>= 0.8)
- , cdbs
- , ghc
- , ghc-prof
- , libghc-diff-dev (>= 0.1)
- , libghc-diff-dev (<< 0.4)
- , libghc-diff-prof
- , libghc-quickcheck2-dev (>= 2.1.0.2)
- , libghc-quickcheck2-prof
- , libghc-cautious-file-dev (>= 1.0.1)
- , libghc-cautious-file-prof
- , libghc-concrete-typerep-dev (>= 0.1.0.2)
- , libghc-concrete-typerep-dev (<< 0.1.1)
- , libghc-concrete-typerep-prof
- , libghc-data-accessor-dev (>= 0.2.1.4)
- , libghc-data-accessor-dev (<< 0.3)
- , libghc-data-accessor-prof
- , libghc-data-accessor-mtl-dev (>= 0.2)
- , libghc-data-accessor-mtl-dev (<< 0.3)
- , libghc-data-accessor-mtl-prof
- , libghc-data-accessor-template-dev (>= 0.2.1.3)
- , libghc-data-accessor-template-dev (<< 0.2.2)
- , libghc-data-accessor-template-prof
- , libghc-derive-dev (>= 2.4)
- , libghc-derive-dev (<< 2.7)
- , libghc-derive-prof
- , libghc-dlist-dev (>= 0.4.1)
- , libghc-dlist-prof
- , libghc-dyre-dev (>= 0.8.11)
- , libghc-dyre-prof
- , libghc-fingertree-dev (<< 0.2)
- , libghc-fingertree-prof
- , libghc-ghc-paths-dev (>= 0.1)
- , libghc-ghc-paths-dev (<< 0.2)
- , libghc-ghc-paths-prof
- , libghc-hashable-dev (>= 1.1.2.5)
- , libghc-hashable-prof
- , libghc-hint-dev (>> 0.3.1)
- , libghc-hint-prof
- , libghc-mtl-dev (>= 0.1.0.1)
- , libghc-mtl-prof
- , libghc-parsec3-dev
- , libghc-parsec3-prof
- , libghc-pointedlist-dev (>= 0.4)
- , libghc-pointedlist-dev (<< 0.6)
- , libghc-pointedlist-prof
- , libghc-puremd5-dev (>= 0.2.3)
- , libghc-puremd5-prof
- , libghc-random-dev
- , libghc-random-prof
- , libghc-regex-base-dev (>= 0.93)
- , libghc-regex-base-dev (<< 0.94)
- , libghc-regex-base-prof
- , libghc-regex-tdfa-dev (>= 1.1)
- , libghc-regex-tdfa-dev (<< 1.3)
- , libghc-regex-tdfa-prof
- , libghc-rosezipper-dev (>= 0.1)
- , libghc-rosezipper-dev (<< 0.3)
- , libghc-rosezipper-prof
- , libghc-split-dev (>= 0.1)
- , libghc-split-dev (<< 0.3)
- , libghc-split-prof
- , libghc-uniplate-dev
- , libghc-uniplate-prof
- , libghc-unix-compat-dev (>= 0.1)
- , libghc-unix-compat-dev (<< 0.5)
- , libghc-unix-compat-prof
- , libghc-unordered-containers-dev (>= 0.1.3)
- , libghc-unordered-containers-dev (<< 0.3)
- , libghc-unordered-containers-prof
- , libghc-utf8-string-dev (>= 0.3.1)
- , libghc-utf8-string-prof
- , libghc-vty-dev (>= 5.2.3-2)
- , libghc-vty-dev (<< 6)
- , libghc-vty-prof
- , libghc-xdg-basedir-dev (>= 0.2.1)
- , libghc-xdg-basedir-dev (<< 0.3)
- , libghc-xdg-basedir-prof
- , alex (>= 3.0.3)
- , libghc-gtk-dev
- , libghc-gtk-prof
- , libghc-vte-dev
- , libghc-vte-prof
+ , haskell-devscripts (>= 0.8)
+ , cdbs
+ , ghc
+ , ghc-prof
+ , libghc-diff-dev (>= 0.1)
+ , libghc-diff-dev (<< 0.4)
+ , libghc-diff-prof
+ , libghc-quickcheck2-dev (>= 2.1.0.2)
+ , libghc-quickcheck2-prof
+ , libghc-cautious-file-dev (>= 1.0.1)
+ , libghc-cautious-file-prof
+ , libghc-concrete-typerep-dev (>= 0.1.0.2)
+ , libghc-concrete-typerep-dev (<< 0.1.1)
+ , libghc-concrete-typerep-prof
+ , libghc-data-accessor-dev (>= 0.2.1.4)
+ , libghc-data-accessor-dev (<< 0.3)
+ , libghc-data-accessor-prof
+ , libghc-data-accessor-mtl-dev (>= 0.2)
+ , libghc-data-accessor-mtl-dev (<< 0.3)
+ , libghc-data-accessor-mtl-prof
+ , libghc-data-accessor-template-dev (>= 0.2.1.3)
+ , libghc-data-accessor-template-dev (<< 0.2.2)
+ , libghc-data-accessor-template-prof
+ , libghc-data-default-dev
+ , libghc-data-default-prof
+ , libghc-derive-dev (>= 2.4)
+ , libghc-derive-dev (<< 2.7)
+ , libghc-derive-prof
+ , libghc-dlist-dev (>= 0.4.1)
+ , libghc-dlist-prof
+ , libghc-dyre-dev (>= 0.8.11)
+ , libghc-dyre-prof
+ , libghc-fingertree-dev (<< 0.2)
+ , libghc-fingertree-prof
+ , libghc-ghc-paths-dev (>= 0.1)
+ , libghc-ghc-paths-dev (<< 0.2)
+ , libghc-ghc-paths-prof
+ , libghc-hashable-dev (>= 1.1.2.5)
+ , libghc-hashable-prof
+ , libghc-hint-dev (>> 0.3.1)
+ , libghc-hint-prof
+ , libghc-mtl-dev (>= 0.1.0.1)
+ , libghc-mtl-prof
+ , libghc-parsec3-dev
+ , libghc-parsec3-prof
+ , libghc-pointedlist-dev (>= 0.4)
+ , libghc-pointedlist-dev (<< 0.6)
+ , libghc-pointedlist-prof
+ , libghc-puremd5-dev (>= 0.2.3)
+ , libghc-puremd5-prof
+ , libghc-random-dev
+ , libghc-random-prof
+ , libghc-regex-base-dev (>= 0.93)
+ , libghc-regex-base-dev (<< 0.94)
+ , libghc-regex-base-prof
+ , libghc-regex-tdfa-dev (>= 1.1)
+ , libghc-regex-tdfa-dev (<< 1.3)
+ , libghc-regex-tdfa-prof
+ , libghc-rosezipper-dev (>= 0.1)
+ , libghc-rosezipper-dev (<< 0.3)
+ , libghc-rosezipper-prof
+ , libghc-split-dev (>= 0.1)
+ , libghc-split-dev (<< 0.3)
+ , libghc-split-prof
+ , libghc-uniplate-dev
+ , libghc-uniplate-prof
+ , libghc-unix-compat-dev (>= 0.1)
+ , libghc-unix-compat-dev (<< 0.5)
+ , libghc-unix-compat-prof
+ , libghc-unordered-containers-dev (>= 0.1.3)
+ , libghc-unordered-containers-dev (<< 0.3)
+ , libghc-unordered-containers-prof
+ , libghc-utf8-string-dev (>= 0.3.1)
+ , libghc-utf8-string-prof
+ , libghc-vty-dev (>= 5.2.3-2)
+ , libghc-vty-dev (<< 6)
+ , libghc-vty-prof
+ , libghc-xdg-basedir-dev (>= 0.2.1)
+ , libghc-xdg-basedir-dev (<< 0.3)
+ , libghc-xdg-basedir-prof
+ , alex (>= 3.0.3)
+ , libghc-gtk-dev
+ , libghc-gtk-prof
+ , libghc-vte-dev
+ , libghc-vte-prof
Build-Depends-Indep: ghc-doc
- , libghc-diff-doc
- , libghc-quickcheck2-doc
- , libghc-cautious-file-doc
- , libghc-concrete-typerep-doc
- , libghc-data-accessor-doc
- , libghc-data-accessor-mtl-doc
- , libghc-data-accessor-template-doc
- , libghc-derive-doc
- , libghc-dlist-doc
- , libghc-dyre-doc
- , libghc-fingertree-doc
- , libghc-ghc-paths-doc
- , libghc-hashable-doc
- , libghc-hint-doc
- , libghc-mtl-doc
- , libghc-parsec3-doc
- , libghc-pointedlist-doc
- , libghc-puremd5-doc
- , libghc-random-doc
- , libghc-regex-base-doc
- , libghc-regex-tdfa-doc
- , libghc-rosezipper-doc
- , libghc-split-doc
- , libghc-uniplate-doc
- , libghc-unix-compat-doc
- , libghc-unordered-containers-doc
- , libghc-utf8-string-doc
- , libghc-vty-doc
- , libghc-gtk-doc
- , libghc-vte-doc
+ , libghc-diff-doc
+ , libghc-quickcheck2-doc
+ , libghc-cautious-file-doc
+ , libghc-concrete-typerep-doc
+ , libghc-data-accessor-doc
+ , libghc-data-accessor-mtl-doc
+ , libghc-data-accessor-template-doc
+ , libghc-data-default-doc
+ , libghc-derive-doc
+ , libghc-dlist-doc
+ , libghc-dyre-doc
+ , libghc-fingertree-doc
+ , libghc-ghc-paths-doc
+ , libghc-hashable-doc
+ , libghc-hint-doc
+ , libghc-mtl-doc
+ , libghc-parsec3-doc
+ , libghc-pointedlist-doc
+ , libghc-puremd5-doc
+ , libghc-random-doc
+ , libghc-regex-base-doc
+ , libghc-regex-tdfa-doc
+ , libghc-rosezipper-doc
+ , libghc-split-doc
+ , libghc-uniplate-doc
+ , libghc-unix-compat-doc
+ , libghc-unordered-containers-doc
+ , libghc-utf8-string-doc
+ , libghc-vty-doc
+ , libghc-gtk-doc
+ , libghc-vte-doc
Standards-Version: 3.9.4
Homepage: http://haskell.org/haskellwiki/Yi
Vcs-Darcs: http://darcs.debian.org/pkg-haskell/yi
diff -rN -u old-yi/patches/vty-5.1-compat new-yi/patches/vty-5.1-compat
--- old-yi/patches/vty-5.1-compat 2014-10-26 10:20:21.804410882 +0000
+++ new-yi/patches/vty-5.1-compat 2014-10-26 10:20:21.808410881 +0000
@@ -9,321 +9,338 @@
Origin: upstream, https://github.com/yi-editor/yi/commit/a42841dbeb4f716a50b82aa4c71c419f033806d5#diff-68f4dd75b91abeba23f0417a614830e5
-Index: yi-0.7.1/src/library/Yi/Config.hs
-===================================================================
---- yi-0.7.1.orig/src/library/Yi/Config.hs 2014-09-10 22:48:39.667336537 +0200
-+++ yi-0.7.1/src/library/Yi/Config.hs 2014-09-10 22:48:39.663336537 +0200
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE CPP #-}
- {-# LANGUAGE TemplateHaskell #-}
-
- module Yi.Config where
-@@ -16,9 +17,14 @@
- import Yi.Style.Library
- import {-# source #-} Yi.UI.Common
- import qualified Yi.Interact as I
-+#ifdef FRONTEND_VTY
-+import qualified Graphics.Vty as Vty
-+#endif
-
- data UIConfig = UIConfig {
-- configVtyEscDelay :: Int,
-+#ifdef FRONTEND_VTY
-+ configVty :: Vty.Config,
-+#endif
- configFontName :: Maybe String, -- ^ Font name, for the UI that support it.
- configFontSize :: Maybe Int, -- ^ Font size, for the UI that support it.
- configScrollStyle ::Maybe ScrollStyle,
-Index: yi-0.7.1/src/library/Yi/Config/Default.hs
-===================================================================
---- yi-0.7.1.orig/src/library/Yi/Config/Default.hs 2014-09-10 22:48:39.667336537 +0200
-+++ yi-0.7.1/src/library/Yi/Config/Default.hs 2014-09-10 22:48:39.663336537 +0200
-@@ -47,6 +47,7 @@
- #endif
- #ifdef FRONTEND_VTY
- import qualified Yi.UI.Vty
-+import qualified Graphics.Vty.Config as Vty
- #endif
- #ifdef FRONTEND_PANGO
- import qualified Yi.UI.Pango
-@@ -145,7 +146,6 @@
- , configAutoHideTabBar = True
- , configWindowFill = ' '
- , configTheme = defaultTheme
-- , configVtyEscDelay = 0
- }
- , defaultKm = modelessKeymapSet nilKeymap
- , startActions = []
-@@ -193,7 +193,9 @@
- toEmacsStyleConfig, toVimStyleConfig, toVim2StyleConfig, toCuaStyleConfig :: Config -> Config
- toEmacsStyleConfig cfg
- = cfg {
-- configUI = (configUI cfg) { configVtyEscDelay = 1000 , configScrollStyle = Just SnapToCenter},
-+ configUI = (configUI cfg)
-+ { configScrollStyle = Just SnapToCenter
-+ },
- defaultKm = Emacs.keymap,
- startActions = makeAction openScratchBuffer : startActions cfg,
- configInputPreprocess = escToMeta,
-Index: yi-0.7.1/src/library/Yi/Config/Simple.hs
-===================================================================
---- yi-0.7.1.orig/src/library/Yi/Config/Simple.hs 2014-09-10 22:48:39.667336537 +0200
-+++ yi-0.7.1/src/library/Yi/Config/Simple.hs 2014-09-10 22:48:39.663336537 +0200
-@@ -108,7 +108,7 @@
- startFrontEndA, configUIA, startActionsA, initialActionsA, defaultKmA,
- configInputPreprocessA, modeTableA, debugModeA,
- configRegionStyleA, configKillringAccumulateA, bufferUpdateHandlerA,
-- configVtyEscDelayA, configFontNameA, configFontSizeA, configScrollWheelAmountA,
-+ configVtyA, configFontNameA, configFontSizeA, configScrollWheelAmountA,
- configScrollStyleA, configCursorStyleA, CursorStyle(..),
- configLeftSideScrollBarA, configAutoHideScrollBarA, configAutoHideTabBarA,
- configLineWrapA, configWindowFillA, configThemeA, layoutManagersA, configVarsA,
-Index: yi-0.7.1/src/library/Yi/UI/Vty.hs
-===================================================================
---- yi-0.7.1.orig/src/library/Yi/UI/Vty.hs 2014-09-10 22:48:39.667336537 +0200
-+++ yi-0.7.1/src/library/Yi/UI/Vty.hs 2014-09-10 22:48:39.663336537 +0200
-@@ -34,7 +34,7 @@
- import Yi.Config
- import Yi.Window
- import Yi.Style as Style
--import Graphics.Vty as Vty hiding (refresh, Default)
-+import Graphics.Vty as Vty hiding (Config(..), refresh, Default, text)
- import qualified Graphics.Vty as Vty
- import Yi.Keymap (makeAction, YiM)
-
-@@ -73,11 +73,11 @@
- start cfg ch outCh editor = do
- liftIO $ do
- oattr <- getTerminalAttributes stdInput
-- v <- mkVtyEscDelay $ configVtyEscDelay $ configUI $ cfg
-+ v <- mkVty $ configVty $ configUI $ cfg
- nattr <- getTerminalAttributes stdInput
- setTerminalAttributes stdInput (withoutMode nattr ExtendedFunctions) Immediately
- -- remove the above call to setTerminalAttributes when vty does it.
-- Vty.DisplayRegion x0 y0 <- Vty.display_bounds $ Vty.terminal v
-+ (x0,y0) <- Vty.displayBounds $ Vty.outputIface v
- sz <- newIORef (fromEnum y0, fromEnum x0)
- -- fork input-reading thread. important to block *thread* on getKey
- -- otherwise all threads will block waiting for input
-@@ -97,7 +97,7 @@
- -- | Read a key. UIs need to define a method for getting events.
- getKey :: IO Yi.Event.Event
- getKey = do
-- event <- Vty.next_event v
-+ event <- Vty.nextEvent v
- case event of
- (EvResize x y) -> do
- logPutStrLn $ "UI: EvResize: " ++ show (x,y)
-@@ -146,28 +146,28 @@
-
-
- fromVtyKey :: Vty.Key -> Yi.Event.Key
--fromVtyKey (Vty.KEsc ) = Yi.Event.KEsc
--fromVtyKey (Vty.KFun x ) = Yi.Event.KFun x
--fromVtyKey (Vty.KPrtScr ) = Yi.Event.KPrtScr
--fromVtyKey (Vty.KPause ) = Yi.Event.KPause
--fromVtyKey (Vty.KASCII '\t') = Yi.Event.KTab
--fromVtyKey (Vty.KASCII c ) = Yi.Event.KASCII c
--fromVtyKey (Vty.KBS ) = Yi.Event.KBS
--fromVtyKey (Vty.KIns ) = Yi.Event.KIns
--fromVtyKey (Vty.KHome ) = Yi.Event.KHome
--fromVtyKey (Vty.KPageUp ) = Yi.Event.KPageUp
--fromVtyKey (Vty.KDel ) = Yi.Event.KDel
--fromVtyKey (Vty.KEnd ) = Yi.Event.KEnd
--fromVtyKey (Vty.KPageDown) = Yi.Event.KPageDown
--fromVtyKey (Vty.KNP5 ) = Yi.Event.KNP5
--fromVtyKey (Vty.KUp ) = Yi.Event.KUp
--fromVtyKey (Vty.KMenu ) = Yi.Event.KMenu
--fromVtyKey (Vty.KLeft ) = Yi.Event.KLeft
--fromVtyKey (Vty.KDown ) = Yi.Event.KDown
--fromVtyKey (Vty.KRight ) = Yi.Event.KRight
--fromVtyKey (Vty.KEnter ) = Yi.Event.KEnter
--fromVtyKey (Vty.KBackTab ) = error "This should be handled in fromVtyEvent"
--fromVtyKey (Vty.KBegin ) = error "Yi.UI.Vty.fromVtyKey: can't handle KBegin"
-+fromVtyKey (Vty.KEsc ) = Yi.Event.KEsc
-+fromVtyKey (Vty.KFun x ) = Yi.Event.KFun x
-+fromVtyKey (Vty.KPrtScr ) = Yi.Event.KPrtScr
-+fromVtyKey (Vty.KPause ) = Yi.Event.KPause
-+fromVtyKey (Vty.KChar '\t') = Yi.Event.KTab
-+fromVtyKey (Vty.KChar c ) = Yi.Event.KASCII c
-+fromVtyKey (Vty.KBS ) = Yi.Event.KBS
-+fromVtyKey (Vty.KIns ) = Yi.Event.KIns
-+fromVtyKey (Vty.KHome ) = Yi.Event.KHome
-+fromVtyKey (Vty.KPageUp ) = Yi.Event.KPageUp
-+fromVtyKey (Vty.KDel ) = Yi.Event.KDel
-+fromVtyKey (Vty.KEnd ) = Yi.Event.KEnd
-+fromVtyKey (Vty.KPageDown ) = Yi.Event.KPageDown
-+fromVtyKey (Vty.KCenter ) = Yi.Event.KNP5
-+fromVtyKey (Vty.KUp ) = Yi.Event.KUp
-+fromVtyKey (Vty.KMenu ) = Yi.Event.KMenu
-+fromVtyKey (Vty.KLeft ) = Yi.Event.KLeft
-+fromVtyKey (Vty.KDown ) = Yi.Event.KDown
-+fromVtyKey (Vty.KRight ) = Yi.Event.KRight
-+fromVtyKey (Vty.KEnter ) = Yi.Event.KEnter
-+fromVtyKey (Vty.KBackTab ) = error "This should be handled in fromVtyEvent"
-+fromVtyKey (Vty.KBegin ) = error "Yi.UI.Vty.fromVtyKey: can't handle KBegin"
-
- fromVtyMod :: Vty.Modifier -> Yi.Event.Modifier
- fromVtyMod Vty.MShift = Yi.Event.MShift
-@@ -229,13 +229,13 @@
- logPutStrLn "refreshing screen."
- logPutStrLn $ "startXs: " ++ show startXs
- Vty.update (vty $ ui)
-- ( pic_for_image ( vert_cat tabBarImages
-- <->
-- vert_cat (toList wImages)
-- <->
-- vert_cat (fmap formatCmdLine niceCmd)
-- )
-- ) { pic_cursor = case cursor (PL._focus renders) of
-+ ( picForImage ( vertCat tabBarImages
-+ <->
-+ vertCat (toList wImages)
-+ <->
-+ vertCat (fmap formatCmdLine niceCmd)
-+ )
-+ ) { picCursor = case cursor (PL._focus renders) of
- Just (y,x) -> Cursor (toEnum x) (toEnum $ y + PL._focus startXs)
- -- Add the position of the window to the position of the cursor
- Nothing -> NoCursor
-@@ -254,12 +254,12 @@
- where tabImages = foldr1 (<|>) $ fmap tabToVtyImage $ tabBarDescr e
- extraImage = withAttributes (tabBarAttributes uiStyle) (replicate (xss - fromEnum totalTabWidth) ' ')
-
-- totalTabWidth = Vty.image_width tabImages
-+ totalTabWidth = Vty.imageWidth tabImages
- uiStyle = configStyle $ configUI $ config ui
- tabTitle text = " " ++ text ++ " "
- tabAttr b = baseAttr b $ tabBarAttributes uiStyle
-- baseAttr True sty = attributesToAttr (appEndo (tabInFocusStyle uiStyle) sty) Vty.def_attr
-- baseAttr False sty = attributesToAttr (appEndo (tabNotFocusedStyle uiStyle) sty) Vty.def_attr `Vty.with_style` Vty.underline
-+ baseAttr True sty = attributesToAttr (appEndo (tabInFocusStyle uiStyle) sty) Vty.defAttr
-+ baseAttr False sty = attributesToAttr (appEndo (tabNotFocusedStyle uiStyle) sty) Vty.defAttr `Vty.withStyle` Vty.underline
- tabToVtyImage _tab@(TabDescr text inFocus) = Vty.string (tabAttr inFocus) (tabTitle text)
-
- -- | Determine whether it is necessary to render the tab bar
-@@ -303,7 +303,7 @@
- off = if notMini then 1 else 0
- h' = h - off
- ground = baseAttributes sty
-- wsty = attributesToAttr ground Vty.def_attr
-+ wsty = attributesToAttr ground Vty.defAttr
- eofsty = appEndo (eofStyle sty) ground
- (point, _) = runBuffer win b pointB
- (eofPoint, _) = runBuffer win b sizeB
-@@ -320,9 +320,9 @@
- -- TODO: I suspect that this costs quite a lot of CPU in the "dry run" which determines the window size;
[...incomplete...]
More information about the Pkg-haskell-commits
mailing list