diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2016-01-16 22:25:28 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2016-01-16 22:25:28 +0000 |
| commit | 0f09e4cef36a5727550afc2f4781a92526fb87c4 (patch) | |
| tree | 72344e32c13b92b1b4634631403f830245b4939d /dev-haskell/wxdirect | |
| parent | net-ftp/proftpd: drop old vulnerable versions, bug #567252 (diff) | |
| download | gentoo-0f09e4cef36a5727550afc2f4781a92526fb87c4.tar.gz gentoo-0f09e4cef36a5727550afc2f4781a92526fb87c4.tar.bz2 gentoo-0f09e4cef36a5727550afc2f4781a92526fb87c4.zip | |
dev-haskell/wxdirect: tweak for ghc-7.10, bug #561254
Package-Manager: portage-2.2.26
Diffstat (limited to 'dev-haskell/wxdirect')
| -rw-r--r-- | dev-haskell/wxdirect/files/wxdirect-0.13.1.3-ghc-7.10.patch | 25 | ||||
| -rw-r--r-- | dev-haskell/wxdirect/wxdirect-0.13.1.3.ebuild | 7 | ||||
| -rw-r--r-- | dev-haskell/wxdirect/wxdirect-0.90.1.1.ebuild | 6 |
3 files changed, 34 insertions, 4 deletions
diff --git a/dev-haskell/wxdirect/files/wxdirect-0.13.1.3-ghc-7.10.patch b/dev-haskell/wxdirect/files/wxdirect-0.13.1.3-ghc-7.10.patch new file mode 100644 index 000000000000..38889be35d39 --- /dev/null +++ b/dev-haskell/wxdirect/files/wxdirect-0.13.1.3-ghc-7.10.patch @@ -0,0 +1,25 @@ +diff --git a/src/HaskellNames.hs b/src/HaskellNames.hs +index 6e1910e..bd61137 100644 +--- a/src/HaskellNames.hs ++++ b/src/HaskellNames.hs +@@ -147,6 +147,7 @@ isBuiltin name + {----------------------------------------------------------------------------------------- + Haddock prologue + -----------------------------------------------------------------------------------------} ++getPrologue :: [Char] -> [Char] -> [Char] -> [String] -> IO [String] + getPrologue moduleName content contains inputFiles + = do time <- getCurrentTime + return (prologue time) +diff --git a/wxdirect.cabal b/wxdirect.cabal +index 83be4af..02b56af 100644 +--- a/wxdirect.cabal ++++ b/wxdirect.cabal +@@ -61,7 +61,7 @@ executable wxdirect-2.8 + + build-depends: + parsec >= 2.1.0 && < 4, +- time >= 1.0 && < 1.5, ++ time >= 1.0, + strict >= 0.3 && < 1.0, + directory >= 1.0 && < 2.0 + diff --git a/dev-haskell/wxdirect/wxdirect-0.13.1.3.ebuild b/dev-haskell/wxdirect/wxdirect-0.13.1.3.ebuild index 9ef5ed2755f9..116f193fdc99 100644 --- a/dev-haskell/wxdirect/wxdirect-0.13.1.3.ebuild +++ b/dev-haskell/wxdirect/wxdirect-0.13.1.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -28,7 +28,10 @@ DEPEND="${RDEPEND} >=dev-haskell/cabal-1.8.0.2 " -PATCHES=("${FILESDIR}/${PN}-0.13.1.3-ghc-7.6.patch") +PATCHES=( + "${FILESDIR}"/${PN}-0.13.1.3-ghc-7.6.patch + "${FILESDIR}"/${PN}-0.13.1.3-ghc-7.10.patch +) src_prepare() { base_src_prepare diff --git a/dev-haskell/wxdirect/wxdirect-0.90.1.1.ebuild b/dev-haskell/wxdirect/wxdirect-0.90.1.1.ebuild index 5dfb9b3d514e..74e259d0e503 100644 --- a/dev-haskell/wxdirect/wxdirect-0.90.1.1.ebuild +++ b/dev-haskell/wxdirect/wxdirect-0.90.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -36,5 +36,7 @@ src_prepare() { -i "${S}/${PN}.cabal" \ || die "Could not change ${PN}.cabal for wxdirect slot ${WX_GTK_VER}" cabal_chdeps \ - 'process >= 1.1 && < 1.2' 'process >= 1.1' + 'process >= 1.1 && < 1.2' 'process >= 1.1' \ + 'time >= 1.0 && < 1.5' 'time >= 1.0' \ + 'filepath < 1.4' 'filepath' } |