From e16c3824324d2ed3297e9e7287d171c69a2a114c Mon Sep 17 00:00:00 2001 From: Mark Wright Date: Sat, 4 Apr 2015 01:00:14 +0000 Subject: [PATCH] Fix feed-0.3.9.2 build with utf8-string-1.0, patch by Alexander Vershilov (qnikst). Fix build with ghc 7.10.1, patch by me. Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0x618E971F --- dev-haskell/feed/ChangeLog | 11 +++++-- dev-haskell/feed/Manifest | 13 +++++--- dev-haskell/feed/feed-0.3.9.2-r1.ebuild | 32 +++++++++++++++++++ .../feed/files/feed-0.3.9.2-ghc-7.10.patch | 20 ++++++++++++ .../feed/files/feed-0.3.9.2-utf8-string.patch | 25 +++++++++++++++ 5 files changed, 94 insertions(+), 7 deletions(-) create mode 100644 dev-haskell/feed/feed-0.3.9.2-r1.ebuild create mode 100644 dev-haskell/feed/files/feed-0.3.9.2-ghc-7.10.patch create mode 100644 dev-haskell/feed/files/feed-0.3.9.2-utf8-string.patch diff --git a/dev-haskell/feed/ChangeLog b/dev-haskell/feed/ChangeLog index 03d65e53e7b0..c02045b2116b 100644 --- a/dev-haskell/feed/ChangeLog +++ b/dev-haskell/feed/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-haskell/feed -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/feed/ChangeLog,v 1.5 2014/07/25 09:16:35 slyfox Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/feed/ChangeLog,v 1.6 2015/04/04 01:00:07 gienah Exp $ + +*feed-0.3.9.2-r1 (04 Apr 2015) + + 04 Apr 2015; Mark Wright +feed-0.3.9.2-r1.ebuild, + +files/feed-0.3.9.2-ghc-7.10.patch, +files/feed-0.3.9.2-utf8-string.patch: + Fix feed-0.3.9.2 build with utf8-string-1.0, patch by Alexander Vershilov + (qnikst). Fix build with ghc 7.10.1, patch by me. 25 Jul 2014; Sergei Trofimovich feed-0.3.9.2.ebuild: Drop trailing '.' from description. diff --git a/dev-haskell/feed/Manifest b/dev-haskell/feed/Manifest index 0a5e0572e2dd..fbfb5bb5e4d3 100644 --- a/dev-haskell/feed/Manifest +++ b/dev-haskell/feed/Manifest @@ -1,14 +1,17 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX feed-0.3.9.2-ghc-7.10.patch 701 SHA256 6e3b59128a3707445c166084ba0f9aaf9e0cca5d73bffdcde18a89df3c2980f8 SHA512 ee36222acdbdbf04aab2088d56a8102b7466d169e15dfa9cc88916d5c9616db7545c7f2ed033dc965c2c09c6d6aac815e50c3a99b4e9a9cd96414ecb8498fb36 WHIRLPOOL fd563b5ef57b7000b55d767551857aaaa7a11337c468f3c322927f9a819662675e1a754886ec25d8fc8e76f2ff0af787c9fe2e2ad4ea873c42528c0f4d1a57ee +AUX feed-0.3.9.2-utf8-string.patch 728 SHA256 862700c70345f1fa13280e65de96c5cdea4b3e29efae7bda93a8a3f86f765640 SHA512 c996a973ce6d9e8e5a9c7b2b09a31f9e4d50706963c5af129b4e7fd0cb3555820f78a0adc95d14c48f7af1f78dffb32157d2a8486ac79fef335d2cdddff1bb80 WHIRLPOOL 2477e2113285ec57e9e3ec9bcc8f0f252f30e49867375a14b0b26a6196b5194af32ba193bebdd17ee334af788fb7153b1026c2c780e8ec34345348b15cebb61d DIST feed-0.3.9.2.tar.gz 73353 SHA256 ef1d23d130b766186a0bacd6e4807279cab681712b0fb09d1ed1ee1b3c154f17 SHA512 36e9d75d7bab4c26967d39a20c1b8382a24f2f5059dadf0425bbcc16a659587a842f948a456d63cb32660feb4d7d56ffdf6aead7ec5c40abb678b9fdce25ff0f WHIRLPOOL 953bda571eb1f8e8925459065e52e8759db5253f433f82427c3ff246c0ce3d3cf3c26a04a751272d216badc64677938bdf1f0fb309c9007ff8c115680036bb92 +EBUILD feed-0.3.9.2-r1.ebuild 854 SHA256 bb6a53b41c6599873a11816aca9a0e92f3d948d0b98dba2cd7539dd47aa6bc58 SHA512 cd201bbab0b3224da2def3122a65e083dd7eec037de9bda0bc789d796ecff0a2e33a81161368a88a1ecce1ba31a6cd80b936361df9a9bb5d4c881bfd1297112f WHIRLPOOL 2e29cf6bdc54d84b9474c11decfe343cc63bbe8425acf7a2a8c787ef374a9457694a227f41b93ed46ba95f8209790c7257fd709c08996cf3cff6f2601d77e34e EBUILD feed-0.3.9.2.ebuild 741 SHA256 1c3b7e5ec8fe938a880a1dc8cbef82f0dd9a3d45be81526b5d22cb107be19e7e SHA512 55e9bbb66c476a3c565ae5823c7e6fe8e2e1da21c72eca45cead9e2bb7bef06bc43095c276a1ed85a85fd06929c1d1df5fe35fd126e84f31fbdc0cf8cff4d06b WHIRLPOOL cd7b52b59b74e65797de3de140b5d10989dc34c3b3880def731836882557cdd95cb5ca6b572eacf2a2da718d6dbe99d2335cfdfc3d601099126c9fdbec57d9ad -MISC ChangeLog 874 SHA256 e356dca0f52ddfa7a9f57bf4538162fbde8b2a8f9e95cae1018da7a4d9870ea2 SHA512 a79dde1c448c30adf52429cb4a2010240aadbe7c094cba94a413b93135cb4b1e1da823c77922f95ce1bd43970780d44565d4b391504d431b3d3ade9f26c2402c WHIRLPOOL 9ef24c9eed253bac2f6befb4dc3c30c6c2ec6187102359fcd525896cae77c7c07affb83905e589a1ae02aa3179f52a86529c3b9963f6818bc0bace9affc67fc9 +MISC ChangeLog 1184 SHA256 6069d319c9a38292926b862693a2fba65e79825cfb39dc2a029541df3bbd6bb8 SHA512 f89fcd252db79b40eb72a02557808765dbcc40d5fd3458805684f99be403747d8b3a5453bc845858741a9b4a900f8cfaaeeb082733e50bd0d132ab1ff1a76d37 WHIRLPOOL db528bd57e4e3f63afa7c17d211c2aa0cd9d12aef9914aba9f8463c9530a75357214f28851496c6a1825b6166ed880dcd045569cd6d28dcc36eb54c16e43766c MISC metadata.xml 256 SHA256 f250272ca8cbc96cb1ed54374fe462e8362675beef37854e2bf54649c72e185b SHA512 52f5fcd4fcc8fcf05df6b9ca97ae6377eece962fbcdc176ebc4faaee44e6969ca1035717bac82bc144a77c6dd3e948a6b3ac73c03e05d2689b886a33110ec243 WHIRLPOOL 27e9a03736d880d15f98c77e836f003530b37b0e9d6aa904daa6e87907fee8de972ac9be07b7c8f0ac61c0661134de14eb462b8334c8e92a52a904bd0dc71348 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) +Version: GnuPG v2 -iEYEAREIAAYFAlPSIPQACgkQcaHudmEf86rnWQCeLg+Cee765Ax0Njam2MaASlpS -7FgAn3a+kvSJCNoyUbfWBaDyS0bKmlak -=2BVL +iF4EAREIAAYFAlUfN50ACgkQoBEVQmGOlx9r/AD7B6JfsyF91dkivC5WcqT0gMX8 +V+MuqIo51hiKdSjymfsA+weGhJBnNUpFENdE74D0fwlVfB5TajayHycOfXC2/QRs +=IdXR -----END PGP SIGNATURE----- diff --git a/dev-haskell/feed/feed-0.3.9.2-r1.ebuild b/dev-haskell/feed/feed-0.3.9.2-r1.ebuild new file mode 100644 index 000000000000..4f8a758c87fb --- /dev/null +++ b/dev-haskell/feed/feed-0.3.9.2-r1.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/feed/feed-0.3.9.2-r1.ebuild,v 1.1 2015/04/04 01:00:07 gienah Exp $ + +EAPI=5 + +# ebuild generated by hackport 0.3.4.9999 + +CABAL_FEATURES="lib profile haddock hoogle hscolour" +inherit haskell-cabal + +DESCRIPTION="Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds" +HOMEPAGE="https://github.com/sof/feed" +SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="dev-haskell/utf8-string:=[profile?] + >=dev-haskell/xml-1.2.6:=[profile?] + >=dev-lang/ghc-6.12.1:= +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-1.8.0.2 +" + +src_prepare() { + epatch "${FILESDIR}"/"${P}"-utf8-string.patch + epatch "${FILESDIR}"/"${P}"-ghc-7.10.patch +} diff --git a/dev-haskell/feed/files/feed-0.3.9.2-ghc-7.10.patch b/dev-haskell/feed/files/feed-0.3.9.2-ghc-7.10.patch new file mode 100644 index 000000000000..41f672c8f910 --- /dev/null +++ b/dev-haskell/feed/files/feed-0.3.9.2-ghc-7.10.patch @@ -0,0 +1,20 @@ +--- feed-0.3.9.2-orig/Text/Feed/Query.hs 2013-10-28 02:48:21.000000000 +1100 ++++ feed-0.3.9.2/Text/Feed/Query.hs 2015-04-04 11:48:36.759173147 +1100 +@@ -1,3 +1,4 @@ ++{-# LANGUAGE CPP #-} + -------------------------------------------------------------------- + -- | + -- Module : Text.Feed.Query +@@ -62,7 +63,12 @@ + import Data.Maybe + + -- for getItemPublishDate rfc822 date parsing. ++#if MIN_VERSION_time(1,5,0) ++import System.Locale ( rfc822DateFormat, iso8601DateFormat ) ++import Data.Time ( defaultTimeLocale ) ++#else + import System.Locale ( rfc822DateFormat, iso8601DateFormat, defaultTimeLocale ) ++#endif + import Data.Time.Format ( ParseTime, parseTime ) + + feedItems :: Feed.Feed -> [Feed.Item] diff --git a/dev-haskell/feed/files/feed-0.3.9.2-utf8-string.patch b/dev-haskell/feed/files/feed-0.3.9.2-utf8-string.patch new file mode 100644 index 000000000000..323ae701cde4 --- /dev/null +++ b/dev-haskell/feed/files/feed-0.3.9.2-utf8-string.patch @@ -0,0 +1,25 @@ +diff --git a/Text/Feed/Import.hs b/Text/Feed/Import.hs +index 8fde5f9..c001cee 100644 +--- a/Text/Feed/Import.hs ++++ b/Text/Feed/Import.hs +@@ -12,6 +12,7 @@ + -- + -------------------------------------------------------------------- + ++{-# LANGUAGE CPP #-} + module Text.Feed.Import + ( parseFeedFromFile -- :: FilePath -> IO Feed + , parseFeedString -- :: String -> IO Feed +@@ -32,7 +33,12 @@ import Text.XML.Light.Lexer ( XmlSource ) + + import Control.Monad + ++#if MIN_VERSION_utf8_string(1,0,0) ++import Prelude as UTF8 (readFile) ++import Prelude ++#else + import System.IO.UTF8 as UTF8 ( readFile ) ++#endif + + -- | 'parseFeedFromFile fp' reads in the contents of the file at @fp@; + -- the assumed encoding is UTF-8. -- 2.26.2