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 1QzM67-0006Rk-4g for garchives@archives.gentoo.org; Fri, 02 Sep 2011 05:15:23 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 67B0821C033; Fri, 2 Sep 2011 05:15:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 18A7E21C033 for ; Fri, 2 Sep 2011 05:15:13 +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 713611B401F for ; Fri, 2 Sep 2011 05:15:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id C5DB380042 for ; Fri, 2 Sep 2011 05:15:12 +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: <935f17870e4dd3e3c5c8c33f76217b90825b9045.tetromino@gentoo> 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.1.90-default-avatar.patch gnome-base/gnome-shell/files/gnome-shell-3.1.90-folks-crash.patch gnome-base/gnome-shell/files/gnome-shell-3.1.90-gdm-batch.patch gnome-base/gnome-shell/files/gnome-shell-3.1.90-gi-1.29.17.patch gnome-base/gnome-shell/files/gnome-shell-3.1.90-telepathy-status.patch gnome-base/gnome-shell/files/gnome-shell-3.1.90.1-telepathy-gettext.patch gnome-base/gnome-shell/files/gnome-shell-3.1.90.1-workspaces-lazy-init.patch gnome-base/gnome-shell/gnome-shell-3.1.90.1.ebuild gnome-base/gnome-shell/gnome-shell-3.1.90.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: 935f17870e4dd3e3c5c8c33f76217b90825b9045 Date: Fri, 2 Sep 2011 05:15:12 +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: 2892e2635661ff99abd59bb125c36d2e commit: 935f17870e4dd3e3c5c8c33f76217b90825b9045 Author: Alexandre Rostovtsev gmail com> AuthorDate: Fri Sep 2 05:13:40 2011 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Fri Sep 2 05:13:40 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D935f1787 gnome-base/gnome-shell: 3.1.90 =E2=86=92 3.1.90.1 Version bump. Also, remove the incorrect extension warnings from the live ebuild. --- .../files/gnome-shell-3.1.90-default-avatar.patch | 24 ------ .../files/gnome-shell-3.1.90-folks-crash.patch | 34 --------- .../files/gnome-shell-3.1.90-gdm-batch.patch | 23 ------ .../files/gnome-shell-3.1.90-gi-1.29.17.patch | 75 --------------= ------ .../gnome-shell-3.1.90-telepathy-status.patch | 43 ----------- .../gnome-shell-3.1.90.1-telepathy-gettext.patch | 40 +++++++++++ ...gnome-shell-3.1.90.1-workspaces-lazy-init.patch | 52 ++++++++++++++ ...l-3.1.90.ebuild =3D> gnome-shell-3.1.90.1.ebuild} | 8 +-- gnome-base/gnome-shell/gnome-shell-9999.ebuild | 14 +---- 9 files changed, 95 insertions(+), 218 deletions(-) diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.1.90-default-avat= ar.patch b/gnome-base/gnome-shell/files/gnome-shell-3.1.90-default-avatar= .patch deleted file mode 100644 index f5c3a15..0000000 --- a/gnome-base/gnome-shell/files/gnome-shell-3.1.90-default-avatar.patc= h +++ /dev/null @@ -1,24 +0,0 @@ -From be4d504e27feeb0dbc4a17388fe03628989e4dcb Mon Sep 17 00:00:00 2001 -From: Jasper St. Pierre -Date: Mon, 29 Aug 2011 21:41:10 +0000 -Subject: userMenu: Don't show the default avatar over a newly selected o= ne - -When we replace the default avatar image with a real image, we need -to remove the default avatar image. - -https://bugzilla.gnome.org/show_bug.cgi?id=3D657657 ---- -diff --git a/js/ui/userMenu.js b/js/ui/userMenu.js -index 8d71ce2..33c3315 100644 ---- a/js/ui/userMenu.js -+++ b/js/ui/userMenu.js -@@ -226,6 +226,7 @@ IMStatusChooserItem.prototype =3D { -=20 - _setIconFromFile: function(iconFile) { - this._iconBin.set_style('background-image: url("' + iconFile + = '");'); -+ this._iconBin.child =3D null; - }, -=20 - _setIconFromName: function(iconName) { --- -cgit v0.9.0.2 diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.1.90-folks-crash.= patch b/gnome-base/gnome-shell/files/gnome-shell-3.1.90-folks-crash.patch deleted file mode 100644 index 695e5b9..0000000 --- a/gnome-base/gnome-shell/files/gnome-shell-3.1.90-folks-crash.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c2c4c26f72b900d0a95c5daca64c46cb7e281f33 Mon Sep 17 00:00:00 2001 -From: Alexander Larsson -Date: Tue, 30 Aug 2011 09:13:35 +0000 -Subject: Don't crash displaying contacts with no alias - -If a folks individual has no alias we crash when passing in NULL -to strstr(). Fix this by checking for non-null first. ---- -diff --git a/src/shell-contact-system.c b/src/shell-contact-system.c -index 971a164..9ac79de 100644 ---- a/src/shell-contact-system.c -+++ b/src/shell-contact-system.c -@@ -134,11 +134,14 @@ do_match (ShellContactSystem *self, - const char *p; -=20 - /* Match on alias */ -- p =3D strstr (alias, term); -- if (p =3D=3D alias) -- have_alias_prefix =3D TRUE; -- else if (p !=3D NULL) -- have_alias_substring =3D TRUE; -+ if (alias !=3D NULL) -+ { -+ p =3D strstr (alias, term); -+ if (p =3D=3D alias) -+ have_alias_prefix =3D TRUE; -+ else if (p !=3D NULL) -+ have_alias_substring =3D TRUE; -+ } -=20 - /* Match on one or more IM addresses */ - im_addrs_iter =3D gee_iterable_iterator (GEE_ITERABLE (im_addrs))= ; --- -cgit v0.9.0.2 diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.1.90-gdm-batch.pa= tch b/gnome-base/gnome-shell/files/gnome-shell-3.1.90-gdm-batch.patch deleted file mode 100644 index 8df0e37..0000000 --- a/gnome-base/gnome-shell/files/gnome-shell-3.1.90-gdm-batch.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 612b9e9faf014f9b9ff8fbf58176769583f69d5f Mon Sep 17 00:00:00 2001 -From: Marc-Antoine Perennou -Date: Tue, 30 Aug 2011 11:52:25 +0000 -Subject: Fix batch import for loginDialog - -Signed-off-by: Marc-Antoine Perennou -Signed-off-by: Adel Gadllah ---- -diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js -index 36799e3..3ba8aca 100644 ---- a/js/gdm/loginDialog.js -+++ b/js/gdm/loginDialog.js -@@ -32,7 +32,7 @@ const Shell =3D imports.gi.Shell; - const St =3D imports.gi.St; - const GdmGreeter =3D imports.gi.GdmGreeter; -=20 --const Batch =3D imports.misc.batch; -+const Batch =3D imports.gdm.batch; - const Lightbox =3D imports.ui.lightbox; - const Main =3D imports.ui.main; - const ModalDialog =3D imports.ui.modalDialog; --- -cgit v0.9.0.2 diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.1.90-gi-1.29.17.p= atch b/gnome-base/gnome-shell/files/gnome-shell-3.1.90-gi-1.29.17.patch deleted file mode 100644 index 7a0505d..0000000 --- a/gnome-base/gnome-shell/files/gnome-shell-3.1.90-gi-1.29.17.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 14e8cba2b184b16d0dbd9beb929860a1e1155709 Mon Sep 17 00:00:00 2001 -From: Dan Winship -Date: Tue, 30 Aug 2011 16:07:11 +0000 -Subject: Add some (element-type) annotations to appease g-i master - ---- -diff --git a/src/gvc/gvc-mixer-card.c b/src/gvc/gvc-mixer-card.c -index 56502e3..168bc79 100644 ---- a/src/gvc/gvc-mixer-card.c -+++ b/src/gvc/gvc-mixer-card.c -@@ -263,6 +263,11 @@ gvc_mixer_card_change_profile (GvcMixerCard *card, - return TRUE; - } -=20 -+/** -+ * gvc_mixer_card_get_profiles: -+ * -+ * Return value: (transfer none) (element-type GvcMixerCardProfile): -+ */ - const GList * - gvc_mixer_card_get_profiles (GvcMixerCard *card) - { -@@ -281,6 +286,10 @@ sort_profiles (GvcMixerCardProfile *a, - return -1; - } -=20 -+/** -+ * gvc_mixer_card_set_profiles: -+ * @profiles: (transfer full) (element-type GvcMixerCardProfile): -+ */ - gboolean - gvc_mixer_card_set_profiles (GvcMixerCard *card, - GList *profiles) -diff --git a/src/gvc/gvc-mixer-stream.c b/src/gvc/gvc-mixer-stream.c -index 78de6b3..f35954a 100644 ---- a/src/gvc/gvc-mixer-stream.c -+++ b/src/gvc/gvc-mixer-stream.c -@@ -508,6 +508,11 @@ gvc_mixer_stream_change_port (GvcMixerStream *strea= m, - return GVC_MIXER_STREAM_GET_CLASS (stream)->change_port (stream= , port); - } -=20 -+/** -+ * gvc_mixer_stream_get_ports: -+ * -+ * Return value: (transfer none) (element-type GvcMixerStreamPort): -+ */ - const GList * - gvc_mixer_stream_get_ports (GvcMixerStream *stream) - { -@@ -526,6 +531,10 @@ sort_ports (GvcMixerStreamPort *a, - return -1; - } -=20 -+/** -+ * gvc_mixer_stream_set_ports: -+ * @ports: (transfer full) (element-type GvcMixerStreamPort): -+ */ - gboolean - gvc_mixer_stream_set_ports (GvcMixerStream *stream, - GList *ports) -diff --git a/src/shell-app.c b/src/shell-app.c -index 75444b6..0455f42 100644 ---- a/src/shell-app.c -+++ b/src/shell-app.c -@@ -1051,7 +1051,7 @@ _gather_pid_callback (GDesktopAppInfo *gapp, - /** - * shell_app_launch: - * @timestamp: Event timestamp, or 0 for current event timestamp -- * @uris: List of uris to pass to application -+ * @uris: (element-type utf8): List of uris to pass to application - * @workspace: Start on this workspace, or -1 for default - * @startup_id: (out): Returned startup notification ID, or %NULL if no= ne - * @error: A #GError --- -cgit v0.9.0.2 diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.1.90-telepathy-st= atus.patch b/gnome-base/gnome-shell/files/gnome-shell-3.1.90-telepathy-st= atus.patch deleted file mode 100644 index 4bd3a1c..0000000 --- a/gnome-base/gnome-shell/files/gnome-shell-3.1.90-telepathy-status.pa= tch +++ /dev/null @@ -1,43 +0,0 @@ -From 8cf6b4c7283a383883bdec6ee13b194ae3a5137b Mon Sep 17 00:00:00 2001 -From: Guillaume Desmottes -Date: Tue, 30 Aug 2011 12:35:20 +0000 -Subject: don't translate IM status - -They are well-known strings defined in the Telepathy spec and so shouldn= 't be -translated. - -https://bugzilla.gnome.org/show_bug.cgi?id=3D657696 ---- -diff --git a/js/ui/userMenu.js b/js/ui/userMenu.js -index 33c3315..115bcf7 100644 ---- a/js/ui/userMenu.js -+++ b/js/ui/userMenu.js -@@ -250,19 +250,19 @@ IMStatusChooserItem.prototype =3D { - _statusForPresence: function(presence) { - switch(presence) { - case Tp.ConnectionPresenceType.AVAILABLE: -- return _("Available"); -+ return 'available'; - case Tp.ConnectionPresenceType.BUSY: -- return _("Busy"); -+ return 'busy'; - case Tp.ConnectionPresenceType.OFFLINE: -- return _("Unavailable"); -+ return 'offline'; - case Tp.ConnectionPresenceType.HIDDEN: -- return _("Hidden"); -+ return 'hidden'; - case Tp.ConnectionPresenceType.AWAY: -- return _("Away"); -+ return 'away'; - case Tp.ConnectionPresenceType.EXTENDED_AWAY: -- return _("Idle"); -+ return 'xa'; - default: -- return _("Unknown"); -+ return 'unknown'; - } - }, -=20 --- -cgit v0.9.0.2 diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.1.90.1-telepathy-= gettext.patch b/gnome-base/gnome-shell/files/gnome-shell-3.1.90.1-telepat= hy-gettext.patch new file mode 100644 index 0000000..16f0de4 --- /dev/null +++ b/gnome-base/gnome-shell/files/gnome-shell-3.1.90.1-telepathy-gettext= .patch @@ -0,0 +1,40 @@ +From 88f2bbba61f4d158c281fc061ddacb887d5224d8 Mon Sep 17 00:00:00 2001 +From: Dan Winship +Date: Tue, 30 Aug 2011 20:16:28 +0000 +Subject: telepathyClient: don't try to translate concatenations of strin= gs + +xgettext doesn't recognize it + +https://bugzilla.gnome.org/show_bug.cgi?id=3D657759 +--- +diff --git a/js/ui/telepathyClient.js b/js/ui/telepathyClient.js +index 9e0f3ef..1fba939 100644 +--- a/js/ui/telepathyClient.js ++++ b/js/ui/telepathyClient.js +@@ -1426,8 +1426,7 @@ _connectionErrorMessages[Tp.error_get_dbus_name(Tp= .Error.CONNECTION_LOST)] + _connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.ALREADY_CONNEC= TED)] + =3D _("This resource is already connected to the server"); + _connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CONNECTION_REP= LACED)] +- =3D _("Connection has been replaced by a new connection using the " +- + "same resource"); ++ =3D _("Connection has been replaced by a new connection using the sam= e resource"); + _connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.REGISTRATION_E= XISTS)] + =3D _("The account already exists on the server"); + _connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.SERVICE_BUSY)] +@@ -1435,12 +1434,9 @@ _connectionErrorMessages[Tp.error_get_dbus_name(T= p.Error.SERVICE_BUSY)] + _connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CERT_REVOKED)] + =3D _("Certificate has been revoked"); + _connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CERT_INSECURE)= ] +- =3D _("Certificate uses an insecure cipher algorithm or is " +- + "cryptographically weak"); ++ =3D _("Certificate uses an insecure cipher algorithm or is cryptograp= hically weak"); + _connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CERT_LIMIT_EXC= EEDED)] +- =3D _("The length of the server certificate, or the depth of the " +- + "server certificate chain, exceed the limits imposed by the " +- + "cryptography library"); ++ =3D _("The length of the server certificate, or the depth of the serv= er certificate chain, exceed the limits imposed by the cryptography libra= ry"); +=20 + AccountNotification.prototype =3D { + __proto__: MessageTray.Notification.prototype, +-- +cgit v0.9.0.2 diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.1.90.1-workspaces= -lazy-init.patch b/gnome-base/gnome-shell/files/gnome-shell-3.1.90.1-work= spaces-lazy-init.patch new file mode 100644 index 0000000..5dc408c --- /dev/null +++ b/gnome-base/gnome-shell/files/gnome-shell-3.1.90.1-workspaces-lazy-i= nit.patch @@ -0,0 +1,52 @@ +From 3aa904da0aa938c3fee09357bcff3a1de6321308 Mon Sep 17 00:00:00 2001 +From: Jasper St. Pierre +Date: Thu, 01 Sep 2011 20:09:46 +0000 +Subject: workspacesView: Only connect to nWorkspacesChanged after we've = lazily inited + +We lazily init this._workspaces, so we shouldn't try to run any code tha= t uses +it until after it's been created. + +https://bugzilla.gnome.org/show_bug.cgi?id=3D658007 +--- +diff --git a/js/ui/workspacesView.js b/js/ui/workspacesView.js +index 955aee0..f240682 100644 +--- a/js/ui/workspacesView.js ++++ b/js/ui/workspacesView.js +@@ -567,8 +567,6 @@ WorkspacesDisplay.prototype =3D { + this._updateAlwaysZoom(); +=20 + Main.layoutManager.connect('monitors-changed', Lang.bind(this, = this._updateAlwaysZoom)); +- global.screen.connect('notify::n-workspaces', +- Lang.bind(this, this._workspacesChanged))= ; +=20 + Main.xdndHandler.connect('drag-begin', Lang.bind(this, function= (){ + this._alwaysZoomOut =3D true; +@@ -581,6 +579,7 @@ WorkspacesDisplay.prototype =3D { +=20 + this._switchWorkspaceNotifyId =3D 0; +=20 ++ this._nWorkspacesChangedId =3D 0; + this._itemDragBeginId =3D 0; + this._itemDragCancelledId =3D 0; + this._itemDragEndId =3D 0; +@@ -589,7 +588,7 @@ WorkspacesDisplay.prototype =3D { + this._windowDragEndId =3D 0; + }, +=20 +- show: function() { ++ show: function() { + this._zoomOut =3D this._alwaysZoomOut; + this._zoomFraction =3D this._alwaysZoomOut ? 1 : 0; + this._updateZoom(); +@@ -612,6 +611,9 @@ WorkspacesDisplay.prototype =3D { + global.screen.connect('restacked', + Lang.bind(this, this._onRestacked)); +=20 ++ if (this._nWorkspacesChangedId =3D=3D 0) ++ this._nWorkspacesChangedId =3D global.screen.connect('notif= y::n-workspaces', ++ Lang.bin= d(this, this._workspacesChanged)); + if (this._itemDragBeginId =3D=3D 0) + this._itemDragBeginId =3D Main.overview.connect('item-drag-= begin', + Lang.bind(thi= s, this._dragBegin)); +-- +cgit v0.9.0.2 diff --git a/gnome-base/gnome-shell/gnome-shell-3.1.90.ebuild b/gnome-bas= e/gnome-shell/gnome-shell-3.1.90.1.ebuild similarity index 92% rename from gnome-base/gnome-shell/gnome-shell-3.1.90.ebuild rename to gnome-base/gnome-shell/gnome-shell-3.1.90.1.ebuild index 258babe..9573aed 100644 --- a/gnome-base/gnome-shell/gnome-shell-3.1.90.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-3.1.90.1.ebuild @@ -110,12 +110,8 @@ pkg_setup() { src_prepare() { gnome2_src_prepare # Useful patches from upstream git, will be in next release - epatch "${FILESDIR}/${P}-default-avatar.patch" - epatch "${FILESDIR}/${P}-folks-crash.patch" - epatch "${FILESDIR}/${P}-gdm-batch.patch" - epatch "${FILESDIR}/${P}-telepathy-status.patch" - # gobject-introspection-1.29.17 compat, will be in next release - epatch "${FILESDIR}/${P}-gi-1.29.17.patch" + epatch "${FILESDIR}/${P}-telepathy-gettext.patch" + epatch "${FILESDIR}/${P}-workspaces-lazy-init.patch" } =20 src_install() { diff --git a/gnome-base/gnome-shell/gnome-shell-9999.ebuild b/gnome-base/= gnome-shell/gnome-shell-9999.ebuild index 2cdf2d0..ffa6bc7 100644 --- a/gnome-base/gnome-shell/gnome-shell-9999.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-9999.ebuild @@ -88,11 +88,7 @@ RDEPEND=3D"${COMMON_DEPEND} =20 >=3Dsys-apps/accountsservice-0.6.12 =20 - >=3Dapp-accessibility/caribou-0.3 - - !!<=3Dgnome-extra/gnome-shell-extensions-3.1.4" -# The *presence* of <=3Dgnome-shell-extensions-3.1.4 destabilizes gnome-= shell. -# Disabling the extensions is not enough; they must be physically uninst= alled. + >=3Dapp-accessibility/caribou-0.3" DEPEND=3D"${COMMON_DEPEND} >=3Dsys-devel/gettext-0.17 >=3Ddev-util/pkgconfig-0.22 @@ -109,14 +105,6 @@ pkg_setup() { --enable-compile-warnings=3Dmaximum --disable-schemas-compile --disable-jhbuild-wrapper-script" - - ewarn - ewarn "${PN} tends to crash at login or shortly thereafter if there are= any" - ewarn "old shell extensions *installed*, whether systemwide or in a use= r's" - ewarn "home directory." - ewarn "Disabling the extensions is not enough. You should uninstall the= " - ewarn "extensions before upgrading gnome-shell to ${PV}." - ewarn } =20 src_install() {