From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1PxHhn-0003Nw-4X for garchives@archives.gentoo.org; Wed, 09 Mar 2011 11:37:30 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 75A37E0693; Wed, 9 Mar 2011 11:34:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 32291E068E for ; Wed, 9 Mar 2011 11:34:45 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DE3732AC03B for ; Wed, 9 Mar 2011 11:34:44 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 458D180075 for ; Wed, 9 Mar 2011 11:34:44 +0000 (UTC) From: "Nirbheek Chauhan" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" Message-ID: Subject: [gentoo-commits] proj/gnome:master commit in: x11-wm/mutter/, x11-wm/mutter/files/ X-VCS-Repository: proj/gnome X-VCS-Files: x11-wm/mutter/files/mutter-fix-ld-failure.patch x11-wm/mutter/mutter-2.91.90.ebuild x11-wm/mutter/mutter-2.91.91.ebuild x11-wm/mutter/mutter-9999.ebuild X-VCS-Directories: x11-wm/mutter/ x11-wm/mutter/files/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: c83319d791c80e03f3d007d6c72b565a1270ad20 Date: Wed, 9 Mar 2011 11:34:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 7fb17e1ac0fc30ea93a6ec9710b1a0a7 commit: c83319d791c80e03f3d007d6c72b565a1270ad20 Author: Nirbheek Chauhan gentoo org> AuthorDate: Wed Mar 9 05:58:27 2011 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Wed Mar 9 11:21:35 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3Dc83319d7 x11-wm/mutter: 2.91.90 =E2=86=92 2.91.91 --- x11-wm/mutter/files/mutter-fix-ld-failure.patch | 39 ++++++++++++++= ++++++ ...mutter-2.91.90.ebuild =3D> mutter-2.91.91.ebuild} | 16 ++++---- x11-wm/mutter/mutter-9999.ebuild | 8 ++-- 3 files changed, 51 insertions(+), 12 deletions(-) diff --git a/x11-wm/mutter/files/mutter-fix-ld-failure.patch b/x11-wm/mut= ter/files/mutter-fix-ld-failure.patch new file mode 100644 index 0000000..ef36573 --- /dev/null +++ b/x11-wm/mutter/files/mutter-fix-ld-failure.patch @@ -0,0 +1,39 @@ +From bbd98e7b8612a1bba82a397525a673643cff3d6e Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz +Date: Tue, 8 Mar 2011 12:20:08 +0100 +Subject: [PATCH] Fix ld failure caused by several incomplete LDADD state= ments + +https://bugzilla.gnome.org/show_bug.cgi?id=3D644188 +--- + src/Makefile.am | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 4e02816..f87453d 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -218,7 +218,7 @@ mutter_theme_viewer_SOURCES=3D \ + bin_PROGRAMS=3Dmutter mutter-theme-viewer +=20 + mutter_SOURCES =3D core/mutter.c +-mutter_LDADD =3D libmutter-wm.la ++mutter_LDADD =3D $(MUTTER_LIBS) libmutter-wm.la +=20 + if HAVE_INTROSPECTION + include $(INTROSPECTION_MAKEFILE) +@@ -257,9 +257,9 @@ testasyncgetprop_SOURCES =3D core/testasyncgetprop.c +=20 + noinst_PROGRAMS=3Dtestboxes testgradient testasyncgetprop +=20 +-testboxes_LDADD =3D libmutter-wm.la +-testgradient_LDADD =3D libmutter-wm.la +-testasyncgetprop_LDADD =3D libmutter-wm.la ++testboxes_LDADD =3D $(MUTTER_LIBS) libmutter-wm.la ++testgradient_LDADD =3D $(MUTTER_LIBS) libmutter-wm.la ++testasyncgetprop_LDADD =3D $(MUTTER_LIBS) libmutter-wm.la +=20 + @INTLTOOL_DESKTOP_RULE@ +=20 +--=20 +1.7.3.4 + diff --git a/x11-wm/mutter/mutter-2.91.90.ebuild b/x11-wm/mutter/mutter-2= .91.91.ebuild similarity index 85% rename from x11-wm/mutter/mutter-2.91.90.ebuild rename to x11-wm/mutter/mutter-2.91.91.ebuild index c09aa97..25e2dde 100644 --- a/x11-wm/mutter/mutter-2.91.90.ebuild +++ b/x11-wm/mutter/mutter-2.91.91.ebuild @@ -5,14 +5,14 @@ EAPI=3D"2" GNOME2_LA_PUNT=3D"yes" =20 -inherit autotools gnome2 +inherit gnome2 =20 DESCRIPTION=3D"Upcoming GNOME 3 window manager (derived from metacity)" HOMEPAGE=3D"http://blogs.gnome.org/metacity/" =20 LICENSE=3D"GPL-2" SLOT=3D"0" -IUSE=3D"debug +introspection +sound test xinerama" +IUSE=3D"debug +introspection test xinerama" if [[ ${PV} =3D 9999 ]]; then inherit gnome2-live KEYWORDS=3D"" @@ -23,12 +23,13 @@ fi RDEPEND=3D">=3Dx11-libs/pango-1.2[X,introspection?] >=3Dx11-libs/cairo-1.10[X] >=3Dx11-libs/gtk+-2.91.7:3[introspection?] - >=3Dgnome-base/gconf-2 - >=3Ddev-libs/glib-2.14 + >=3Dgnome-base/gconf-2:2 + >=3Ddev-libs/glib-2.14:2 + >=3Dmedia-libs/clutter-1.2:1.0 + >=3Dmedia-libs/libcanberra-0.26[gtk3] >=3Dx11-libs/startup-notification-0.7 >=3Dx11-libs/libXcomposite-0.2 =20 - >=3Dmedia-libs/clutter-1.2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 @@ -40,7 +41,6 @@ RDEPEND=3D">=3Dx11-libs/pango-1.2[X,introspection?] x11-libs/libXrender =20 introspection? ( >=3Ddev-libs/gobject-introspection-0.9.5 ) - sound? ( >=3Dmedia-libs/libcanberra-0.26[gtk3] ) xinerama? ( x11-libs/libXinerama ) gnome-extra/zenity !x11-misc/expocity" @@ -66,8 +66,8 @@ src_prepare() { --enable-xsync --enable-verbose-mode --enable-compile-warnings=3Dmaximum - $(use_with sound libcanberra) - $(use_with introspection) + --with-libcanberra + $(use_enable introspection) $(use_enable xinerama)" gnome2_src_prepare } diff --git a/x11-wm/mutter/mutter-9999.ebuild b/x11-wm/mutter/mutter-9999= .ebuild index c09aa97..c16fc69 100644 --- a/x11-wm/mutter/mutter-9999.ebuild +++ b/x11-wm/mutter/mutter-9999.ebuild @@ -23,12 +23,12 @@ fi RDEPEND=3D">=3Dx11-libs/pango-1.2[X,introspection?] >=3Dx11-libs/cairo-1.10[X] >=3Dx11-libs/gtk+-2.91.7:3[introspection?] - >=3Dgnome-base/gconf-2 - >=3Ddev-libs/glib-2.14 + >=3Dgnome-base/gconf-2:2 + >=3Ddev-libs/glib-2.14:2 + >=3Dmedia-libs/clutter-1.2:1.0 >=3Dx11-libs/startup-notification-0.7 >=3Dx11-libs/libXcomposite-0.2 =20 - >=3Dmedia-libs/clutter-1.2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 @@ -67,7 +67,7 @@ src_prepare() { --enable-verbose-mode --enable-compile-warnings=3Dmaximum $(use_with sound libcanberra) - $(use_with introspection) + $(use_enable introspection) $(use_enable xinerama)" gnome2_src_prepare }