[Pkg-haskell-commits] darcs: haskell-gtk: utf8.patch: Removed, applied upstream

[Joachim Breitner]

Tue Mar 29 17:56:35 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * utf8.patch: Removed, applied upstream
  Ignore-this: cb281a151ba0e271e15c0b4ff8269c3d

    M ./changelog +1
    R ./patches/
    R ./patches/series
    R ./patches/utf8.patch

Tue Mar 29 17:56:35 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * utf8.patch: Removed, applied upstream
  Ignore-this: cb281a151ba0e271e15c0b4ff8269c3d
diff -rN -u old-haskell-gtk/changelog new-haskell-gtk/changelog
--- old-haskell-gtk/changelog	2011-03-29 18:24:28.611040565 +0000
+++ new-haskell-gtk/changelog	2011-03-29 18:24:28.619040987 +0000
@@ -8,6 +8,7 @@
   * Lets be optimistic and re-enable -prof package 
   * Remove preinst script, not require with clean ghc-pkg database
   * gtk-thread-backport-597837.patch: Removed, applied upstream
+  * utf8.patch: Removed, applied upstream
 
  -- Joachim Breitner <nomeata at debian.org>  Tue, 29 Mar 2011 23:15:20 +0530
 
diff -rN -u old-haskell-gtk/patches/series new-haskell-gtk/patches/series
--- old-haskell-gtk/patches/series	2011-03-29 18:24:28.611040565 +0000
+++ new-haskell-gtk/patches/series	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-utf8.patch
diff -rN -u old-haskell-gtk/patches/utf8.patch new-haskell-gtk/patches/utf8.patch
--- old-haskell-gtk/patches/utf8.patch	2011-03-29 18:24:28.611040565 +0000
+++ new-haskell-gtk/patches/utf8.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-Description: Use withUTF8FileContents
- In systems that are not configured to use UTF-8 locales, the build was
- failing.  This patch makes the build goes right on these hosts.
-Forwarded:
- http://sourceforge.net/mailarchive/message.php?msg_name=1274896509-sup-6274%40zezinho
-Author: Marco Túlio Gontijo e Silva <marcot at debian.org>
-Last-Update: 2010-05-26
-Index: gtk-0.11.0/Gtk2HsSetup.hs
-===================================================================
---- gtk-0.11.0.orig/Gtk2HsSetup.hs	2010-05-26 14:49:49.000000000 -0300
-+++ gtk-0.11.0/Gtk2HsSetup.hs	2010-05-26 14:51:13.000000000 -0300
-@@ -455,7 +455,7 @@
- -- existance of a .chs module may not depend on some CPP condition.  
- extractDeps :: ModDep -> IO ModDep
- extractDeps md at ModDep { mdLocation = Nothing } = return md
--extractDeps md at ModDep { mdLocation = Just f } = withFileContents f $ \con -> do
-+extractDeps md at ModDep { mdLocation = Just f } = withUTF8FileContents f $ \con -> do
-   let findImports acc (('{':'#':xs):xxs) = case (dropWhile ((==) ' ') xs) of
-         ('i':'m':'p':'o':'r':'t':' ':ys) ->
-           case simpleParse (takeWhile ((/=) '#') ys) of