[Git][haskell-team/DHG_packages][master] add haskell-yi-frontend-vty.diff

Marcel Fourné (@mfourne) gitlab at salsa.debian.org
Sun Nov 12 13:59:42 GMT 2023



Marcel Fourné pushed to branch master at Debian Haskell Group / DHG_packages


Commits:
9d8e532e by Marcel Fourné at 2023-11-12T14:57:57+01:00
add haskell-yi-frontend-vty.diff

- - - - -


1 changed file:

- + p/haskell-yi-frontend-vty/debian/patches/vty-events-fix.diff


Changes:

=====================================
p/haskell-yi-frontend-vty/debian/patches/vty-events-fix.diff
=====================================
@@ -0,0 +1,58 @@
+Description: fixes type mismatch in Debian
+Author: Marcel Fourné <debian at marcelfourne.de>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout https://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: (upstream|backport|vendor|other), (<patch-url>|commit:<commit-id>)
+Bug: <upstream-bugtracker-url>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: (no|not-needed|<patch-forwarded-url>)
+Applied-Upstream: <version>, (<commit-url>|commit:<commid-id>)
+Reviewed-By: <name and email of someone who approved/reviewed the patch>
+Last-Update: 2023-11-12
+
+--- haskell-yi-frontend-vty-0.19.0.orig/src/Yi/Frontend/Vty.hs
++++ haskell-yi-frontend-vty-0.19.0/src/Yi/Frontend/Vty.hs
+@@ -62,6 +62,7 @@ import qualified Graphics.Vty
+                                                         vertCat, withBackColor,
+                                                         withForeColor,
+                                                         withStyle, (<|>))
++import qualified Graphics.Vty.Input.Events      as Vty (InternalEvent(InputEvent))
+ import           System.Exit                    (ExitCode, exitWith)
+ import           Yi.Buffer
+ import           Yi.Config
+@@ -143,10 +144,10 @@ start config submitEvents submitActions
+         getEvent = do
+           event <- atomically (readTChan inputChan)
+           case event of
+-            (Vty.EvResize _ _) -> do
++            (Vty.InputEvent (Vty.EvResize _ _)) -> do
+                 submitActions []
+                 getEvent
+-            _ -> return (fromVtyEvent event)
++            Vty.InputEvent ievent -> return (fromVtyEvent ievent)
+
+         renderLoop :: IO ()
+         renderLoop = do
+--- haskell-yi-frontend-vty-0.19.0.orig/src/Yi/Frontend/Vty/Conversions.hs
++++ haskell-yi-frontend-vty-0.19.0/src/Yi/Frontend/Vty/Conversions.hs
+@@ -6,12 +6,14 @@ module Yi.Frontend.Vty.Conversions
+     ) where
+
+ import           Data.List    (nub, sort)
+-import qualified Graphics.Vty as Vty (Attr, Color, Event (EvKey), Key (KBS, KBackTab, KBegin, KCenter, KChar, KDel, KDown, KEnd, KEnter, KEsc, KFun, KHome, KIns, KLeft, KMenu, KPageDown, KPageUp, KPause, KPrtScr, KRight, KUp),
+-                                      Modifier (..), black, blue, brightBlack,
++import qualified Graphics.Vty as Vty (Attr, Color, black, blue, brightBlack,
+                                       brightBlue, brightCyan, brightGreen,
+                                       brightMagenta, brightRed, brightWhite,
+                                       brightYellow, cyan, green, magenta, red,
+                                       rgbColor, white, yellow)
++import qualified Graphics.Vty.Input.Events as Vty (Event (EvKey),
++                                                   Key (KBS, KBackTab, KBegin, KCenter, KChar, KDel, KDown, KEnd, KEnter, KEsc, KFun, KHome, KIns, KLeft, KMenu, KPageDown, KPageUp, KPause, KPrtScr, KRight, KUp),
++                                                   Modifier (..))
+ import qualified Yi.Event     (Event (..), Key (..), Modifier (MCtrl, MMeta, MShift))
+ import qualified Yi.Style     (Color (..))



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/9d8e532eb934bcdd4ee01be59abf7206fc5c331f

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/9d8e532eb934bcdd4ee01be59abf7206fc5c331f
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20231112/a1a284b1/attachment-0001.htm>


More information about the Pkg-haskell-commits mailing list