Fix stripping of unicode byte order mark (maybe something has changed

in GHC 7). Upstream git commit c1afaea3af917f857ee5ff5cbc0c963f96acc98f
This commit is contained in:
dcoppa 2011-09-23 12:11:01 +00:00
parent 061e30272d
commit 1ab24ad84d
2 changed files with 13 additions and 7 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.16 2011/09/16 11:13:38 espie Exp $
# $OpenBSD: Makefile,v 1.17 2011/09/23 12:11:01 dcoppa Exp $
COMMENT = command line podcast aggregator
DISTNAME = hpodder-1.1.5
REVISION = 9
REVISION = 10
CATEGORIES = net
HOMEPAGE = https://github.com/jgoerzen/hpodder/wiki
HOMEPAGE = http://wiki.github.com/jgoerzen/hpodder/
MAINTAINER = David Coppa <dcoppa@openbsd.org>

View File

@ -1,9 +1,12 @@
$OpenBSD: patch-FeedParser_hs,v 1.1 2011/05/26 08:24:59 dcoppa Exp $
$OpenBSD: patch-FeedParser_hs,v 1.2 2011/09/23 12:11:01 dcoppa Exp $
make code compatible with HaXml 1.20
fix stripping of unicode byte order mark
(maybe something has changed in GHC 7)
--- FeedParser.hs.orig Wed Jul 2 17:32:27 2008
+++ FeedParser.hs Tue May 24 13:32:57 2011
+++ FeedParser.hs Fri Sep 23 13:24:38 2011
@@ -33,6 +33,7 @@ module FeedParser where
import Types
import Text.XML.HaXml
@ -12,15 +15,18 @@ make code compatible with HaXml 1.20
import Utils
import Data.Maybe.Utils
import Data.Char
@@ -76,7 +77,7 @@ parse fp name =
@@ -76,9 +77,9 @@ parse fp name =
let feeditems = getEnclosures doc
return $ Right $
(Feed {channeltitle = title, items = feeditems})
- where getContent (Document _ _ e _) = CElem e
+ where getContent (Document _ _ e _) = CElem e noPos
unifrob ('\xef':'\xbb':'\xbf':x) = x -- Strip off unicode BOM
-unifrob ('\xef':'\xbb':'\xbf':x) = x -- Strip off unicode BOM
+unifrob ('\xfeff':x) = x -- Strip off unicode BOM
unifrob x = x
unesc = xmlUnEscape stdXmlEscaper
@@ -121,13 +122,13 @@ channel =
-- Utilities
--------------------------------------------------