From: "Alexandre Restovtsev" <tetromino@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:gnome-next commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/
Date: Wed, 27 Jul 2011 05:51:55 +0000 (UTC) [thread overview]
Message-ID: <b3f6ae0f8587391e06b6833371c4b6d8165ea746.tetromino@gentoo> (raw)
commit: b3f6ae0f8587391e06b6833371c4b6d8165ea746
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Jul 27 03:26:39 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Jul 27 03:52:58 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=b3f6ae0f
gnome-base/gnome-shell: 3.0.2 → 3.1.3
Bump to gnome-3.1.x version. Warning: this is very nearly untested. Drop
patch that was applied upstream and update dependencies.
---
.../gnome-shell-3.0.2-user-removed-signals.patch | 33 --------------------
...shell-3.0.2.ebuild => gnome-shell-3.1.3.ebuild} | 27 ++++++---------
gnome-base/gnome-shell/gnome-shell-9999.ebuild | 30 ++++++++---------
3 files changed, 25 insertions(+), 65 deletions(-)
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.0.2-user-removed-signals.patch b/gnome-base/gnome-shell/files/gnome-shell-3.0.2-user-removed-signals.patch
deleted file mode 100644
index adae1f0..0000000
--- a/gnome-base/gnome-shell/files/gnome-shell-3.0.2-user-removed-signals.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 9a7f3dbd2030a5e1b54297f1aa7cf228eccafb27 Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@redhat.com>
-Date: Tue, 24 May 2011 22:15:10 -0400
-Subject: [PATCH] gdm: ignore user-removed signals for untracked users
-
-If we don't know about a user, we don't care if it goes away,
-and we shouldn't try to remove it from the book keeping.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=647893
----
- src/gdmuser/gdm-user-manager.c | 7 +++++++
- 1 files changed, 7 insertions(+), 0 deletions(-)
-
-diff --git a/src/gdmuser/gdm-user-manager.c b/src/gdmuser/gdm-user-manager.c
-index e7ca833..561be32 100644
---- a/src/gdmuser/gdm-user-manager.c
-+++ b/src/gdmuser/gdm-user-manager.c
-@@ -887,6 +887,13 @@ on_user_removed_in_accounts_service (DBusGProxy *proxy,
-
- user = g_hash_table_lookup (manager->priv->users_by_object_path, object_path);
-
-+ if (user == NULL) {
-+ g_debug ("GdmUserManager: ignoring untracked user %s", object_path);
-+ return;
-+ } else {
-+ g_debug ("GdmUserManager: tracked user %s removed from accounts service", object_path);
-+ }
-+
- manager->priv->new_users = g_slist_remove (manager->priv->new_users, user);
-
- remove_user (manager, user);
---
-1.7.5.1
\ No newline at end of file
diff --git a/gnome-base/gnome-shell/gnome-shell-3.0.2.ebuild b/gnome-base/gnome-shell/gnome-shell-3.1.3.ebuild
similarity index 86%
rename from gnome-base/gnome-shell/gnome-shell-3.0.2.ebuild
rename to gnome-base/gnome-shell/gnome-shell-3.1.3.ebuild
index 14feacb..0c898a4 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.0.2.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.1.3.ebuild
@@ -3,11 +3,12 @@
# $Header: $
EAPI="3"
+GNOME_TARBALL_SUFFIX="xz"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
PYTHON_DEPEND="2:2.5"
-inherit eutils gnome2 python
+inherit gnome2 python
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -28,6 +29,7 @@ fi
# FIXME: Automagic gnome-bluetooth[introspection] support.
# latest gsettings-desktop-schemas is needed due to commit 602fa1c6
# latest g-c-c is needed due to https://bugs.gentoo.org/show_bug.cgi?id=360057
+# libXfixes-5.0 needed for pointer barriers
COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
>=dev-libs/gjs-0.7.11
>=dev-libs/gobject-introspection-0.10.1
@@ -36,19 +38,19 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
>=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.32.0
+ >=gnome-extra/evolution-data-server-2.91.6
>=media-libs/gstreamer-0.10.16:0.10
>=media-libs/gst-plugins-base-0.10.16:0.10
>=net-im/telepathy-logger-0.2.4[introspection]
- >=net-libs/telepathy-glib-0.13.12[introspection]
- >=net-wireless/gnome-bluetooth-2.90.0[introspection]
+ >=net-libs/telepathy-glib-0.15.0[introspection]
+ >=net-wireless/gnome-bluetooth-3.1.0[introspection]
>=sys-auth/polkit-0.100[introspection]
>=x11-wm/mutter-3.0.0[introspection]
dev-libs/dbus-glib
dev-libs/libxml2:2
x11-libs/pango[introspection]
- dev-libs/libcroco:0.6
+ >=dev-libs/libcroco-0.6.2:0.6
gnome-base/gconf:2[introspection]
gnome-base/gnome-menus
@@ -56,9 +58,9 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
media-libs/libcanberra
media-sound/pulseaudio
- x11-libs/startup-notification
+ >=x11-libs/startup-notification-0.11
x11-libs/libX11
- x11-libs/libXfixes
+ >=x11-libs/libXfixes-5.0
x11-apps/mesa-progs"
# Runtime-only deps are probably incomplete and approximate.
# Each block:
@@ -86,9 +88,9 @@ RDEPEND="${COMMON_DEPEND}
>=gnome-extra/nm-applet-0.8.999
>=net-misc/networkmanager-0.8.999[introspection] )"
DEPEND="${COMMON_DEPEND}
- sys-devel/gettext
+ >=sys-devel/gettext-0.17
>=dev-util/pkgconfig-0.22
- >=dev-util/intltool-0.26
+ >=dev-util/intltool-0.40
gnome-base/gnome-common
!!<dev-lang/spidermonkey-2"
# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
@@ -103,13 +105,6 @@ pkg_setup() {
--disable-jhbuild-wrapper-script"
}
-src_prepare() {
- # https://bugzilla.gnome.org/show_bug.cgi?id=647893
- # can trigger the crash even with accountsservice-0.6.12
- epatch "${FILESDIR}/${PN}-3.0.2-user-removed-signals.patch"
- gnome2_src_prepare
-}
-
src_install() {
gnome2_src_install
python_convert_shebangs 2 "${D}"/usr/bin/gnome-shell-extension-tool
diff --git a/gnome-base/gnome-shell/gnome-shell-9999.ebuild b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
index 3df02e5..0ad9a8e 100644
--- a/gnome-base/gnome-shell/gnome-shell-9999.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
@@ -3,11 +3,12 @@
# $Header: $
EAPI="3"
+GNOME_TARBALL_SUFFIX="xz"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
PYTHON_DEPEND="2:2.5"
-inherit eutils gnome2 python
+inherit gnome2 python
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -28,27 +29,29 @@ fi
# FIXME: Automagic gnome-bluetooth[introspection] support.
# latest gsettings-desktop-schemas is needed due to commit 602fa1c6
# latest g-c-c is needed due to https://bugs.gentoo.org/show_bug.cgi?id=360057
+# libXfixes-5.0 needed for pointer barriers
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:1.0[introspection]
+ >=media-libs/clutter-1.7.5: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.32.0
+ >=gnome-extra/evolution-data-server-2.91.6
>=media-libs/gstreamer-0.10.16:0.10
>=media-libs/gst-plugins-base-0.10.16:0.10
>=net-im/telepathy-logger-0.2.4[introspection]
- >=net-libs/telepathy-glib-0.13.12[introspection]
- >=net-wireless/gnome-bluetooth-2.90.0[introspection]
+ net-libs/libsoup:2.4[introspection]
+ >=net-libs/telepathy-glib-0.15.3[introspection]
+ >=net-wireless/gnome-bluetooth-3.1.0[introspection]
>=sys-auth/polkit-0.100[introspection]
>=x11-wm/mutter-3.0.0[introspection]
dev-libs/dbus-glib
dev-libs/libxml2:2
x11-libs/pango[introspection]
- dev-libs/libcroco:0.6
+ >=dev-libs/libcroco-0.6.2:0.6
gnome-base/gconf:2[introspection]
gnome-base/gnome-menus
@@ -56,9 +59,9 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
media-libs/libcanberra
media-sound/pulseaudio
- x11-libs/startup-notification
+ >=x11-libs/startup-notification-0.11
x11-libs/libX11
- x11-libs/libXfixes
+ >=x11-libs/libXfixes-5.0
x11-apps/mesa-progs"
# Runtime-only deps are probably incomplete and approximate.
# Each block:
@@ -86,11 +89,11 @@ RDEPEND="${COMMON_DEPEND}
>=gnome-extra/nm-applet-0.8.999
>=net-misc/networkmanager-0.8.999[introspection] )"
DEPEND="${COMMON_DEPEND}
- sys-devel/gettext
+ >=sys-devel/gettext-0.17
>=dev-util/pkgconfig-0.22
- >=dev-util/intltool-0.26
+ >=dev-util/intltool-0.40
gnome-base/gnome-common
- !dev-lang/spidermonkey"
+ !!<dev-lang/spidermonkey-2"
# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
# https://bugs.gentoo.org/show_bug.cgi?id=360413
@@ -103,11 +106,6 @@ pkg_setup() {
--disable-jhbuild-wrapper-script"
}
-src_prepare() {
- EPATCH_SUFFIX="patch" epatch "${WORKDIR}"
- gnome2_src_prepare
-}
-
src_install() {
gnome2_src_install
python_convert_shebangs 2 "${D}"/usr/bin/gnome-shell-extension-tool
next reply other threads:[~2011-07-27 5:52 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-27 5:51 Alexandre Restovtsev [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-08-30 21:55 [gentoo-commits] proj/gnome:gnome-next commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/ Alexandre Restovtsev
2011-08-31 11:45 Alexandre Restovtsev
2011-09-02 5:15 Alexandre Restovtsev
2011-09-07 6:30 Alexandre Restovtsev
2011-10-01 2:10 Alexandre Restovtsev
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=b3f6ae0f8587391e06b6833371c4b6d8165ea746.tetromino@gentoo \
--to=tetromino@gmail.com \
--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