diff --git a/games/hs-scroll/files/patch-lib_UI_NCurses.chs b/games/hs-scroll/files/patch-lib_UI_NCurses.chs index a1045151d627..7e5a2d8c9ef4 100644 --- a/games/hs-scroll/files/patch-lib_UI_NCurses.chs +++ b/games/hs-scroll/files/patch-lib_UI_NCurses.chs @@ -1,26 +1,26 @@ --- ncurses-0.2.16/lib/UI/NCurses.chs.orig 2016-08-29 01:09:37 UTC -+++ ncurses-0.2.16/lib/UI/NCurses.chs ++++ _cabal_deps/ncurses-0.2.16/lib/UI/NCurses.chs @@ -435,12 +435,12 @@ setColor (ColorID pair) = withWindow_ "s -- | Add some text to the window, at the current cursor position. drawString :: String -> Update () drawString str = withWindow_ "drawString" $ \win -> - withCWString str ({# call waddwstr #} win) + withCWString str $ \s -> ({# call waddwstr #} win) (castPtr s) -- | Add some text to the window, at the current cursor position. drawText :: T.Text -> Update () drawText txt = withWindow_ "drawText" $ \win -> - withCWString (T.unpack txt) ({# call waddwstr #} win) + withCWString (T.unpack txt) $ \s -> ({# call waddwstr #} win) (castPtr s) drawGlyph :: Glyph -> Update () drawGlyph glyph = withWindow_ "drawGlyph" $ \win -> @@ -718,7 +718,7 @@ withGlyph (Glyph char attrs) io = let cAttrs = foldl' (\acc a -> acc .|. attrToInt a) 0 attrs in withCWStringLen [char] $ \(cChars, cCharsLen) -> allocaBytes {# sizeof cchar_t #} $ \pBuf -> do - {# call hsncurses_init_cchar_t #} (CCharT pBuf) cAttrs cChars (fromIntegral cCharsLen) + {# call hsncurses_init_cchar_t #} (CCharT pBuf) cAttrs (castPtr cChars) (fromIntegral cCharsLen) io (CCharT pBuf) -- | Upper left corner diff --git a/games/hs-scroll/files/patch-ncurses-0.2.16_lib_UI_NCurses_Enums.chs b/games/hs-scroll/files/patch-ncurses-0.2.16_lib_UI_NCurses_Enums.chs index b7c40c960a47..44ccb6305405 100644 --- a/games/hs-scroll/files/patch-ncurses-0.2.16_lib_UI_NCurses_Enums.chs +++ b/games/hs-scroll/files/patch-ncurses-0.2.16_lib_UI_NCurses_Enums.chs @@ -1,19 +1,19 @@ --- ncurses-0.2.16/lib/UI/NCurses/Enums.chs.orig 2016-08-29 01:09:37 UTC -+++ ncurses-0.2.16/lib/UI/NCurses/Enums.chs ++++ _cabal_deps/ncurses-0.2.16/lib/UI/NCurses/Enums.chs @@ -41,7 +41,7 @@ class Enum a where pred, succ :: a -> a pred = error "ncurses Enum: pred" succ = error "ncurses Enum: succ" - + enumFrom :: a -> [a] enumFrom = error "ncurses Enum: enumFrom" enumFromThen :: a -> a -> [a] @@ -195,7 +195,6 @@ enum hsncurses_Key , hsncurses_KEY_UNDO = KEY_UNDO , hsncurses_KEY_MOUSE = KEY_MOUSE , hsncurses_KEY_RESIZE = KEY_RESIZE -, hsncurses_KEY_EVENT = KEY_EVENT }; #endc