diff options
author | Alexandre Rostovtsev <tetromino@gmail.com> | 2011-09-02 01:13:40 -0400 |
---|---|---|
committer | Alexandre Rostovtsev <tetromino@gmail.com> | 2011-09-02 01:13:40 -0400 |
commit | 935f17870e4dd3e3c5c8c33f76217b90825b9045 (patch) | |
tree | 634e8262956c29451b4c53a693c2a6098659e71d /gnome-base/gnome-shell | |
parent | x11-themes/gnome-icon-theme-symbolic: 3.1.4 → 3.1.90 (diff) | |
download | gnome-935f17870e4dd3e3c5c8c33f76217b90825b9045.tar.gz gnome-935f17870e4dd3e3c5c8c33f76217b90825b9045.tar.bz2 gnome-935f17870e4dd3e3c5c8c33f76217b90825b9045.zip |
gnome-base/gnome-shell: 3.1.90 → 3.1.90.1
Version bump. Also, remove the incorrect extension warnings from the
live ebuild.
Diffstat (limited to 'gnome-base/gnome-shell')
-rw-r--r-- | gnome-base/gnome-shell/Manifest | 13 | ||||
-rw-r--r-- | gnome-base/gnome-shell/files/gnome-shell-3.1.90-default-avatar.patch | 24 | ||||
-rw-r--r-- | gnome-base/gnome-shell/files/gnome-shell-3.1.90-folks-crash.patch | 34 | ||||
-rw-r--r-- | gnome-base/gnome-shell/files/gnome-shell-3.1.90-gdm-batch.patch | 23 | ||||
-rw-r--r-- | gnome-base/gnome-shell/files/gnome-shell-3.1.90-gi-1.29.17.patch | 75 | ||||
-rw-r--r-- | gnome-base/gnome-shell/files/gnome-shell-3.1.90-telepathy-status.patch | 43 | ||||
-rw-r--r-- | gnome-base/gnome-shell/files/gnome-shell-3.1.90.1-telepathy-gettext.patch | 40 | ||||
-rw-r--r-- | gnome-base/gnome-shell/files/gnome-shell-3.1.90.1-workspaces-lazy-init.patch | 52 | ||||
-rw-r--r-- | gnome-base/gnome-shell/gnome-shell-3.1.90.1.ebuild (renamed from gnome-base/gnome-shell/gnome-shell-3.1.90.ebuild) | 8 | ||||
-rw-r--r-- | gnome-base/gnome-shell/gnome-shell-9999.ebuild | 14 |
10 files changed, 100 insertions, 226 deletions
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest index 37b83082..866052b0 100644 --- a/gnome-base/gnome-shell/Manifest +++ b/gnome-base/gnome-shell/Manifest @@ -1,11 +1,8 @@ AUX gnome-shell-3.1.4-gi-1.29.17.patch 2636 RMD160 4f50ca3ae693726c6e6c532801e89c78e9e5a965 SHA1 6275d4d5c6d79c6d874c8d65e54bfbb2318fe552 SHA256 7eb4eec292c53eef3fad38d8a538bc267e322bd3bece66552d4173d31b3d0049 -AUX gnome-shell-3.1.90-default-avatar.patch 809 RMD160 6e409eb33a3d4e24080328da82dc3cfeb5f6f2bf SHA1 39197275c214d7bfd7943e776c397bf7a7a28af0 SHA256 7723f67878c000b3fd4626d7a28995f474681b434b19a03bfe03b1d352e59cca -AUX gnome-shell-3.1.90-folks-crash.patch 1076 RMD160 8420540177746829fbf3bd40305ca0484e2d6fa4 SHA1 b0de4b2db465466238b22922fe8d7e4ac3a78e91 SHA256 b2a53c318902fcd74c12e5b88db80f54a23480a23d6315caaa54dd99359fded7 -AUX gnome-shell-3.1.90-gdm-batch.patch 798 RMD160 82d2a59d170a79b74316f52d8d1da2bd435d176d SHA1 8f48df402112a5f99f18afd5afbc66e4e07f6101 SHA256 a9ea93f56a578c510820c792ff451348a3dd31498e1b7950214a3134ee75f226 -AUX gnome-shell-3.1.90-gi-1.29.17.patch 2350 RMD160 c28faf9a821d270cc5ef74e4735bc428b034326f SHA1 f6f0fb8b964c5c5f6f530cdb87b5d46e20e1197a SHA256 4a91d02616c3c3dc254af35475a7f61583af301fa4f761f4bbb26d2beaa5155c -AUX gnome-shell-3.1.90-telepathy-status.patch 1489 RMD160 c49a8dd5dbc2dd2298d162afa51a8c774bf845fe SHA1 7faefe8c8a91bce2156bd4718737b5684feb86ba SHA256 8bbf841e83b01e481c6da6684bfe1ed281fdcc5003c6e1df26c97c815e50777e +AUX gnome-shell-3.1.90.1-telepathy-gettext.patch 2128 RMD160 70d02c8b981155b33bd6c83f02c61c78d0a8aca2 SHA1 76d6422cc459cad3b05eff857bb6a856d906142a SHA256 2d74f850873fe0b8370a780de39cd572eea88eedaa9e51d72be0b12328ec9006 +AUX gnome-shell-3.1.90.1-workspaces-lazy-init.patch 2175 RMD160 cfa68433050ef325e2091df6f4e4d1f1a5678ac2 SHA1 a27ad70afe4be556af49a0fd3c8869ab10a01327 SHA256 ca36e5639e358278f662787d264a17e7c33bdf8477ad69045df1512c1646d195 DIST gnome-shell-3.1.4.tar.xz 1002024 RMD160 2dbf1f4c7f41b70dbb9eaa26a2b07f4d4c9b93e9 SHA1 0e3c09c382cfe4f994f76d8ca50ef28ac0a9d52b SHA256 bcb6eed9731233a2c57cd39b608d197445755e77fc431e524e6b7a0ec02dbbee -DIST gnome-shell-3.1.90.tar.xz 1022100 RMD160 479ea0ef2769fc905359da793e27b8721cc9ad9d SHA1 ef3032f5e930c66708926aaf66c31d654ba08fe3 SHA256 310754ecd7a0b40b46e93fdbde8ccb5477c12a3835640f99224cb8c2fb8a2a6d +DIST gnome-shell-3.1.90.1.tar.xz 1026384 RMD160 d226d7762a375edf6243bc96770d8dcd5993fe6d SHA1 3cce72442dc0831aa45dd2812fb6ffab2cdd3407 SHA256 710d5aeb32a22b7ecf53c3a74ab1f12ada64428ec23ff68ba1c96fe7a7f0cb4e EBUILD gnome-shell-3.1.4.ebuild 3933 RMD160 8cbe800241baaf70bef3f8d3cc376aef0ed25928 SHA1 5d3a4c8378bfa760fa16f5b2c6aebd2fc459b190 SHA256 2947ba3e88054603216bf2485bc6ebf4366052b672f9459c4bd05bacae330425 -EBUILD gnome-shell-3.1.90.ebuild 4188 RMD160 5e603c64d6fcc5a513b14ea04d89cff083f4114c SHA1 3378947c8d1c78710db37fbd06a01767c30cd703 SHA256 dee758c1f1e60bd581159a8bad73647e27babb1d9e21712830d89f145e2ad61c -EBUILD gnome-shell-9999.ebuild 4324 RMD160 0a33903f7ca3076fd9e5992c62c4526857bcc71c SHA1 083f6dc4b9dc12bc148b827bf23ed1d7876d3575 SHA256 f0b47564e51be3df4feacc135612f250e4e1e7b7617a0294513f44c1a5e34ed8 +EBUILD gnome-shell-3.1.90.1.ebuild 3998 RMD160 757892cba1e81c5c39f4309b108d590a0d2c1dc9 SHA1 b082f481aa778d6e83a22c4a2f28b8be0f8c2e1c SHA256 74730a20e8af69681eb7dd1914bbb72966b35ea46d7383aaaee1adfcbb08661f +EBUILD gnome-shell-9999.ebuild 3793 RMD160 62aa780286875fa26846b4cfbc2164bec6a002a2 SHA1 0a1c38f3addc16c9212a130ac5032626fef03da7 SHA256 698d56505c8e2377bf71f057c95fd9f07cc68b8f086b0a7c7e969269d6557ac0 diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.1.90-default-avatar.patch b/gnome-base/gnome-shell/files/gnome-shell-3.1.90-default-avatar.patch deleted file mode 100644 index f5c3a159..00000000 --- a/gnome-base/gnome-shell/files/gnome-shell-3.1.90-default-avatar.patch +++ /dev/null @@ -1,24 +0,0 @@ -From be4d504e27feeb0dbc4a17388fe03628989e4dcb Mon Sep 17 00:00:00 2001 -From: Jasper St. Pierre <jstpierre@mecheye.net> -Date: Mon, 29 Aug 2011 21:41:10 +0000 -Subject: userMenu: Don't show the default avatar over a newly selected one - -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=657657 ---- -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 = { - - _setIconFromFile: function(iconFile) { - this._iconBin.set_style('background-image: url("' + iconFile + '");'); -+ this._iconBin.child = null; - }, - - _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 695e5b9b..00000000 --- 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 <alexl@redhat.com> -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; - - /* Match on alias */ -- p = strstr (alias, term); -- if (p == alias) -- have_alias_prefix = TRUE; -- else if (p != NULL) -- have_alias_substring = TRUE; -+ if (alias != NULL) -+ { -+ p = strstr (alias, term); -+ if (p == alias) -+ have_alias_prefix = TRUE; -+ else if (p != NULL) -+ have_alias_substring = TRUE; -+ } - - /* Match on one or more IM addresses */ - im_addrs_iter = 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.patch b/gnome-base/gnome-shell/files/gnome-shell-3.1.90-gdm-batch.patch deleted file mode 100644 index 8df0e371..00000000 --- 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 <Marc-Antoine@Perennou.com> -Date: Tue, 30 Aug 2011 11:52:25 +0000 -Subject: Fix batch import for loginDialog - -Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com> -Signed-off-by: Adel Gadllah <adel.gadllah@gmail.com> ---- -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 = imports.gi.Shell; - const St = imports.gi.St; - const GdmGreeter = imports.gi.GdmGreeter; - --const Batch = imports.misc.batch; -+const Batch = imports.gdm.batch; - const Lightbox = imports.ui.lightbox; - const Main = imports.ui.main; - const ModalDialog = 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.patch b/gnome-base/gnome-shell/files/gnome-shell-3.1.90-gi-1.29.17.patch deleted file mode 100644 index 7a0505d1..00000000 --- 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 <danw@gnome.org> -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; - } - -+/** -+ * 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; - } - -+/** -+ * 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 *stream, - return GVC_MIXER_STREAM_GET_CLASS (stream)->change_port (stream, port); - } - -+/** -+ * 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; - } - -+/** -+ * 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 none - * @error: A #GError --- -cgit v0.9.0.2 diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.1.90-telepathy-status.patch b/gnome-base/gnome-shell/files/gnome-shell-3.1.90-telepathy-status.patch deleted file mode 100644 index 4bd3a1c5..00000000 --- a/gnome-base/gnome-shell/files/gnome-shell-3.1.90-telepathy-status.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 8cf6b4c7283a383883bdec6ee13b194ae3a5137b Mon Sep 17 00:00:00 2001 -From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> -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=657696 ---- -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 = { - _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'; - } - }, - --- -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-telepathy-gettext.patch new file mode 100644 index 00000000..16f0de4e --- /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 <danw@gnome.org> +Date: Tue, 30 Aug 2011 20:16:28 +0000 +Subject: telepathyClient: don't try to translate concatenations of strings + +xgettext doesn't recognize it + +https://bugzilla.gnome.org/show_bug.cgi?id=657759 +--- +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_CONNECTED)] + = _("This resource is already connected to the server"); + _connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CONNECTION_REPLACED)] +- = _("Connection has been replaced by a new connection using the " +- + "same resource"); ++ = _("Connection has been replaced by a new connection using the same resource"); + _connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.REGISTRATION_EXISTS)] + = _("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(Tp.Error.SERVICE_BUSY)] + _connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CERT_REVOKED)] + = _("Certificate has been revoked"); + _connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CERT_INSECURE)] +- = _("Certificate uses an insecure cipher algorithm or is " +- + "cryptographically weak"); ++ = _("Certificate uses an insecure cipher algorithm or is cryptographically weak"); + _connectionErrorMessages[Tp.error_get_dbus_name(Tp.Error.CERT_LIMIT_EXCEEDED)] +- = _("The length of the server certificate, or the depth of the " +- + "server certificate chain, exceed the limits imposed by the " +- + "cryptography library"); ++ = _("The length of the server certificate, or the depth of the server certificate chain, exceed the limits imposed by the cryptography library"); + + AccountNotification.prototype = { + __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-workspaces-lazy-init.patch new file mode 100644 index 00000000..5dc408c2 --- /dev/null +++ b/gnome-base/gnome-shell/files/gnome-shell-3.1.90.1-workspaces-lazy-init.patch @@ -0,0 +1,52 @@ +From 3aa904da0aa938c3fee09357bcff3a1de6321308 Mon Sep 17 00:00:00 2001 +From: Jasper St. Pierre <jstpierre@mecheye.net> +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 that uses +it until after it's been created. + +https://bugzilla.gnome.org/show_bug.cgi?id=658007 +--- +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 = { + this._updateAlwaysZoom(); + + Main.layoutManager.connect('monitors-changed', Lang.bind(this, this._updateAlwaysZoom)); +- global.screen.connect('notify::n-workspaces', +- Lang.bind(this, this._workspacesChanged)); + + Main.xdndHandler.connect('drag-begin', Lang.bind(this, function(){ + this._alwaysZoomOut = true; +@@ -581,6 +579,7 @@ WorkspacesDisplay.prototype = { + + this._switchWorkspaceNotifyId = 0; + ++ this._nWorkspacesChangedId = 0; + this._itemDragBeginId = 0; + this._itemDragCancelledId = 0; + this._itemDragEndId = 0; +@@ -589,7 +588,7 @@ WorkspacesDisplay.prototype = { + this._windowDragEndId = 0; + }, + +- show: function() { ++ show: function() { + this._zoomOut = this._alwaysZoomOut; + this._zoomFraction = this._alwaysZoomOut ? 1 : 0; + this._updateZoom(); +@@ -612,6 +611,9 @@ WorkspacesDisplay.prototype = { + global.screen.connect('restacked', + Lang.bind(this, this._onRestacked)); + ++ if (this._nWorkspacesChangedId == 0) ++ this._nWorkspacesChangedId = global.screen.connect('notify::n-workspaces', ++ Lang.bind(this, this._workspacesChanged)); + if (this._itemDragBeginId == 0) + this._itemDragBeginId = Main.overview.connect('item-drag-begin', + Lang.bind(this, this._dragBegin)); +-- +cgit v0.9.0.2 diff --git a/gnome-base/gnome-shell/gnome-shell-3.1.90.ebuild b/gnome-base/gnome-shell/gnome-shell-3.1.90.1.ebuild index 258babed..9573aed1 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" } src_install() { diff --git a/gnome-base/gnome-shell/gnome-shell-9999.ebuild b/gnome-base/gnome-shell/gnome-shell-9999.ebuild index 2cdf2d0e..ffa6bc78 100644 --- a/gnome-base/gnome-shell/gnome-shell-9999.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-9999.ebuild @@ -88,11 +88,7 @@ RDEPEND="${COMMON_DEPEND} >=sys-apps/accountsservice-0.6.12 - >=app-accessibility/caribou-0.3 - - !!<=gnome-extra/gnome-shell-extensions-3.1.4" -# The *presence* of <=gnome-shell-extensions-3.1.4 destabilizes gnome-shell. -# Disabling the extensions is not enough; they must be physically uninstalled. + >=app-accessibility/caribou-0.3" DEPEND="${COMMON_DEPEND} >=sys-devel/gettext-0.17 >=dev-util/pkgconfig-0.22 @@ -109,14 +105,6 @@ pkg_setup() { --enable-compile-warnings=maximum --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 user's" - ewarn "home directory." - ewarn "Disabling the extensions is not enough. You should uninstall the" - ewarn "extensions before upgrading gnome-shell to ${PV}." - ewarn } src_install() { |