Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-vty for openSUSE:Factory checked in at 2022-10-13 15:43:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-vty (Old) and /work/SRC/openSUSE:Factory/.ghc-vty.new.2275 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-vty" Thu Oct 13 15:43:35 2022 rev:10 rq:1008547 version:5.37 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-vty/ghc-vty.changes 2022-08-01 21:32:24.386002025 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-vty.new.2275/ghc-vty.changes 2022-10-13 15:43:55.814947004 +0200 @@ -1,0 +2,11 @@ +Sat Sep 17 02:06:39 UTC 2022 - Peter Simons <[email protected]> + +- Update vty to version 5.37. + 5.37 + ---- + + * The Xterm backend is now used when `TERM` matches `rxvt` or `tmux`. + * PictureToSpans now uses `error`, not `fail`, to avoid dependence on + soon-to-be-removed `MonadFail` instance for `ST` (#248) + +------------------------------------------------------------------- Old: ---- vty-5.36.tar.gz New: ---- vty-5.37.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-vty.spec ++++++ --- /var/tmp/diff_new_pack.4PvC0x/_old 2022-10-13 15:43:56.442948230 +0200 +++ /var/tmp/diff_new_pack.4PvC0x/_new 2022-10-13 15:43:56.446948238 +0200 @@ -19,7 +19,7 @@ %global pkg_name vty %bcond_with tests Name: ghc-%{pkg_name} -Version: 5.36 +Version: 5.37 Release: 0 Summary: A simple terminal UI library License: BSD-3-Clause ++++++ vty-5.36.tar.gz -> vty-5.37.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vty-5.36/CHANGELOG.md new/vty-5.37/CHANGELOG.md --- old/vty-5.36/CHANGELOG.md 2001-09-09 03:46:40.000000000 +0200 +++ new/vty-5.37/CHANGELOG.md 2001-09-09 03:46:40.000000000 +0200 @@ -1,4 +1,11 @@ +5.37 +---- + +* The Xterm backend is now used when `TERM` matches `rxvt` or `tmux`. +* PictureToSpans now uses `error`, not `fail`, to avoid dependence on + soon-to-be-removed `MonadFail` instance for `ST` (#248) + 5.36 ---- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vty-5.36/src/Graphics/Vty/Attributes/Color.hs new/vty-5.37/src/Graphics/Vty/Attributes/Color.hs --- old/vty-5.36/src/Graphics/Vty/Attributes/Color.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/vty-5.37/src/Graphics/Vty/Attributes/Color.hs 2001-09-09 03:46:40.000000000 +0200 @@ -125,7 +125,7 @@ term <- catch (Just <$> Terminfo.setupTerm termName') (\(_ :: Terminfo.SetupTermError) -> return Nothing) let getCap cap = term >>= \t -> Terminfo.getCapability t cap - termColors = fromMaybe 0 $ getCap (Terminfo.tiGetNum "colors") + termColors = fromMaybe 0 $! getCap (Terminfo.tiGetNum "colors") colorterm <- lookupEnv "COLORTERM" return $ if | termColors < 8 -> NoColor diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vty-5.36/src/Graphics/Vty/Output.hs new/vty-5.37/src/Graphics/Vty/Output.hs --- old/vty-5.36/src/Graphics/Vty/Output.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/vty-5.37/src/Graphics/Vty/Output.hs 2001-09-09 03:46:40.000000000 +0200 @@ -55,15 +55,15 @@ -- -- Selection of a terminal is done as follows: -- --- * If TERM contains "xterm" or "screen", use XTermColor. +-- * If TERM starts with "xterm", "screen" or "tmux", use XTermColor. -- * otherwise use the TerminfoBased driver. outputForConfig :: Config -> IO Output outputForConfig Config{ outputFd = Just fd, termName = Just termName , colorMode = Just colorMode, .. } = do - t <- if "xterm" `isPrefixOf` termName || "screen" `isPrefixOf` termName - then XTermColor.reserveTerminal termName fd colorMode - -- Not an xterm-like terminal. try for generic terminfo. - else TerminfoBased.reserveTerminal termName fd colorMode + t <- if isXtermLike termName + then XTermColor.reserveTerminal termName fd colorMode + -- Not an xterm-like terminal. try for generic terminfo. + else TerminfoBased.reserveTerminal termName fd colorMode case mouseMode of Just s -> setMode t Mouse s @@ -76,6 +76,18 @@ return t outputForConfig config = (<> config) <$> standardIOConfig >>= outputForConfig +isXtermLike :: String -> Bool +isXtermLike termName = + any (`isPrefixOf` termName) xtermLikeTerminalNamePrefixes + +xtermLikeTerminalNamePrefixes :: [String] +xtermLikeTerminalNamePrefixes = + [ "xterm" + , "screen" + , "tmux" + , "rxvt" + ] + -- | Sets the cursor position to the given output column and row. -- -- This is not necessarily the same as the character position with the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vty-5.36/src/Graphics/Vty/PictureToSpans.hs new/vty-5.37/src/Graphics/Vty/PictureToSpans.hs --- old/vty-5.36/src/Graphics/Vty/PictureToSpans.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/vty-5.37/src/Graphics/Vty/PictureToSpans.hs 2001-09-09 03:46:40.000000000 +0200 @@ -83,7 +83,7 @@ | otherwise = do layerOps <- mapM (`buildSpans` r) (picLayers pic) case layerOps of - [] -> fail "empty picture" + [] -> error "empty picture" [ops] -> substituteSkips (picBackground pic) ops -- instead of merging ops after generation the merging can -- be performed as part of snocOp. @@ -113,7 +113,7 @@ -- At this point we decide if the background character is single -- column or not. obviously, single column is easier. case safeWcwidth backgroundChar of - w | w == 0 -> fail $ "invalid background character " ++ show backgroundChar + w | w == 0 -> error $ "invalid background character " ++ show backgroundChar | w == 1 -> do forM_ [0 .. MVector.length ops - 1] $ \row -> do rowOps <- MVector.read ops row @@ -296,7 +296,7 @@ -> BlitM s () addMaybeClippedJoin name skip remaining offset i0Dim i0 i1 size = do state <- get - when (state^.remaining <= 0) $ fail $ name ++ " with remaining <= 0" + when (state^.remaining <= 0) $ error $ name ++ " with remaining <= 0" case state^.skip of s | s > size -> put $ state & skip %~ subtract size | s == 0 -> if state^.remaining > i0Dim @@ -316,7 +316,7 @@ | s >= i0Dim -> do put $ state & skip %~ subtract i0Dim addMaybeClipped i1 - _ -> fail $ name ++ " has unhandled skip class" + _ -> error $ name ++ " has unhandled skip class" addUnclippedText :: Attr -> DisplayText -> BlitM s () addUnclippedText a txt = do @@ -344,5 +344,5 @@ ops <- MVector.read theMrowOps row let ops' = Vector.snoc ops op when (spanOpsAffectedColumns ops' > regionWidth theRegion) - $ fail $ "row " ++ show row ++ " now exceeds region width" + $ error $ "row " ++ show row ++ " now exceeds region width" MVector.write theMrowOps row ops' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vty-5.36/vty.cabal new/vty-5.37/vty.cabal --- old/vty-5.36/vty.cabal 2001-09-09 03:46:40.000000000 +0200 +++ new/vty-5.37/vty.cabal 2001-09-09 03:46:40.000000000 +0200 @@ -1,5 +1,5 @@ name: vty -version: 5.36 +version: 5.37 license: BSD3 license-file: LICENSE author: AUTHORS
