diffing dir...
Sat Jan 5 10:38:52 GMT 2013 Hamish Mackenzie <ham...@go...>
* Fix for ghci and template haskell on Win32
Ignore-this: fde0d924bae880ea1d331fb76f589cd8
hunk ./cairo/Gtk2HsSetup.hs 59
-import Data.List (isPrefixOf, isSuffixOf, nub, minimumBy)
+import Data.List (isPrefixOf, isSuffixOf, nub, minimumBy, stripPrefix)
hunk ./cairo/Gtk2HsSetup.hs 61
-import Data.Char (isAlpha)
+import Data.Char (isAlpha, isNumber)
hunk ./cairo/Gtk2HsSetup.hs 103
- case filter (("lib" ++ lib) `isPrefixOf`) dlls of
+ case filter (isLib lib) dlls of
hunk ./cairo/Gtk2HsSetup.hs 114
-
+ isLib lib dll =
+ case stripPrefix ("lib"++lib) dll of
+ Just ('.':_) -> True
+ Just ('-':n:_) | isNumber n -> True
+ _ -> False
+ [_$_]
hunk ./gio/Gtk2HsSetup.hs 59
-import Data.List (isPrefixOf, isSuffixOf, nub)
-import Data.Char (isAlpha)
+import Data.List (isPrefixOf, isSuffixOf, stripPrefix, nub)
+import Data.Char (isAlpha, isNumber)
hunk ./gio/Gtk2HsSetup.hs 102
- case filter (("lib" ++ lib) `isPrefixOf`) dlls of
+ case filter (isLib lib) dlls of
hunk ./gio/Gtk2HsSetup.hs 105
-
+ where
+ isLib lib dll =
+ case stripPrefix ("lib"++lib) dll of
+ Just ('.':_) -> True
+ Just ('-':n:_) | isNumber n -> True
+ _ -> False
+ [_$_]
hunk ./glib/Gtk2HsSetup.hs 59
-import Data.List (isPrefixOf, isSuffixOf, nub)
-import Data.Char (isAlpha)
+import Data.List (isPrefixOf, isSuffixOf, stripPrefix, nub)
+import Data.Char (isAlpha, isNumber)
hunk ./glib/Gtk2HsSetup.hs 102
- case filter (("lib" ++ lib) `isPrefixOf`) dlls of
+ case filter (isLib lib) dlls of
hunk ./glib/Gtk2HsSetup.hs 105
-
+ where
+ isLib lib dll =
+ case stripPrefix ("lib"++lib) dll of
+ Just ('.':_) -> True
+ Just ('-':n:_) | isNumber n -> True
+ _ -> False
+ [_$_]
hunk ./gtk/Gtk2HsSetup.hs 59
-import Data.List (isPrefixOf, isSuffixOf, nub)
-import Data.Char (isAlpha)
+import Data.List (isPrefixOf, isSuffixOf, stripPrefix, nub)
+import Data.Char (isAlpha, isNumber)
hunk ./gtk/Gtk2HsSetup.hs 102
- case filter (("lib" ++ lib) `isPrefixOf`) dlls of
+ case filter (isLib lib) dlls of
hunk ./gtk/Gtk2HsSetup.hs 105
-
+ where
+ isLib lib dll =
+ case stripPrefix ("lib"++lib) dll of
+ Just ('.':_) -> True
+ Just ('-':n:_) | isNumber n -> True
+ _ -> False
+ [_$_]
hunk ./pango/Gtk2HsSetup.hs 59
-import Data.List (isPrefixOf, isSuffixOf, nub)
-import Data.Char (isAlpha)
+import Data.List (isPrefixOf, isSuffixOf, stripPrefix, nub)
+import Data.Char (isAlpha, isNumber)
hunk ./pango/Gtk2HsSetup.hs 102
- case filter (("lib" ++ lib) `isPrefixOf`) dlls of
+ case filter (isLib lib) dlls of
hunk ./pango/Gtk2HsSetup.hs 105
-
+ where
+ isLib lib dll =
+ case stripPrefix ("lib"++lib) dll of
+ Just ('.':_) -> True
+ Just ('-':n:_) | isNumber n -> True
+ _ -> False
+ [_$_]
|
