diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-07-21 17:55:53 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-07-21 17:55:53 +0000 |
| commit | e78052bdd72f8aa9e9c6d012fb8e55367311498b (patch) | |
| tree | deee09331fd9a636858e80688a9ce14a9c05357a /x11-wm/mutter | |
| parent | Version bump wrt #427512 by Pacho Ramos (diff) | |
| download | gentoo-2-e78052bdd72f8aa9e9c6d012fb8e55367311498b.tar.gz gentoo-2-e78052bdd72f8aa9e9c6d012fb8e55367311498b.tar.bz2 gentoo-2-e78052bdd72f8aa9e9c6d012fb8e55367311498b.zip | |
Fix build failure with gobject-introspection-1.33.x; thanks to Johann Degenhardt for the report.
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Diffstat (limited to 'x11-wm/mutter')
| -rw-r--r-- | x11-wm/mutter/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-wm/mutter/mutter-3.4.1-r1.ebuild | 11 |
2 files changed, 14 insertions, 4 deletions
diff --git a/x11-wm/mutter/ChangeLog b/x11-wm/mutter/ChangeLog index a279d9a63ede..bb94a2589033 100644 --- a/x11-wm/mutter/ChangeLog +++ b/x11-wm/mutter/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-wm/mutter # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/mutter/ChangeLog,v 1.11 2012/05/22 06:38:59 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/mutter/ChangeLog,v 1.12 2012/07/21 17:55:53 tetromino Exp $ + + 21 Jul 2012; Alexandre Rostovtsev <tetromino@gentoo.org> + mutter-3.4.1-r1.ebuild: + Fix build failure with gobject-introspection-1.33.x; thanks to Johann + Degenhardt for the report. 22 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org> mutter-3.2.2.ebuild, mutter-3.2.2-r1.ebuild, mutter-3.4.1-r1.ebuild: diff --git a/x11-wm/mutter/mutter-3.4.1-r1.ebuild b/x11-wm/mutter/mutter-3.4.1-r1.ebuild index 9d94a7371fd3..a826d377d43e 100644 --- a/x11-wm/mutter/mutter-3.4.1-r1.ebuild +++ b/x11-wm/mutter/mutter-3.4.1-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/x11-wm/mutter/mutter-3.4.1-r1.ebuild,v 1.3 2012/05/22 06:38:59 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/mutter/mutter-3.4.1-r1.ebuild,v 1.4 2012/07/21 17:55:53 tetromino Exp $ EAPI="4" GNOME2_LA_PUNT="yes" @@ -9,6 +9,8 @@ inherit eutils gnome2 DESCRIPTION="GNOME 3 compositing window manager based on Clutter" HOMEPAGE="http://git.gnome.org/browse/mutter/" +SRC_URI="${SRC_URI} + http://dev.gentoo.org/~tetromino/distfiles/${PN}/${PN}-3.4.1-gtk-doc-syntax.patch.xz" LICENSE="GPL-2" SLOT="0" @@ -18,7 +20,7 @@ KEYWORDS="~amd64 ~x86" COMMON_DEPEND=">=x11-libs/pango-1.2[X,introspection?] >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf:2[introspection?] - >=x11-libs/gtk+-3.3.7:3[introspection?] + >=x11-libs/gtk+-3.3.7:3[X,introspection?] >=dev-libs/glib-2.25.11:2 >=media-libs/clutter-1.9.10:1.0[introspection?] >=media-libs/cogl-1.9.6:1.0[introspection?] @@ -46,9 +48,9 @@ DEPEND="${COMMON_DEPEND} >=app-text/gnome-doc-utils-0.8 >=dev-util/intltool-0.35 sys-devel/gettext - virtual/pkgconfig test? ( app-text/docbook-xml-dtd:4.5 ) xinerama? ( x11-proto/xineramaproto ) + virtual/pkgconfig x11-proto/xextproto x11-proto/xproto" RDEPEND="${COMMON_DEPEND} @@ -76,5 +78,8 @@ src_prepare() { # In next release epatch "${FILESDIR}/${P}-meta_window_move_frame-crash.patch" + # gobject-introspection-1.33 compat; in 3.5.x + epatch "${WORKDIR}/${PN}-3.4.1-gtk-doc-syntax.patch" + gnome2_src_prepare } |