Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-forensics/quickfuzz/, app-forensics/quickfuzz/files/
Date: Thu, 16 Feb 2017 21:58:11
Message-Id: 1487282232.812682bcec8310c15b12f0000af537350ff77525.slyfox@gentoo
1 commit: 812682bcec8310c15b12f0000af537350ff77525
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Thu Feb 16 21:47:26 2017 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Thu Feb 16 21:57:12 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=812682bc
7
8 app-forensics/quickfuzz: tweak for ghc-8.0.2
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 .../quickfuzz/files/quickfuzz-0.1_p20160920-directory-1.3.patch | 9 +++++++++
13 .../quickfuzz/files/quickfuzz-0.1_p20160920-ghc-8.0.2_rc1.patch | 8 ++++++++
14 app-forensics/quickfuzz/quickfuzz-0.1_p20160920.ebuild | 7 ++++++-
15 3 files changed, 23 insertions(+), 1 deletion(-)
16
17 diff --git a/app-forensics/quickfuzz/files/quickfuzz-0.1_p20160920-directory-1.3.patch b/app-forensics/quickfuzz/files/quickfuzz-0.1_p20160920-directory-1.3.patch
18 new file mode 100644
19 index 0000000000..34e92089b5
20 --- /dev/null
21 +++ b/app-forensics/quickfuzz/files/quickfuzz-0.1_p20160920-directory-1.3.patch
22 @@ -0,0 +1,9 @@
23 +diff --git a/src/Check.hs b/src/Check.hs
24 +index b38a56a..246bf24 100644
25 +--- a/src/Check.hs
26 ++++ b/src/Check.hs
27 +@@ -23,3 +23,3 @@ import System.Posix.Env
28 + import System.Exit
29 +-import System.Directory
30 ++import System.Directory hiding (getFileSize)
31 + import System.IO.Unsafe
32
33 diff --git a/app-forensics/quickfuzz/files/quickfuzz-0.1_p20160920-ghc-8.0.2_rc1.patch b/app-forensics/quickfuzz/files/quickfuzz-0.1_p20160920-ghc-8.0.2_rc1.patch
34 new file mode 100644
35 index 0000000000..0e8abbd9d7
36 --- /dev/null
37 +++ b/app-forensics/quickfuzz/files/quickfuzz-0.1_p20160920-ghc-8.0.2_rc1.patch
38 @@ -0,0 +1,8 @@
39 +diff --git a/src/Midi.hs b/src/Midi.hs
40 +index 2b7a359..8c4eacc 100644
41 +--- a/src/Midi.hs
42 ++++ b/src/Midi.hs
43 +@@ -1,2 +1,2 @@
44 +-{-# LANGUAGE TemplateHaskell, FlexibleInstances#-}
45 ++{-# LANGUAGE TemplateHaskell, FlexibleInstances, OverlappingInstances #-}
46 +
47
48 diff --git a/app-forensics/quickfuzz/quickfuzz-0.1_p20160920.ebuild b/app-forensics/quickfuzz/quickfuzz-0.1_p20160920.ebuild
49 index a32bca2ee6..a4e592300b 100644
50 --- a/app-forensics/quickfuzz/quickfuzz-0.1_p20160920.ebuild
51 +++ b/app-forensics/quickfuzz/quickfuzz-0.1_p20160920.ebuild
52 @@ -1,4 +1,4 @@
53 -# Copyright 1999-2016 Gentoo Foundation
54 +# Copyright 1999-2017 Gentoo Foundation
55 # Distributed under the terms of the GNU General Public License v2
56 # $Id$
57
58 @@ -96,6 +96,11 @@ DEPEND="${RDEPEND}
59 >=dev-haskell/cabal-1.18.1.3
60 "
61
62 +PATCHES=(
63 + "${FILESDIR}"/${P}-ghc-8.0.2_rc1.patch
64 + "${FILESDIR}"/${P}-directory-1.3.patch
65 +)
66 +
67 # $1 - target tarball name (not including extension)
68 make_snapshot() {
69 ln -s "${S}" "${WORKDIR}"/"$1" || die