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 1Qlx2V-0002Df-9c for garchives@archives.gentoo.org; Wed, 27 Jul 2011 05:52:15 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0509021C10F; Wed, 27 Jul 2011 05:51:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B8E2221C0EB for ; Wed, 27 Jul 2011 05:51:56 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 108F21B402C for ; Wed, 27 Jul 2011 05:51:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 1CBA480042 for ; Wed, 27 Jul 2011 05:51:55 +0000 (UTC) From: "Alexandre Restovtsev" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" Message-ID: Subject: [gentoo-commits] proj/gnome:gnome-next 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-3.0.2-user-removed-signals.patch gnome-base/gnome-shell/gnome-shell-3.0.2.ebuild gnome-base/gnome-shell/gnome-shell-3.1.3.ebuild gnome-base/gnome-shell/gnome-shell-9999.ebuild X-VCS-Directories: gnome-base/gnome-shell/ gnome-base/gnome-shell/files/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: b3f6ae0f8587391e06b6833371c4b6d8165ea746 Date: Wed, 27 Jul 2011 05:51:55 +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: e458f3d7551bbcfe5ebdaa4f7079d1ef commit: b3f6ae0f8587391e06b6833371c4b6d8165ea746 Author: Alexandre Rostovtsev gmail com> AuthorDate: Wed Jul 27 03:26:39 2011 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Wed Jul 27 03:52:58 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3Db3f6ae0f gnome-base/gnome-shell: 3.0.2 =E2=86=92 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 =3D> 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-remov= ed-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 -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=3D647893 ---- - 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-manag= er.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 *pr= oxy, -=20 - user =3D g_hash_table_lookup (manager->priv->users_by_object_pa= th, object_path); -=20 -+ if (user =3D=3D 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 =3D g_slist_remove (manager->priv->new= _users, user); -=20 - remove_user (manager, user); ---=20 -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: $ =20 EAPI=3D"3" +GNOME_TARBALL_SUFFIX=3D"xz" GCONF_DEBUG=3D"no" GNOME2_LA_PUNT=3D"yes" PYTHON_DEPEND=3D"2:2.5" =20 -inherit eutils gnome2 python +inherit gnome2 python if [[ ${PV} =3D 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=3D= 360057 +# libXfixes-5.0 needed for pointer barriers COMMON_DEPEND=3D">=3Ddev-libs/glib-2.25.9:2 >=3Ddev-libs/gjs-0.7.11 >=3Ddev-libs/gobject-introspection-0.10.1 @@ -36,19 +38,19 @@ COMMON_DEPEND=3D">=3Ddev-libs/glib-2.25.9:2 >=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.32.0 + >=3Dgnome-extra/evolution-data-server-2.91.6 >=3Dmedia-libs/gstreamer-0.10.16:0.10 >=3Dmedia-libs/gst-plugins-base-0.10.16:0.10 >=3Dnet-im/telepathy-logger-0.2.4[introspection] - >=3Dnet-libs/telepathy-glib-0.13.12[introspection] - >=3Dnet-wireless/gnome-bluetooth-2.90.0[introspection] + >=3Dnet-libs/telepathy-glib-0.15.0[introspection] + >=3Dnet-wireless/gnome-bluetooth-3.1.0[introspection] >=3Dsys-auth/polkit-0.100[introspection] >=3Dx11-wm/mutter-3.0.0[introspection] =20 dev-libs/dbus-glib dev-libs/libxml2:2 x11-libs/pango[introspection] - dev-libs/libcroco:0.6 + >=3Ddev-libs/libcroco-0.6.2:0.6 =20 gnome-base/gconf:2[introspection] gnome-base/gnome-menus @@ -56,9 +58,9 @@ COMMON_DEPEND=3D">=3Ddev-libs/glib-2.25.9:2 media-libs/libcanberra media-sound/pulseaudio =20 - x11-libs/startup-notification + >=3Dx11-libs/startup-notification-0.11 x11-libs/libX11 - x11-libs/libXfixes + >=3Dx11-libs/libXfixes-5.0 x11-apps/mesa-progs" # Runtime-only deps are probably incomplete and approximate. # Each block: @@ -86,9 +88,9 @@ RDEPEND=3D"${COMMON_DEPEND} >=3Dgnome-extra/nm-applet-0.8.999 >=3Dnet-misc/networkmanager-0.8.999[introspection] )" DEPEND=3D"${COMMON_DEPEND} - sys-devel/gettext + >=3Dsys-devel/gettext-0.17 >=3Ddev-util/pkgconfig-0.22 - >=3Ddev-util/intltool-0.26 + >=3Ddev-util/intltool-0.40 gnome-base/gnome-common !!=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:1.0[introspection] + >=3Dmedia-libs/clutter-1.7.5: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.32.0 + >=3Dgnome-extra/evolution-data-server-2.91.6 >=3Dmedia-libs/gstreamer-0.10.16:0.10 >=3Dmedia-libs/gst-plugins-base-0.10.16:0.10 >=3Dnet-im/telepathy-logger-0.2.4[introspection] - >=3Dnet-libs/telepathy-glib-0.13.12[introspection] - >=3Dnet-wireless/gnome-bluetooth-2.90.0[introspection] + net-libs/libsoup:2.4[introspection] + >=3Dnet-libs/telepathy-glib-0.15.3[introspection] + >=3Dnet-wireless/gnome-bluetooth-3.1.0[introspection] >=3Dsys-auth/polkit-0.100[introspection] >=3Dx11-wm/mutter-3.0.0[introspection] =20 dev-libs/dbus-glib dev-libs/libxml2:2 x11-libs/pango[introspection] - dev-libs/libcroco:0.6 + >=3Ddev-libs/libcroco-0.6.2:0.6 =20 gnome-base/gconf:2[introspection] gnome-base/gnome-menus @@ -56,9 +59,9 @@ COMMON_DEPEND=3D">=3Ddev-libs/glib-2.25.9:2 media-libs/libcanberra media-sound/pulseaudio =20 - x11-libs/startup-notification + >=3Dx11-libs/startup-notification-0.11 x11-libs/libX11 - x11-libs/libXfixes + >=3Dx11-libs/libXfixes-5.0 x11-apps/mesa-progs" # Runtime-only deps are probably incomplete and approximate. # Each block: @@ -86,11 +89,11 @@ RDEPEND=3D"${COMMON_DEPEND} >=3Dgnome-extra/nm-applet-0.8.999 >=3Dnet-misc/networkmanager-0.8.999[introspection] )" DEPEND=3D"${COMMON_DEPEND} - sys-devel/gettext + >=3Dsys-devel/gettext-0.17 >=3Ddev-util/pkgconfig-0.22 - >=3Ddev-util/intltool-0.26 + >=3Ddev-util/intltool-0.40 gnome-base/gnome-common - !dev-lang/spidermonkey" + !!