summaryrefslogtreecommitdiff
path: root/p/haskell-gtk3/debian
diff options
context:
space:
mode:
authorJoachim Breitner <mail@joachim-breitner.de>2011-03-29 21:56:35 +0400
committerJoachim Breitner <mail@joachim-breitner.de>2011-03-29 21:56:35 +0400
commitdc116c69de2bfa0c05f6bee7bd3dfba439cda3c5 (patch)
tree0dfb3a07e0d5c5c349833253793a31062ac70140 /p/haskell-gtk3/debian
parent3c96977531e9da8a18a87ce30b1385a18798b5f6 (diff)
downloadDHG_packages-dc116c69de2bfa0c05f6bee7bd3dfba439cda3c5.tar.gz
haskell-gtk3: utf8.patch: Removed, applied upstream
Diffstat (limited to 'p/haskell-gtk3/debian')
-rw-r--r--p/haskell-gtk3/debian/changelog1
-rw-r--r--p/haskell-gtk3/debian/patches/series1
-rw-r--r--p/haskell-gtk3/debian/patches/utf8.patch20
3 files changed, 1 insertions, 21 deletions
diff --git a/p/haskell-gtk3/debian/changelog b/p/haskell-gtk3/debian/changelog
index d3ea7ae28..c35544f62 100644
--- a/p/haskell-gtk3/debian/changelog
+++ b/p/haskell-gtk3/debian/changelog
@@ -8,6 +8,7 @@ haskell-gtk (0.12.0-1) UNRELEASED; urgency=low
* 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@debian.org> Tue, 29 Mar 2011 23:15:20 +0530
diff --git a/p/haskell-gtk3/debian/patches/series b/p/haskell-gtk3/debian/patches/series
deleted file mode 100644
index 58db47099..000000000
--- a/p/haskell-gtk3/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-utf8.patch
diff --git a/p/haskell-gtk3/debian/patches/utf8.patch b/p/haskell-gtk3/debian/patches/utf8.patch
deleted file mode 100644
index e967adfd9..000000000
--- a/p/haskell-gtk3/debian/patches/utf8.patch
+++ /dev/null
@@ -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@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@ModDep { mdLocation = Nothing } = return md
--extractDeps md@ModDep { mdLocation = Just f } = withFileContents f $ \con -> do
-+extractDeps md@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