diff options
| author |   Mark Wright <gienah@gentoo.org> | 2012-12-28 08:03:56 +0000 |
|---|---|---|
| committer | Mark Wright <gienah@gentoo.org> | 2012-12-28 08:03:56 +0000 |
| commit | 1da1b0635c5974510fbab0ec03b0467b52e521c0 (patch) | |
| tree | da1e60d3b4c32d68a5303a8a9af64ff320b35b65 /dev-vcs | |
| parent | Do not output LDFLAGS in krb5-config --libs output - bug #448778 (diff) | |
| download | gentoo-2-1da1b0635c5974510fbab0ec03b0467b52e521c0.tar.gz gentoo-2-1da1b0635c5974510fbab0ec03b0467b52e521c0.tar.bz2 gentoo-2-1da1b0635c5974510fbab0ec03b0467b52e521c0.zip | |
Fix build failure against dev-haskell/test-framework-0.8
(Portage version: 2.1.11.38/cvs/Linux x86_64, signed Manifest commit with key 618E971F)
Diffstat (limited to 'dev-vcs')
| -rw-r--r-- | dev-vcs/darcs/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-vcs/darcs/darcs-2.8.3-r1.ebuild | 3 | ||||
| -rw-r--r-- | dev-vcs/darcs/files/darcs-2.8.3-tf-0.8.patch | 26 |
3 files changed, 33 insertions, 2 deletions
diff --git a/dev-vcs/darcs/ChangeLog b/dev-vcs/darcs/ChangeLog index 90bbff78eeeb..63fb59210860 100644 --- a/dev-vcs/darcs/ChangeLog +++ b/dev-vcs/darcs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-vcs/darcs # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/ChangeLog,v 1.42 2012/12/24 21:39:39 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/ChangeLog,v 1.43 2012/12/28 08:03:56 gienah Exp $ + + 28 Dec 2012; Mark Wright <gienah@gentoo.org> +files/darcs-2.8.3-tf-0.8.patch, + darcs-2.8.3-r1.ebuild: + Fix build failure against dev-haskell/test-framework-0.8 24 Dec 2012; Sergei Trofimovich <slyfox@gentoo.org> -darcs-2.4.4-r1.ebuild, -darcs-2.5.2-r1.ebuild, -darcs-2.5.2-r2.ebuild, diff --git a/dev-vcs/darcs/darcs-2.8.3-r1.ebuild b/dev-vcs/darcs/darcs-2.8.3-r1.ebuild index 49324bb95f68..33c9dbb4cddb 100644 --- a/dev-vcs/darcs/darcs-2.8.3-r1.ebuild +++ b/dev-vcs/darcs/darcs-2.8.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/darcs-2.8.3-r1.ebuild,v 1.2 2012/12/10 07:55:45 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/darcs-2.8.3-r1.ebuild,v 1.3 2012/12/28 08:03:56 gienah Exp $ EAPI=5 @@ -71,6 +71,7 @@ src_prepare() { epatch "${FILESDIR}/${PN}-2.8.1-tar-0.4.patch" epatch "${FILESDIR}"/${P}-hack-for-haskeline-0.7-breaks-non-utf8.patch + epatch "${FILESDIR}"/${P}-tf-0.8.patch # ghc-7.6 cabal_chdeps \ diff --git a/dev-vcs/darcs/files/darcs-2.8.3-tf-0.8.patch b/dev-vcs/darcs/files/darcs-2.8.3-tf-0.8.patch new file mode 100644 index 000000000000..18f0bc5f55b9 --- /dev/null +++ b/dev-vcs/darcs/files/darcs-2.8.3-tf-0.8.patch @@ -0,0 +1,26 @@ +Fix build failure against dev-haskell/test-framework-0.8 + +[147 of 147] Compiling Main ( src/test.hs, dist/build/darcs-test/darcs-test-tmp/Main.o ) + +src/test.hs:100:30: + No instance for (Typeable ShellTest) arising from a use of `Test' + Possible fix: add an instance declaration for (Typeable ShellTest) + In the expression: Test (file ++ " (" ++ show fmt ++ ")") + In the expression: + Test (file ++ " (" ++ show fmt ++ ")") $ ShellTest fmt file tdir dp + In an equation for `shellTest': + shellTest dp fmt tdir file + = Test (file ++ " (" ++ show fmt ++ ")") + $ ShellTest fmt file tdir dp +diff --git a/src/test.hs b/src/test.hs +index 39adcc1..9687074 100644 +--- a/src/test.hs ++++ b/src/test.hs +@@ -49,6 +49,7 @@ data ShellTest = ShellTest { format :: Format + , testdir :: Maybe FilePath -- ^ only if you want to set it explicitly + , _darcspath :: FilePath + } ++ deriving Typeable + + runtest' :: ShellTest -> FilePath -> ShIO Result + runtest' (ShellTest fmt _ _ dp) srcdir = |