| 1 |
tetromino 12/01/08 23:57:10 |
| 2 |
|
| 3 |
Modified: ChangeLog gobject-introspection-1.30.0-r2.ebuild |
| 4 |
Log: |
| 5 |
Update fix for bug #391213 to not use eautoreconf. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.52 dev-libs/gobject-introspection/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/gobject-introspection/ChangeLog?rev=1.52&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/gobject-introspection/ChangeLog?rev=1.52&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/gobject-introspection/ChangeLog?r1=1.51&r2=1.52 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/ChangeLog,v |
| 19 |
retrieving revision 1.51 |
| 20 |
retrieving revision 1.52 |
| 21 |
diff -u -r1.51 -r1.52 |
| 22 |
--- ChangeLog 8 Jan 2012 23:03:03 -0000 1.51 |
| 23 |
+++ ChangeLog 8 Jan 2012 23:57:10 -0000 1.52 |
| 24 |
@@ -1,6 +1,11 @@ |
| 25 |
# ChangeLog for dev-libs/gobject-introspection |
| 26 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/ChangeLog,v 1.51 2012/01/08 23:03:03 tetromino Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/ChangeLog,v 1.52 2012/01/08 23:57:10 tetromino Exp $ |
| 29 |
+ |
| 30 |
+ 08 Jan 2012; Alexandre Rostovtsev <tetromino@g.o> |
| 31 |
+ gobject-introspection-1.30.0-r2.ebuild, |
| 32 |
+ -files/gobject-introspection-1.30.0-forced-cairo.patch: |
| 33 |
+ Update fix for bug #391213 to not use eautoreconf. |
| 34 |
|
| 35 |
*gobject-introspection-1.30.0-r2 (08 Jan 2012) |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.2 dev-libs/gobject-introspection/gobject-introspection-1.30.0-r2.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/gobject-introspection/gobject-introspection-1.30.0-r2.ebuild?rev=1.2&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/gobject-introspection/gobject-introspection-1.30.0-r2.ebuild?rev=1.2&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/gobject-introspection/gobject-introspection-1.30.0-r2.ebuild?r1=1.1&r2=1.2 |
| 45 |
|
| 46 |
Index: gobject-introspection-1.30.0-r2.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/gobject-introspection-1.30.0-r2.ebuild,v |
| 49 |
retrieving revision 1.1 |
| 50 |
retrieving revision 1.2 |
| 51 |
diff -u -r1.1 -r1.2 |
| 52 |
--- gobject-introspection-1.30.0-r2.ebuild 8 Jan 2012 23:03:03 -0000 1.1 |
| 53 |
+++ gobject-introspection-1.30.0-r2.ebuild 8 Jan 2012 23:57:10 -0000 1.2 |
| 54 |
@@ -1,13 +1,13 @@ |
| 55 |
# Copyright 1999-2012 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/gobject-introspection-1.30.0-r2.ebuild,v 1.1 2012/01/08 23:03:03 tetromino Exp $ |
| 58 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/gobject-introspection-1.30.0-r2.ebuild,v 1.2 2012/01/08 23:57:10 tetromino Exp $ |
| 59 |
|
| 60 |
EAPI="4" |
| 61 |
GCONF_DEBUG="no" |
| 62 |
GNOME2_LA_PUNT="yes" |
| 63 |
PYTHON_DEPEND="2:2.5" |
| 64 |
|
| 65 |
-inherit autotools gnome2 python |
| 66 |
+inherit gnome2 python |
| 67 |
|
| 68 |
DESCRIPTION="Introspection infrastructure for generating gobject library bindings for various languages" |
| 69 |
HOMEPAGE="http://live.gnome.org/GObjectIntrospection/" |
| 70 |
@@ -47,9 +47,6 @@ |
| 71 |
# https://bugzilla.gnome.org/show_bug.cgi?id=659824 |
| 72 |
sed -i -e '/^TAGS/s/[{}]//g' "${S}/giscanner/docbookdescription.py" || die |
| 73 |
|
| 74 |
- # Enable cairo-gobject support even if cairo is not installed, bug #391213 |
| 75 |
- epatch "${FILESDIR}/${PN}-1.30.0-forced-cairo.patch" |
| 76 |
- |
| 77 |
# FIXME: Parallel compilation failure with USE=doc |
| 78 |
use doc && MAKEOPTS="-j1" |
| 79 |
|
| 80 |
@@ -57,17 +54,22 @@ |
| 81 |
echo > py-compile |
| 82 |
echo > build-aux/py-compile |
| 83 |
|
| 84 |
- eautoreconf |
| 85 |
gnome2_src_prepare |
| 86 |
|
| 87 |
- if use test && ! has_version "x11-libs/cairo[glib]"; then |
| 88 |
+ skip_tests= |
| 89 |
+ if ! has_version "x11-libs/cairo[glib]"; then |
| 90 |
+ # Bug #391213: enable cairo-gobject support even if it's not installed |
| 91 |
# We only PDEPEND on cairo to avoid circular dependencies |
| 92 |
- G2CONF="${G2CONF} --disable-tests" |
| 93 |
- skip_tests=yes |
| 94 |
- ewarn "Tests will be skipped because x11-libs/cairo[glib] is not present" |
| 95 |
- ewarn "on your system. Consider installing it to get tests to run." |
| 96 |
- else |
| 97 |
- skip_tests= |
| 98 |
+ export CAIRO_LIBS="-lcairo" |
| 99 |
+ export CAIRO_CFLAGS="-I${EPREFIX}/usr/include/cairo" |
| 100 |
+ export CAIRO_GOBJECT_LIBS="-lcairo-gobject" |
| 101 |
+ export CAIRO_GOBJECT_CFLAGS="-I${EPREFIX}/usr/include/cairo" |
| 102 |
+ if use test; then |
| 103 |
+ G2CONF="${G2CONF} --disable-tests" |
| 104 |
+ skip_tests=yes |
| 105 |
+ ewarn "Tests will be skipped because x11-libs/cairo[glib] is not present" |
| 106 |
+ ewarn "on your system. Consider installing it to get tests to run." |
| 107 |
+ fi |
| 108 |
fi |
| 109 |
} |
Archives