| 1 |
araujo 07/10/29 06:51:09 |
| 2 |
|
| 3 |
Modified: ChangeLog gtk2hs-0.9.12.ebuild |
| 4 |
Log: |
| 5 |
Fix for recent glib that changes the type of the gtype typedef |
| 6 |
(Portage version: 2.1.3.16) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.35 dev-haskell/gtk2hs/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/gtk2hs/ChangeLog?rev=1.35&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/gtk2hs/ChangeLog?rev=1.35&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/gtk2hs/ChangeLog?r1=1.34&r2=1.35 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/ChangeLog,v |
| 18 |
retrieving revision 1.34 |
| 19 |
retrieving revision 1.35 |
| 20 |
diff -u -r1.34 -r1.35 |
| 21 |
--- ChangeLog 12 Oct 2007 08:41:45 -0000 1.34 |
| 22 |
+++ ChangeLog 29 Oct 2007 06:51:08 -0000 1.35 |
| 23 |
@@ -1,6 +1,9 @@ |
| 24 |
# ChangeLog for dev-haskell/gtk2hs |
| 25 |
# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/ChangeLog,v 1.34 2007/10/12 08:41:45 remi Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/ChangeLog,v 1.35 2007/10/29 06:51:08 araujo Exp $ |
| 28 |
+ |
| 29 |
+ 29 Oct 2007; Luis F. Araujo <araujo@g.o> gtk2hs-0.9.12.ebuild: |
| 30 |
+ Fix for recent glib that changes the type of the gtype typedef |
| 31 |
|
| 32 |
12 Oct 2007; Rémi Cardona <remi@g.o> gtk2hs-0.9.10-r1.ebuild, |
| 33 |
gtk2hs-0.9.11.ebuild, gtk2hs-0.9.12.ebuild: |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.3 dev-haskell/gtk2hs/gtk2hs-0.9.12.ebuild |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.12.ebuild?rev=1.3&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.12.ebuild?rev=1.3&content-type=text/plain |
| 41 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.12.ebuild?r1=1.2&r2=1.3 |
| 42 |
|
| 43 |
Index: gtk2hs-0.9.12.ebuild |
| 44 |
=================================================================== |
| 45 |
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.12.ebuild,v |
| 46 |
retrieving revision 1.2 |
| 47 |
retrieving revision 1.3 |
| 48 |
diff -u -r1.2 -r1.3 |
| 49 |
--- gtk2hs-0.9.12.ebuild 12 Oct 2007 08:41:45 -0000 1.2 |
| 50 |
+++ gtk2hs-0.9.12.ebuild 29 Oct 2007 06:51:08 -0000 1.3 |
| 51 |
@@ -1,6 +1,6 @@ |
| 52 |
# Copyright 1999-2007 Gentoo Foundation |
| 53 |
# Distributed under the terms of the GNU General Public License v2 |
| 54 |
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.12.ebuild,v 1.2 2007/10/12 08:41:45 remi Exp $ |
| 55 |
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.12.ebuild,v 1.3 2007/10/29 06:51:08 araujo Exp $ |
| 56 |
|
| 57 |
inherit base eutils ghc-package multilib toolchain-funcs versionator |
| 58 |
|
| 59 |
@@ -12,16 +12,16 @@ |
| 60 |
|
| 61 |
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" |
| 62 |
|
| 63 |
-IUSE="doc glade gnome opengl firefox seamonkey profile xulrunner" |
| 64 |
+IUSE="doc glade gnome opengl svg firefox seamonkey profile xulrunner" |
| 65 |
|
| 66 |
RDEPEND=">=dev-lang/ghc-6.2 |
| 67 |
dev-haskell/mtl |
| 68 |
>=x11-libs/gtk+-2 |
| 69 |
glade? ( >=gnome-base/libglade-2 ) |
| 70 |
gnome? ( >=gnome-base/libglade-2 |
| 71 |
- =x11-libs/gtksourceview-1* |
| 72 |
- >=gnome-base/gconf-2 |
| 73 |
- >=gnome-base/librsvg-2.16 ) |
| 74 |
+ >=x11-libs/gtksourceview-0.6 |
| 75 |
+ >=gnome-base/gconf-2 ) |
| 76 |
+ svg? ( >=gnome-base/librsvg-2.16 ) |
| 77 |
opengl? ( x11-libs/gtkglext ) |
| 78 |
seamonkey? ( >=www-client/seamonkey-1.0.2 ) |
| 79 |
firefox? ( >=www-client/mozilla-firefox-1.0.4 ) |
| 80 |
@@ -29,6 +29,14 @@ |
| 81 |
DEPEND="${RDEPEND} |
| 82 |
doc? ( >=dev-haskell/haddock-0.8 )" |
| 83 |
|
| 84 |
+src_unpack() { |
| 85 |
+ unpack "${A}" |
| 86 |
+ |
| 87 |
+ # Fix for recent glib that changes the type of the gtype typedef: |
| 88 |
+ sed -i -e 's/(CULong)/(CULong, CUInt)/' \ |
| 89 |
+ "${S}/tools/hierarchyGen/Hierarchy.chs.template" |
| 90 |
+} |
| 91 |
+ |
| 92 |
src_compile() { |
| 93 |
econf \ |
| 94 |
--enable-packager-mode \ |
| 95 |
@@ -38,7 +46,7 @@ |
| 96 |
$(use glade || use gnome && echo --enable-libglade) \ |
| 97 |
$(use_enable gnome gconf) \ |
| 98 |
$(use_enable gnome sourceview) \ |
| 99 |
- $(use_enable gnome svg) \ |
| 100 |
+ $(use_enable svg svg) \ |
| 101 |
$(use_enable opengl opengl) \ |
| 102 |
$(use_enable seamonkey seamonkey) \ |
| 103 |
$(use_enable firefox firefox) \ |
| 104 |
@@ -85,8 +93,9 @@ |
| 105 |
"${D}/usr/$(get_libdir)/gtk2hs/glade.${pkgext}") \ |
| 106 |
$(use gnome && echo \ |
| 107 |
"${D}/usr/$(get_libdir)/gtk2hs/gconf.${pkgext}" \ |
| 108 |
- "${D}/usr/$(get_libdir)/gtk2hs/sourceview.${pkgext}" \ |
| 109 |
- "${D}/usr/$(get_libdir)/gtk2hs/svgcairo.${pkgext}") \ |
| 110 |
+ "${D}/usr/$(get_libdir)/gtk2hs/sourceview.${pkgext}" ) \ |
| 111 |
+ $(use svg && echo \ |
| 112 |
+ "${D}/usr/$(get_libdir)/gtk2hs/svgcairo.${pkgext}") |
| 113 |
$(use opengl && echo \ |
| 114 |
"${D}/usr/$(get_libdir)/gtk2hs/gtkglext.${pkgext}") \ |
| 115 |
$(use seamonkey || use firefox || use xulrunner && echo \ |
| 116 |
|
| 117 |
|
| 118 |
|
| 119 |
-- |
| 120 |
gentoo-commits@g.o mailing list |
Archives