From: "Nirbheek Chauhan" <nirbheek@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/
Date: Wed, 23 Mar 2011 05:20:45 +0000 (UTC) [thread overview]
Message-ID: <94507d969053ae386770a097cc9b149dd910d3b7.nirbheek@gentoo> (raw)
commit: 94507d969053ae386770a097cc9b149dd910d3b7
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 23 04:08:34 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Mar 23 04:59:57 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=94507d96
gnome-base/gnome-shell: 2.91.91 → 2.91.92
---
.../files/gnome-shell-2.91.91-fix-build.patch | 23 -------------
....91.91-r1.ebuild => 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.patch 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 <danw@gnome.org>
-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 = \
- gnome_shell_real_SOURCES = \
- main.c
- gnome_shell_real_CPPFLAGS = $(gnome_shell_cflags)
--gnome_shell_real_LDADD = libgnome-shell.la
-+gnome_shell_real_LDADD = libgnome-shell.la $(libgnome_shell_la_LIBADD)
- gnome_shell_real_DEPENDENCIES = libgnome-shell.la
-
- ########################################
---
-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="2"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
-inherit autotools eutils gnome2
+inherit gnome2
DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
HOMEPAGE="http://live.gnome.org/GnomeShell"
LICENSE="GPL-2"
SLOT="0"
-IUSE=""
+IUSE="+nm-applet"
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
KEYWORDS=""
@@ -23,22 +23,25 @@ fi
# 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=">=dev-libs/glib-2.25.9
+# latest gnome-menus is needed due to https://bugzilla.gnome.org/show_bug.cgi?id=645063#c4
+COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
>=dev-libs/gjs-0.7.11
>=dev-libs/gobject-introspection-0.10.1
x11-libs/gdk-pixbuf:2[introspection]
>=x11-libs/gtk+-3.0.0:3[introspection]
- >=media-libs/clutter-1.5.15[introspection]
+ >=media-libs/clutter-1.5.15:1.0[introspection]
>=gnome-base/gnome-desktop-2.91.2:3
>=gnome-base/gsettings-desktop-schemas-2.91.91
>=gnome-extra/evolution-data-server-2.91.6
>=media-libs/gstreamer-0.10.16
>=media-libs/gst-plugins-base-0.10.16
+ >=net-im/telepathy-logger-0.2.4[introspection]
>=net-libs/telepathy-glib-0.13.12[introspection]
>=net-wireless/gnome-bluetooth-2.90.0[introspection]
>=sys-auth/polkit-0.100[introspection]
- >=x11-wm/mutter-2.91.91[introspection]
+ >=x11-wm/mutter-2.91.91.1[introspection]
dev-libs/dbus-glib
dev-libs/libxml2:2
@@ -56,11 +59,13 @@ COMMON_DEPEND=">=dev-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="${COMMON_DEPEND}
+ >=sys-auth/polkit-0.101[introspection]
>=gnome-base/dconf-0.4.1
>=gnome-base/libgnomekbd-2.91.4[introspection]
@@ -69,7 +74,11 @@ RDEPEND="${COMMON_DEPEND}
>=gnome-base/gnome-session-2.91.91
>=gnome-base/gnome-settings-daemon-2.91
- >=gnome-base/gnome-control-center-2.91"
+ >=gnome-base/gnome-control-center-2.91
+
+ nm-applet? (
+ >=gnome-extra/nm-applet-0.8.996
+ >=net-misc/networkmanager-0.8.996-r1[introspection] )"
DEPEND="${COMMON_DEPEND}
sys-devel/gettext
>=dev-util/pkgconfig-0.22
@@ -83,8 +92,10 @@ G2CONF="--enable-compile-warnings=maximum
src_prepare() {
epatch "${FILESDIR}/${PN}-fix-gnome-bluetooth.patch"
- epatch "${FILESDIR}/${P}-fix-build.patch"
- eautoreconf
+
+ # https://bugzilla.gnome.org/show_bug.cgi?id=645063
+ sed -e 's/settings.menu/gnomecc.menu/g' -i src/shell-app-system.c || die
+
gnome2_src_prepare
}
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_bug.cgi?id=645063#c4
COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
>=dev-libs/gjs-0.7.11
>=dev-libs/gobject-introspection-0.10.1
@@ -32,6 +33,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
>=x11-libs/gtk+-3.0.0:3[introspection]
>=media-libs/clutter-1.5.15:1.0[introspection]
>=gnome-base/gnome-desktop-2.91.2:3
+ >=gnome-base/gnome-menus-2.91.91-r1
>=gnome-base/gsettings-desktop-schemas-2.91.91
>=gnome-extra/evolution-data-server-2.91.6
>=media-libs/gstreamer-0.10.16
@@ -48,7 +50,6 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
dev-libs/libcroco:0.6
gnome-base/gconf[introspection]
- gnome-base/gnome-menus
gnome-base/librsvg
media-libs/libcanberra
media-sound/pulseaudio
next reply other threads:[~2011-03-23 5:22 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-23 5:20 Nirbheek Chauhan [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-09-10 21:33 [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/ Gilles Dartiguelongue
2018-02-03 20:32 Sobhan Mohammadpour
2014-12-21 13:28 Gilles Dartiguelongue
2014-11-29 16:49 Remi Cardona
2014-04-15 22:05 Gilles Dartiguelongue
2013-12-10 23:31 Gilles Dartiguelongue
2012-10-02 1:51 Alexandre Rostovtsev
2012-08-18 15:41 Priit Laes
2012-05-21 6:49 Alexandre Restovtsev
2012-04-06 18:22 Alexandre Restovtsev
2012-04-03 6:36 Alexandre Restovtsev
2011-11-02 2:36 Nirbheek Chauhan
2011-10-18 7:37 Alexandre Restovtsev
2011-08-27 2:08 Alexandre Restovtsev
2011-06-02 14:43 Nirbheek Chauhan
2011-03-29 8:36 Nirbheek Chauhan
2011-03-15 13:08 Nirbheek Chauhan
2011-03-13 20:44 Nirbheek Chauhan
2011-03-10 15:41 Nirbheek Chauhan
2011-03-09 11:34 Nirbheek Chauhan
2011-03-04 10:23 Nirbheek Chauhan
2011-02-28 20:25 Nirbheek Chauhan
2011-02-22 19:44 Nirbheek Chauhan
2011-02-18 6:10 Nirbheek Chauhan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=94507d969053ae386770a097cc9b149dd910d3b7.nirbheek@gentoo \
--to=nirbheek@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox