Gentoo Archives: gentoo-commits

From: "Mark Wright (gienah)" <gienah@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-haskell/glib: glib-0.12.3.1.ebuild ChangeLog
Date: Sun, 25 Nov 2012 05:43:30
Message-Id: 20121125054319.B6E2420C9F@flycatcher.gentoo.org
1 gienah 12/11/25 05:43:19
2
3 Modified: glib-0.12.3.1.ebuild ChangeLog
4 Log:
5 Patch glib-0.12.3.1 for ghc 7.6.1
6
7 (Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 618E971F)
8
9 Revision Changes Path
10 1.5 dev-haskell/glib/glib-0.12.3.1.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/glib/glib-0.12.3.1.ebuild?rev=1.5&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/glib/glib-0.12.3.1.ebuild?rev=1.5&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/glib/glib-0.12.3.1.ebuild?r1=1.4&r2=1.5
15
16 Index: glib-0.12.3.1.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/dev-haskell/glib/glib-0.12.3.1.ebuild,v
19 retrieving revision 1.4
20 retrieving revision 1.5
21 diff -u -r1.4 -r1.5
22 --- glib-0.12.3.1.ebuild 23 Sep 2012 08:42:04 -0000 1.4
23 +++ glib-0.12.3.1.ebuild 25 Nov 2012 05:43:19 -0000 1.5
24 @@ -1,12 +1,12 @@
25 # Copyright 1999-2012 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/glib/glib-0.12.3.1.ebuild,v 1.4 2012/09/23 08:42:04 phajdan.jr Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/glib/glib-0.12.3.1.ebuild,v 1.5 2012/11/25 05:43:19 gienah Exp $
29
30 EAPI=4
31
32 #nocabaldep is for the fancy cabal-detection feature at build-time
33 CABAL_FEATURES="lib profile haddock hscolour hoogle nocabaldep"
34 -inherit base haskell-cabal
35 +inherit haskell-cabal
36
37 DESCRIPTION="Binding to the GLIB library for Gtk2Hs."
38 HOMEPAGE="http://projects.haskell.org/gtk2hs/"
39 @@ -21,3 +21,11 @@
40 dev-libs/glib:2"
41 DEPEND="${RDEPEND}
42 dev-haskell/gtk2hs-buildtools"
43 +
44 +src_prepare() {
45 + # c2hs ignores #if __GLASGOW_HASKELL__ >= 706
46 + # I do not know which earlier ghc versions the patch submitted upstream works with
47 + if has_version ">=dev-lang/ghc-7.6.1"; then
48 + epatch "${FILESDIR}/${PN}-0.12.3.1-ghc-7.6.patch"
49 + fi
50 +}
51
52
53
54 1.9 dev-haskell/glib/ChangeLog
55
56 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/glib/ChangeLog?rev=1.9&view=markup
57 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/glib/ChangeLog?rev=1.9&content-type=text/plain
58 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/glib/ChangeLog?r1=1.8&r2=1.9
59
60 Index: ChangeLog
61 ===================================================================
62 RCS file: /var/cvsroot/gentoo-x86/dev-haskell/glib/ChangeLog,v
63 retrieving revision 1.8
64 retrieving revision 1.9
65 diff -u -r1.8 -r1.9
66 --- ChangeLog 23 Sep 2012 08:42:04 -0000 1.8
67 +++ ChangeLog 25 Nov 2012 05:43:19 -0000 1.9
68 @@ -1,6 +1,10 @@
69 # ChangeLog for dev-haskell/glib
70 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
71 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/glib/ChangeLog,v 1.8 2012/09/23 08:42:04 phajdan.jr Exp $
72 +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/glib/ChangeLog,v 1.9 2012/11/25 05:43:19 gienah Exp $
73 +
74 + 25 Nov 2012; Mark Wright <gienah@g.o>
75 + +files/glib-0.12.3.1-ghc-7.6.patch, glib-0.12.3.1.ebuild:
76 + Patch glib-0.12.3.1 for ghc 7.6.1
77
78 23 Sep 2012; Pawel Hajdan jr <phajdan.jr@g.o> glib-0.12.3.1.ebuild:
79 x86 stable wrt bug #428930