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 1Q2GWk-0005Ej-PO for garchives@archives.gentoo.org; Wed, 23 Mar 2011 05:22:38 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4D21B1C0AA; Wed, 23 Mar 2011 05:20:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 0D54B1C0AA for ; Wed, 23 Mar 2011 05:20: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 C18652AC01B for ; Wed, 23 Mar 2011 05:20:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 3B09D8006D for ; Wed, 23 Mar 2011 05:20:45 +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: <94507d969053ae386770a097cc9b149dd910d3b7.nirbheek@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/gnome-shell/files/gnome-shell-2.91.91-fix-build.patch gnome-base/gnome-shell/gnome-shell-2.91.91-r1.ebuild gnome-base/gnome-shell/gnome-shell-2.91.92.ebuild gnome-base/gnome-shell/gnome-shell-9999.ebuild X-VCS-Directories: gnome-base/gnome-shell/ gnome-base/gnome-shell/files/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: 94507d969053ae386770a097cc9b149dd910d3b7 Date: Wed, 23 Mar 2011 05:20:45 +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: 0681c6b1a105a3d26c181142fb4c9e2b commit: 94507d969053ae386770a097cc9b149dd910d3b7 Author: Nirbheek Chauhan gentoo org> AuthorDate: Wed Mar 23 04:08:34 2011 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Wed Mar 23 04:59:57 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D94507d96 gnome-base/gnome-shell: 2.91.91 =E2=86=92 2.91.92 --- .../files/gnome-shell-2.91.91-fix-build.patch | 23 ------------- ....91.91-r1.ebuild =3D> gnome-shell-2.91.92.ebuild} | 35 ++++++++++++= +------- gnome-base/gnome-shell/gnome-shell-9999.ebuild | 3 +- 3 files changed, 25 insertions(+), 36 deletions(-) diff --git a/gnome-base/gnome-shell/files/gnome-shell-2.91.91-fix-build.p= atch b/gnome-base/gnome-shell/files/gnome-shell-2.91.91-fix-build.patch deleted file mode 100644 index c54eb10..0000000 --- a/gnome-base/gnome-shell/files/gnome-shell-2.91.91-fix-build.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 49f6280645cdad7fa7f53633ce67ed5f7079a8dd Mon Sep 17 00:00:00 2001 -From: Dan Winship -Date: Tue, 08 Mar 2011 16:47:14 +0000 -Subject: src: add more stuff to gnome_shell_real_LDADD - -to work with libtools that are more strict about not allowing -transitive dependencies ---- -diff --git a/src/Makefile.am b/src/Makefile.am -index 40ce5de..1c3e1b6 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -140,7 +140,7 @@ libgnome_shell_la_gir_sources =3D \ - gnome_shell_real_SOURCES =3D \ - main.c - gnome_shell_real_CPPFLAGS =3D $(gnome_shell_cflags) --gnome_shell_real_LDADD =3D libgnome-shell.la -+gnome_shell_real_LDADD =3D libgnome-shell.la $(libgnome_shell_la_LIBADD= ) - gnome_shell_real_DEPENDENCIES =3D libgnome-shell.la -=20 - ######################################## --- -cgit v0.8.3.4 diff --git a/gnome-base/gnome-shell/gnome-shell-2.91.91-r1.ebuild b/gnome= -base/gnome-shell/gnome-shell-2.91.92.ebuild similarity index 72% rename from gnome-base/gnome-shell/gnome-shell-2.91.91-r1.ebuild rename to gnome-base/gnome-shell/gnome-shell-2.91.92.ebuild index a83050c..7e7c889 100644 --- a/gnome-base/gnome-shell/gnome-shell-2.91.91-r1.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-2.91.92.ebuild @@ -6,14 +6,14 @@ EAPI=3D"2" GCONF_DEBUG=3D"no" GNOME2_LA_PUNT=3D"yes" =20 -inherit autotools eutils gnome2 +inherit gnome2 =20 DESCRIPTION=3D"Provides core UI functions for the GNOME 3 desktop" HOMEPAGE=3D"http://live.gnome.org/GnomeShell" =20 LICENSE=3D"GPL-2" SLOT=3D"0" -IUSE=3D"" +IUSE=3D"+nm-applet" if [[ ${PV} =3D 9999 ]]; then inherit gnome2-live KEYWORDS=3D"" @@ -23,22 +23,25 @@ fi =20 # gnome-desktop-2.91.2 is needed due to header changes, db82a33 in gnome= -desktop # FIXME: Automagic gnome-bluetooth[introspection] support. +# latest mutter is needed due to commit 474ff2e9 and commit 079953c3 # latest gsettings-desktop-schemas is needed due to commit 602fa1c6 -COMMON_DEPEND=3D">=3Ddev-libs/glib-2.25.9 +# latest gnome-menus is needed due to https://bugzilla.gnome.org/show_bu= g.cgi?id=3D645063#c4 +COMMON_DEPEND=3D">=3Ddev-libs/glib-2.25.9:2 >=3Ddev-libs/gjs-0.7.11 >=3Ddev-libs/gobject-introspection-0.10.1 x11-libs/gdk-pixbuf:2[introspection] >=3Dx11-libs/gtk+-3.0.0:3[introspection] - >=3Dmedia-libs/clutter-1.5.15[introspection] + >=3Dmedia-libs/clutter-1.5.15:1.0[introspection] >=3Dgnome-base/gnome-desktop-2.91.2:3 >=3Dgnome-base/gsettings-desktop-schemas-2.91.91 >=3Dgnome-extra/evolution-data-server-2.91.6 >=3Dmedia-libs/gstreamer-0.10.16 >=3Dmedia-libs/gst-plugins-base-0.10.16 + >=3Dnet-im/telepathy-logger-0.2.4[introspection] >=3Dnet-libs/telepathy-glib-0.13.12[introspection] >=3Dnet-wireless/gnome-bluetooth-2.90.0[introspection] >=3Dsys-auth/polkit-0.100[introspection] - >=3Dx11-wm/mutter-2.91.91[introspection] + >=3Dx11-wm/mutter-2.91.91.1[introspection] =20 dev-libs/dbus-glib dev-libs/libxml2:2 @@ -56,11 +59,13 @@ COMMON_DEPEND=3D">=3Ddev-libs/glib-2.25.9 x11-apps/mesa-progs" # Runtime-only deps are probably incomplete and approximate. # Each block: -# 1. Introspection stuff + dconf needed via imports.gi.* -# 2. gnome-session is needed for gnome-session-quit -# 3. Don't remember -# 4. nm-applet is needed for auth prompting and the wireless connection = dialog +# 1. Pull in polkit-0.101 for pretty authorization dialogs +# 2. Introspection stuff + dconf needed via imports.gi.* +# 3. gnome-session is needed for gnome-session-quit +# 4. Control shell settings +# 5. nm-applet is needed for auth prompting and the wireless connection = dialog RDEPEND=3D"${COMMON_DEPEND} + >=3Dsys-auth/polkit-0.101[introspection] =20 >=3Dgnome-base/dconf-0.4.1 >=3Dgnome-base/libgnomekbd-2.91.4[introspection] @@ -69,7 +74,11 @@ RDEPEND=3D"${COMMON_DEPEND} >=3Dgnome-base/gnome-session-2.91.91 =20 >=3Dgnome-base/gnome-settings-daemon-2.91 - >=3Dgnome-base/gnome-control-center-2.91" + >=3Dgnome-base/gnome-control-center-2.91 + + nm-applet? ( + >=3Dgnome-extra/nm-applet-0.8.996 + >=3Dnet-misc/networkmanager-0.8.996-r1[introspection] )" DEPEND=3D"${COMMON_DEPEND} sys-devel/gettext >=3Ddev-util/pkgconfig-0.22 @@ -83,8 +92,10 @@ G2CONF=3D"--enable-compile-warnings=3Dmaximum =20 src_prepare() { epatch "${FILESDIR}/${PN}-fix-gnome-bluetooth.patch" - epatch "${FILESDIR}/${P}-fix-build.patch" - eautoreconf + + # https://bugzilla.gnome.org/show_bug.cgi?id=3D645063 + sed -e 's/settings.menu/gnomecc.menu/g' -i src/shell-app-system.c || di= e + gnome2_src_prepare } =20 diff --git a/gnome-base/gnome-shell/gnome-shell-9999.ebuild b/gnome-base/= gnome-shell/gnome-shell-9999.ebuild index 6ba5622..746de21 100644 --- a/gnome-base/gnome-shell/gnome-shell-9999.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-9999.ebuild @@ -25,6 +25,7 @@ fi # FIXME: Automagic gnome-bluetooth[introspection] support. # latest mutter is needed due to commit 474ff2e9 and commit 079953c3 # latest gsettings-desktop-schemas is needed due to commit 602fa1c6 +# latest gnome-menus is needed due to https://bugzilla.gnome.org/show_bu= g.cgi?id=3D645063#c4 COMMON_DEPEND=3D">=3Ddev-libs/glib-2.25.9:2 >=3Ddev-libs/gjs-0.7.11 >=3Ddev-libs/gobject-introspection-0.10.1 @@ -32,6 +33,7 @@ COMMON_DEPEND=3D">=3Ddev-libs/glib-2.25.9:2 >=3Dx11-libs/gtk+-3.0.0:3[introspection] >=3Dmedia-libs/clutter-1.5.15:1.0[introspection] >=3Dgnome-base/gnome-desktop-2.91.2:3 + >=3Dgnome-base/gnome-menus-2.91.91-r1 >=3Dgnome-base/gsettings-desktop-schemas-2.91.91 >=3Dgnome-extra/evolution-data-server-2.91.6 >=3Dmedia-libs/gstreamer-0.10.16 @@ -48,7 +50,6 @@ COMMON_DEPEND=3D">=3Ddev-libs/glib-2.25.9:2 dev-libs/libcroco:0.6 =20 gnome-base/gconf[introspection] - gnome-base/gnome-menus gnome-base/librsvg media-libs/libcanberra media-sound/pulseaudio