Multiple fixes from upstream: reversion of a commit causing multiple hangs (#481918), reset opacity when not animating, unconditionally allocate scrollbars, don't allow events through the lock dialog, filter out hidden applications. This also changes default apps in favorites (#479918). Drop old.

Package-Manager: portage-2.1.13.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

9 files changed, 351 insertions, 18 deletions

diff --git a/gnome-base/gnome-shell/ChangeLog b/gnome-base/gnome-shell/ChangeLog
index 0e2e91083281..e0d29edc03f8 100644
--- a/gnome-base/gnome-shell/ChangeLog
+++ b/gnome-base/gnome-shell/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for gnome-base/gnome-shell
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/ChangeLog,v 1.44 2013/07/31 03:35:45 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/ChangeLog,v 1.45 2013/08/23 09:27:51 pacho Exp $
+
+*gnome-shell-3.8.4-r1 (23 Aug 2013)
+
+  23 Aug 2013; Pacho Ramos <pacho@gentoo.org>
+  +files/gnome-shell-3.8.4-allocate-scrollbars.patch,
+  +files/gnome-shell-3.8.4-events-lock.patch,
+  +files/gnome-shell-3.8.4-nodisplay.patch,
+  +files/gnome-shell-3.8.4-reset-opacity.patch,
+  +files/gnome-shell-3.8.4-revert-async.patch,
+  +files/gnome-shell-defaults.patch, +gnome-shell-3.8.4-r1.ebuild,
+  -gnome-shell-3.8.3-r2.ebuild:
+  Multiple fixes from upstream: reversion of a commit causing multiple hangs
+  (#481918), reset opacity when not animating, unconditionally allocate
+  scrollbars, don't allow events through the lock dialog, filter out hidden
+  applications. This also changes default apps in favorites (#479918). Drop old.
 
 *gnome-shell-3.8.4 (31 Jul 2013)
 
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 19c4430bdc35..edf1b9bc85b1 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -7,23 +7,23 @@ AUX gnome-shell-3.7.90-bluetooth-flag.patch 1769 SHA256 2b9a3f5f5a339d14d003b270
 AUX gnome-shell-3.8.0-networkmanager-flag-r1.patch 7511 SHA256 85f848ba179aada5f28d4157a95c79ea7cb0af25beca4f1ea9e4ef311a77cd58 SHA512 43cf1866aecb4da20af10fa3a1d6dbec75957514ccc35d33b477410315fc23479ca7d38c74fa1804de9ad89df692810db88a4acd04058bc89acf9516ad693c56 WHIRLPOOL ebe811a59f85ebd8ffbd352114b8f34aee22a1041c46cd69b1578d6ed92d803e08bbd4c8938758607b5b8f2cfe0ed14a8c97f3a4e0427d40912be14499fb5b0d
 AUX gnome-shell-3.8.3-networkmanager-flag.patch 7516 SHA256 eebb33213a2c028348557cdc0e1d8da1304c3844f551b2897975c85cb1b016f7 SHA512 daf4dca864d0aceedc2b8a5d4e0f958c7b56606952db90e97092a072cfc2313d9f88ddf25d25208fd167a5e2c0daea71d3b8a1f12d32fa7cec86aa4e6cc20ef2 WHIRLPOOL 755cdd491e78bb325b2bffd378ec3a2e0c0cd73fcc05edf20c2c24dde843e6ad22005159c8d66d94614f7637da09c2f37327a99dd54d9648b3a15e1a2f3daaf5
 AUX gnome-shell-3.8.3-relock-screen.patch 7530 SHA256 e2a0f02e9f3580935333552b56166f1afc2d573283d2cd5d0d6cf292392193a0 SHA512 897923003874752c6c4c2c16dc5b8a00aa4c2d18e2b07271eddf329e35530ed936003360c584263801684ce77414dc9fdcc91c2d0c14f43e115fa32ed68f82fc WHIRLPOOL d8c1bae3263b95f389bc03b657dc72d834f1bfe7df2792f47a77458feca293ccad7c0853773ffc825349aafa20081717cd75ae9ae6774a32526d0056c5e03fcb
+AUX gnome-shell-3.8.4-allocate-scrollbars.patch 3369 SHA256 a5305de4b18b6da332beee828ad8f262b29aed5159ebfcb008cb2b3b66a93f0a SHA512 dd742f1563634fa4cc2935462808be9cf37c22f9481df021231fd64cba19223897e3889b4739700073b3a65d19014ca28fa56baa89ed5d9175824a86935c15e1 WHIRLPOOL 4430ad4bd876cdabb7e354b907560c6790c796dd928623dcb5889cebb55547993511e772f5138ca296101fb4012e6c33bc9d92eabeb5ea9b1d16ba612b0770b8
+AUX gnome-shell-3.8.4-events-lock.patch 1268 SHA256 267b3aa9f981706464e39562a75d3db84d9af241c07e054033026a04e9542a26 SHA512 cf0ab91be2a518e06b2c2f912f333a275fcb57c7585b355a6918853e00e08a82607783a597e8b759001b733ec02b88b863a5b5cf80b92808305549fc365e7172 WHIRLPOOL d6f2eb4856b39e1f87a81823dc14a2567fa674b2e0f84734965c857818071788a9072e25b6677efdb0727793d0fa91f87515f0461ad85017ebe08fca677ea429
+AUX gnome-shell-3.8.4-nodisplay.patch 1043 SHA256 13b7a1876d9f237aed3533348ef8349fa5462c892c01a177464621b6f3ac740b SHA512 b855cf10458fc5cf7614c910ee6e10208519f0e8b81472417e7e30e7d7145a3d448b82bb76289bf386b135948b4ad1f109e59f118488afb922b18c9123bfc983 WHIRLPOOL b5375ff033f8b3d3bf90a2c6c03f8507e53d787be4ac0164b3b89426ef92f679cc5ee8cdf30f7a8bfe5e3c496fbfe43e3e6c69ac7cd55924940cc3d828180a4b
+AUX gnome-shell-3.8.4-reset-opacity.patch 910 SHA256 afea69001fd6aabef8f68a3063fe739a51dcdd43d27dde9bd28e096c9e2d92b4 SHA512 ac6edeace5cb6a8d3aff8e1a2cc0d27296cf3ae25b5dde2b88ba68a68c67793b3d77f9ab161185c65d20ce9fffef9058dda7d939903b204240b95d734d19348d WHIRLPOOL 7c69a13aca37fbd30e087c303c291a7cc0c2a9143baae0a965292d6a20de1bdf44f171e12cca5ca6ce9eb69ae745f9cb25f953ab697ab4cdcaae8c9e865dc544
+AUX gnome-shell-3.8.4-revert-async.patch 6778 SHA256 66db0e8c75e9a249e524b0c870a5b10a1e5663277a96d817bcb5908f59f59545 SHA512 3638a373f7ec45bc606aed2c8cd892079ec0c26204302263a3b555690929f810550b2de612c2a6397af4c86908233da06804f0e31bf310547e6250cb3d218644 WHIRLPOOL 2601783d18248bcbdd9eba5d4dc449cc76d2a600d10bb4bb36eed73bdfa5d09b9076543574d12ab2bac2188571df11bf3c7867d7d70d71747ef5fc8ae3f7ed3b
+AUX gnome-shell-defaults.patch 889 SHA256 83ddd289cc3a6ab29a7e8b4a19d2d10a7ffd05700a85f288fda8ccc077b3aaf7 SHA512 440d6d87569589e234a3251d001262d59aa835b279b9535820b83ed11ed0f7e00ce945814f0a3212024e3bda5cd04b49c1bbc6e98703cd6251cd1fa0baa6d1a1 WHIRLPOOL 20532252b8af581bcb243d5884ad0214f2921fffa3ee7190d8d12cf4b3b5cde758fd1ac21afc721030c239082bb708750f1f502e4ab856e32cdd3bc515ad1756
 DIST gnome-shell-3.6.3.1.tar.xz 1408036 SHA256 4e0328d43ac443e7cc0c43bb67895112643952f14cd20fff1109c6cc5849d603 SHA512 62475d1c2da2d3716158ef896214ada3c03a0fb226cd76a550b542d5cd0ce97303316cecf6a1feea7729666de9f29c333a79a6f6822b29245a1d7535a6c4c6b8 WHIRLPOOL 21146084b74372fbee6ff6f1a4a4609c16601ea0a39331a684dcda57a74a965146ca9860e3a170160c720175111c0c0a0c49f3d3c960ee335a39775a4945704b
-DIST gnome-shell-3.8.3-patches.tar.xz 6520 SHA256 d197856e1ba4cf56f57f0c05b048ef8db4309cc83fa801fb9a7a49d92b1d1a43 SHA512 a5b592d8eb57de5c8b469e83546236830c70913806fc0439774e53e86da51d63a9dcdee7613295c81633ee4b8dd5ea7286de80ac85d846399ae4919344e12f33 WHIRLPOOL 4b9bce733852d1db23bb4b5af87166e858161e4ec1f08b41557ff8a83d767f82132c89924b7b494ffde377284e579bdbfb700e1f481bbea5d75ea1a719673892
-DIST gnome-shell-3.8.3.tar.xz 1513636 SHA256 145724f21ead9dbe0c39d3ab468b39264c7aaf3f0fa5d152b295d905d8339c22 SHA512 d95a7ce24073046ea196b1f299bef1a1f4581b3357da364162b7e1cc53d051e628625c0b74bcd835d60f77d39874c8e0f86e3f66c0205539179f64cbe983a16b WHIRLPOOL 9ed4566761115346f0db8e35b0da9f5409418e78176b5159a41541a6723e511bbdaa50b0808c387f8339651066452934732c5c384fabaa7a5427be8ab5e9ec9e
 DIST gnome-shell-3.8.4.tar.xz 1517048 SHA256 547e571c67b1436a32715b016ee63c666afcafed9c5a2f76dc4ad3bcaebffa47 SHA512 e35ccf9b4a52c98754ef80712f489f660e355b2694c41165ab4c398a53935f7cad6f7d2a5655d03557684e93fb684dfe817767a12017c227a143b77785b3b073 WHIRLPOOL 72c6c25d53226f6336e3c0c214cc85c4f18aaa76557bc3599d3a579aeff9b46edb05be451d2bbab5713f6b3f0eba7e5b9a4d627786d0d639a4799c803946d439
 EBUILD gnome-shell-3.6.3.1.ebuild 7138 SHA256 e8e1bf07cb3768a303714db4fd16b3ba59adc67624ee4b83de35a8b1a3d17f25 SHA512 600e3a5c38dfe9742d4d0540b8cc6a87fc5bf663d99cd76fcc160a0ce97f967e3d93fb750120e30abee8580c84c00cf8ba08190e9f856e34938afdb01ab3574b WHIRLPOOL 30c66e7a010818f69d0387c145041bdcc2354f44e83939796c9b3ace20e77b5e469838f055da342451baa24e940474f0aec4e74fce8e92434fbb98c0334de6c6
-EBUILD gnome-shell-3.8.3-r2.ebuild 7771 SHA256 0c15f89e8597b7cf1a958b1ca51065ecff3bc9c3e4a32d72209819e95d6c559e SHA512 e6befe2a30d44087ef78e592c2ab704f974b0ae2893a6d283f387187f0ec908a5a8375da34c239d9f31bb61ada8e65f8fc48b02c0c31551bf82e8916442b50e1 WHIRLPOOL db279ed992d122c557306fd4c965be2c7d1993d3390a5d4757f9a59663d74e427f98c04e6596d31f18ba7ead1a6a03898ecfdc8e99a4cb30c12ba000fe1d624e
+EBUILD gnome-shell-3.8.4-r1.ebuild 8299 SHA256 da5466e0594460020b8ba50b2d843dc2da863cf70069c8846220ea6a9aac9cbb SHA512 4ebc7b8f8ca0cb8d9a2aad26aab3972ffcd2035d66d2d64c726093bb153975b499661da0c3536ce60420dd3a0b5185e98a038f851c1006095fd45892076c5963 WHIRLPOOL b62f8fd7cf5ff632f8d44be96d6b6c3c1f5961fcb5e63b0f768d460a8eaeb6d4202727c22c363342339fb54803fbb4a1681cea2da1918ffff9f28f2f4d7b4252
 EBUILD gnome-shell-3.8.4.ebuild 7613 SHA256 7acdad49b08540333fd2c6e476b1de7817d0b6c200f998a3af87b77e6e1675e0 SHA512 870907d4acfc9bb906141038f41ed9d9ef77b1574a635745a328c217fa1a813a9d07e66402b0e980c74b0090d8862f01673ea1dbc5b37e4b133b6d3a87262a5d WHIRLPOOL 1c081dec5be6ada20ce9958609f3726a9c2f90f78965b9364bbd686c94c4f84ed040671b8098da26e365150bcdb846a7c7240d3d912a848ae1598efbbcca7095
-MISC ChangeLog 10346 SHA256 cdf7df4fc74f0aa249de22e653347011d1d760b7f6571da182072f85d502d384 SHA512 1e21b4385a812f37a3e0ad2b489320dc3d13112799228b25a8decf1a2d2edbd3afafd97dbcebc4704ade13cf7449713bb3eda46ec99941fdbf9bf58f6783550a WHIRLPOOL efc79ed5774c0f1ba3106dc23b97f27cf6190d9f75d66292a1429f1115adf379f727886f85b5ae8216913b2debcac24cb8a7e939b6c1785181daa435782d45cd
+MISC ChangeLog 11070 SHA256 1e3f653c3234158ed9e03882839c6d66f2a5b90dd8bd46df6753104f2c690830 SHA512 114aedbf4acfddeed3e017fd97ffb9115e86aea8fda07cdd1537fde96469ee589c206316eb93a9cbd28a55a3152e8d6341c3c7853300e2494ed4058ec4400fdf WHIRLPOOL 31f54e1be20063e9242df2169e6a2d492b08aeb4a5858c69f2ccadffd9223b84d114c24af31cbbd3113ba9dfe2c2500a841f34fdec39d6089770477d73dfad8a
 MISC metadata.xml 400 SHA256 23973e81d0dce0aa3c01a805dc6baa386c626c07015e8b0675b3402f7850b88f SHA512 5efbd89e333f41da839f6f18bdbbb236efd42642d57eb0317d448bbcd54fef36289125fc534d6bf1441eb852983c5dacda98712c4f1c6633b040305f1fc133f9 WHIRLPOOL a2e8a25716a103c6c123b4afd3393419ccc723c8f198cfa8dfa84666095ac231fac5253b4d5d0de9baff357f598edaa163605bb23673c7d72314585b7a5dceb3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR+IYVAAoJEJ0WA1zPCt1hCLgH/ifZ86Zw+s+BIoNVRAwDYDOg
-lM6yzeYBsK3ne8FYD2mcyNk2lbqi9W7qI/3o9aq6SQLMdvX0dVMkaBi2Sjv3AKym
-SK7Js2zaDS9TgD/QsqrEllS9ijBCw252/l7+ypwiX7RyJAQdLWqAOgnYYp0OCpcG
-jCG1PzH/5nHxX2/rZ3/A9emnxZ8t1dMeOpTzUGlbjQxjhR1gC2ofRzCOBESio69d
-K5unNibi3GcNO+oBiJQW4Ag3E2jsqjGvDOADII5EGKFznkSfIo+5QnIY/m8Mmeu4
-r6wnnqe/9VMlHMEpecYGSssh2Ol0ZPbhKWVnu64OY3/65KPciTVvLpmIVsmAchY=
-=qg41
+iEYEAREIAAYFAlIXKx8ACgkQCaWpQKGI+9SdHQCfffqpmfpb3x2cpM22GCrnSURG
+s/sAn0nRLbb1t63rF4MQ5cs0FBW+LToT
+=Easx
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.8.4-allocate-scrollbars.patch b/gnome-base/gnome-shell/files/gnome-shell-3.8.4-allocate-scrollbars.patch
new file mode 100644
index 000000000000..861e7300ef1e
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.8.4-allocate-scrollbars.patch
@@ -0,0 +1,94 @@
+From 52417a8363cdb5b57af744cd4ca311c7f068403e Mon Sep 17 00:00:00 2001
+From: Adel Gadllah <adel.gadllah@gmail.com>
+Date: Sat, 10 Aug 2013 20:09:33 +0000
+Subject: st-scroll-view: Unconditionally allocate scrollbars
+
+Commit cfecd063c9ca3d18cd changed the allocation logic to not allocate
+scrollbars when the *_visible booleans are false. This breaks the
+fade effect as well as the NEVER policy. We do not paint scrollbars
+when they are not supposed to be visible, so not allocating them
+and thus leaving them in a "needs allocation" state just causes problems.
+
+I am not convinced that it solved any problem to begin with (we don't paint
+them anyway).
+
+As the previous condition has basically always been true, just do it
+unconditionally.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=705664
+---
+diff --git a/src/st/st-scroll-view.c b/src/st/st-scroll-view.c
+index 04e263f..f59ae93 100644
+--- a/src/st/st-scroll-view.c
++++ b/src/st/st-scroll-view.c
+@@ -598,42 +598,36 @@ st_scroll_view_allocate (ClutterActor          *actor,
+    */
+ 
+   /* Vertical scrollbar */
+-  if (vscrollbar_visible)
+-    {
+-      if (clutter_actor_get_text_direction (actor) == CLUTTER_TEXT_DIRECTION_RTL)
+-        {
+-          child_box.x1 = content_box.x1;
+-          child_box.x2 = content_box.x1 + sb_width;
+-        }
+-      else
+-        {
+-          child_box.x1 = content_box.x2 - sb_width;
+-          child_box.x2 = content_box.x2;
+-        }
+-      child_box.y1 = content_box.y1;
+-      child_box.y2 = content_box.y2 - (hscrollbar_visible ? sb_height : 0);
++    if (clutter_actor_get_text_direction (actor) == CLUTTER_TEXT_DIRECTION_RTL)
++      {
++        child_box.x1 = content_box.x1;
++        child_box.x2 = content_box.x1 + sb_width;
++      }
++    else
++      {
++        child_box.x1 = content_box.x2 - sb_width;
++        child_box.x2 = content_box.x2;
++      }
++    child_box.y1 = content_box.y1;
++    child_box.y2 = content_box.y2 - (hscrollbar_visible ? sb_height : 0);
+ 
+-      clutter_actor_allocate (priv->vscroll, &child_box, flags);
+-    }
++    clutter_actor_allocate (priv->vscroll, &child_box, flags);
+ 
+   /* Horizontal scrollbar */
+-  if (hscrollbar_visible)
+-    {
+-      if (clutter_actor_get_text_direction (actor) == CLUTTER_TEXT_DIRECTION_RTL)
+-        {
+-          child_box.x1 = content_box.x1 + (vscrollbar_visible ? sb_width : 0);
+-          child_box.x2 = content_box.x2;
+-        }
+-      else
+-        {
+-          child_box.x1 = content_box.x1;
+-          child_box.x2 = content_box.x2 - (vscrollbar_visible ? sb_width : 0);
+-        }
+-      child_box.y1 = content_box.y2 - sb_height;
+-      child_box.y2 = content_box.y2;
++    if (clutter_actor_get_text_direction (actor) == CLUTTER_TEXT_DIRECTION_RTL)
++      {
++        child_box.x1 = content_box.x1 + (vscrollbar_visible ? sb_width : 0);
++        child_box.x2 = content_box.x2;
++      }
++    else
++      {
++        child_box.x1 = content_box.x1;
++        child_box.x2 = content_box.x2 - (vscrollbar_visible ? sb_width : 0);
++      }
++    child_box.y1 = content_box.y2 - sb_height;
++    child_box.y2 = content_box.y2;
+ 
+-      clutter_actor_allocate (priv->hscroll, &child_box, flags);
+-    }
++    clutter_actor_allocate (priv->hscroll, &child_box, flags);
+ 
+   /* In case the scrollbar policy is NEVER or scrollbars should be
+    * overlayed, we don't trim the content box allocation by the
+--
+cgit v0.9.2
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.8.4-events-lock.patch b/gnome-base/gnome-shell/files/gnome-shell-3.8.4-events-lock.patch
new file mode 100644
index 000000000000..0e0fc5bbcaf8
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.8.4-events-lock.patch
@@ -0,0 +1,28 @@
+From d8177a8f3ba6cc6e80d27a7c6bdd1b5920e12544 Mon Sep 17 00:00:00 2001
+From: Giovanni Campagna <gcampagna@src.gnome.org>
+Date: Mon, 12 Aug 2013 13:14:37 +0000
+Subject: ScreenShield: don't allow events through the lock dialog
+
+Make the lock dialog group reactive, to intercept any events
+before they go to the actors below.
+In the future, we may restructure our chrome to have a clear
+layer system, but for now it fixes a security issue in the lock
+screen (you can see the contents of the windows by dragging
+if the screen was locked with the overview active)
+
+https://bugzilla.gnome.org/show_bug.cgi?id=705840
+---
+diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
+index 4264f01..8452bc6 100644
+--- a/js/ui/screenShield.js
++++ b/js/ui/screenShield.js
+@@ -478,6 +478,7 @@ const ScreenShield = new Lang.Class({
+ 
+         this._lockDialogGroup = new St.Widget({ x_expand: true,
+                                                 y_expand: true,
++                                                reactive: true,
+                                                 opacity: 0,
+                                                 pivot_point: new Clutter.Point({ x: 0.5, y: 0.5 }),
+                                                 name: 'lockDialogGroup' });
+--
+cgit v0.9.2
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.8.4-nodisplay.patch b/gnome-base/gnome-shell/files/gnome-shell-3.8.4-nodisplay.patch
new file mode 100644
index 000000000000..2c9b802fe736
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.8.4-nodisplay.patch
@@ -0,0 +1,27 @@
+From 58872d162bd610578e048bf2832defc93a284a75 Mon Sep 17 00:00:00 2001
+From: Giovanni Campagna <gcampagna@src.gnome.org>
+Date: Sun, 31 Mar 2013 18:05:49 +0000
+Subject: AppDisplay/FrequentView: filter out hidden applications
+
+Filter out all applications which have the NoDisplay, Hidden or
+Not/OnlyShowIn bits, as those are not meant to be launched directly.
+This also allows the user to filter apps from the frequent view
+using alacarte.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=696949
+---
+diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
+index 22ae481..bcfb57a 100644
+--- a/js/ui/appDisplay.js
++++ b/js/ui/appDisplay.js
+@@ -316,6 +316,8 @@ const FrequentView = new Lang.Class({
+     loadApps: function() {
+         let mostUsed = this._usage.get_most_used ("");
+         for (let i = 0; i < mostUsed.length; i++) {
++            if (!mostUsed[i].get_app_info().should_show())
++                continue;
+             let appIcon = new AppIcon(mostUsed[i]);
+             this._grid.addItem(appIcon.actor, -1);
+         }
+--
+cgit v0.9.2
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.8.4-reset-opacity.patch b/gnome-base/gnome-shell/files/gnome-shell-3.8.4-reset-opacity.patch
new file mode 100644
index 000000000000..7a01178a9e5e
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.8.4-reset-opacity.patch
@@ -0,0 +1,22 @@
+From a6f39a12d7fef85c8ce40bc3898b17adf31bc2ba Mon Sep 17 00:00:00 2001
+From: Adel Gadllah <adel.gadllah@gmail.com>
+Date: Sun, 04 Aug 2013 09:35:35 +0000
+Subject: overview: Reset opacity when not animating
+
+We are not resetting the opacity when we are not animating, which can cause
+a hidden window to end up with opacity 0 if we remove the tween to early.
+---
+diff --git a/js/ui/workspace.js b/js/ui/workspace.js
+index e2e461d..2c8ff22 100644
+--- a/js/ui/workspace.js
++++ b/js/ui/workspace.js
+@@ -1094,6 +1094,7 @@ const Workspace = new Lang.Class({
+                 Tweener.removeTweens(clone.actor);
+                 clone.actor.set_position(x, y);
+                 clone.actor.set_scale(scale, scale);
++                clone.actor.set_opacity(255);
+                 clone.overlay.relayout(false);
+                 this._showWindowOverlay(clone, overlay, isOnCurrentWorkspace);
+             }
+--
+cgit v0.9.2
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.8.4-revert-async.patch b/gnome-base/gnome-shell/files/gnome-shell-3.8.4-revert-async.patch
new file mode 100644
index 000000000000..bd34b16f121d
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.8.4-revert-async.patch
@@ -0,0 +1,123 @@
+From 0a1b9867fcf5065a72e782e05fea858883bf2cdc Mon Sep 17 00:00:00 2001
+From: Adel Gadllah <adel.gadllah@gmail.com>
+Date: Thu, 15 Aug 2013 19:51:46 +0000
+Subject: Revert "background: fix asynchronous management of background loading operations"
+
+This reverts commit 1020d8a0f8523a04d8336b1348388b8b242e414f.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=704646
+---
+diff --git a/js/ui/background.js b/js/ui/background.js
+index 13343c6..1d9ab7c 100644
+--- a/js/ui/background.js
++++ b/js/ui/background.js
+@@ -142,40 +142,33 @@ const BackgroundCache = new Lang.Class({
+                                         cancellable: null,
+                                         onFinished: null });
+ 
+-        let fileLoad = { filename: params.filename,
+-                         style: params.style,
+-                         shouldCopy: false,
+-                         monitorIndex: params.monitorIndex,
+-                         effects: params.effects,
+-                         onFinished: params.onFinished,
+-                         cancellable: new Gio.Cancellable(), };
+-        this._pendingFileLoads.push(fileLoad);
+-
+-        if (params.cancellable) {
+-            params.cancellable.connect(Lang.bind(this, function(c) {
+-               fileLoad.cancellable.cancel();
+-            }));
++        for (let i = 0; i < this._pendingFileLoads.length; i++) {
++            if (this._pendingFileLoads[i].filename == params.filename &&
++                this._pendingFileLoads[i].style == params.style) {
++                this._pendingFileLoads[i].callers.push({ shouldCopy: true,
++                                                         monitorIndex: params.monitorIndex,
++                                                         effects: params.effects,
++                                                         onFinished: params.onFinished });
++                return;
++            }
+         }
+ 
++        this._pendingFileLoads.push({ filename: params.filename,
++                                      style: params.style,
++                                      callers: [{ shouldCopy: false,
++                                                  monitorIndex: params.monitorIndex,
++                                                  effects: params.effects,
++                                                  onFinished: params.onFinished }] });
++
+         let content = new Meta.Background({ meta_screen: global.screen,
+                                             monitor: params.monitorIndex,
+                                             effects: params.effects });
+ 
+         content.load_file_async(params.filename,
+                                 params.style,
+-                                fileLoad.cancellable,
++                                params.cancellable,
+                                 Lang.bind(this,
+                                           function(object, result) {
+-                                              if (fileLoad.cancellable.is_cancelled()) {
+-                                                  if (params.cancellable && params.cancellable.is_cancelled()) {
+-                                                      if (params.onFinished)
+-                                                          params.onFinished(null);
+-                                                      this._removePendingFileLoad(fileLoad);
+-                                                      return;
+-                                                  }
+-                                                  return;
+-                                              }
+-
+                                               try {
+                                                   content.load_file_finish(result);
+ 
+@@ -185,25 +178,22 @@ const BackgroundCache = new Lang.Class({
+                                                   content = null;
+                                               }
+ 
+-                                              let needsCopy = false;
+                                               for (let i = 0; i < this._pendingFileLoads.length; i++) {
+                                                   let pendingLoad = this._pendingFileLoads[i];
+                                                   if (pendingLoad.filename != params.filename ||
+                                                       pendingLoad.style != params.style)
+                                                       continue;
+ 
+-                                                  if (pendingLoad.cancellable.is_cancelled())
+-                                                      continue;
++                                                  for (let j = 0; j < pendingLoad.callers.length; j++) {
++                                                      if (pendingLoad.callers[j].onFinished) {
++                                                          if (content && pendingLoad.callers[j].shouldCopy) {
++                                                              content = object.copy(pendingLoad.callers[j].monitorIndex,
++                                                                                    pendingLoad.callers[j].effects);
+ 
+-                                                  pendingLoad.cancellable.cancel();
+-                                                  if (pendingLoad.onFinished) {
+-                                                      if (content && needsCopy) {
+-                                                          content = object.copy(pendingLoad.monitorIndex,
+-                                                                                pendingLoad.effects);
+-                                                      }
++                                                          }
+ 
+-                                                      needsCopy = true;
+-                                                      pendingLoad.onFinished(content);
++                                                          pendingLoad.callers[j].onFinished(content);
++                                                      }
+                                                   }
+ 
+                                                   this._pendingFileLoads.splice(i, 1);
+@@ -211,15 +201,6 @@ const BackgroundCache = new Lang.Class({
+                                           }));
+     },
+ 
+-    _removePendingFileLoad: function(fileLoad) {
+-        for (let i = 0; i < this._pendingFileLoads.length; i++) {
+-            if (this._pendingFileLoads[i].cancellable == fileLoad.cancellable) {
+-                this._pendingFileLoads.splice(i, 1);
+-                break;
+-            }
+-        }
+-    },
+-
+     getImageContent: function(params) {
+         params = Params.parse(params, { monitorIndex: 0,
+                                         style: null,
+--
+cgit v0.9.2
diff --git a/gnome-base/gnome-shell/files/gnome-shell-defaults.patch b/gnome-base/gnome-shell/files/gnome-shell-defaults.patch
new file mode 100644
index 000000000000..b88ca809599a
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-defaults.patch
@@ -0,0 +1,11 @@
+--- data/org.gnome.shell.gschema.xml.in.in~	2013-07-30 22:57:44.000000000 +0200
++++ data/org.gnome.shell.gschema.xml.in.in	2013-08-23 11:19:00.002182266 +0200
+@@ -32,7 +32,7 @@
+       </_description>
+     </key>
+     <key name="favorite-apps" type="as">
+-      <default>[ 'epiphany.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'libreoffice-writer.desktop', 'nautilus.desktop', 'gnome-documents.desktop' ]</default>
++      <default>[ 'chromium-browser-chromium.desktop', 'firefox.desktop', 'firefox-bin.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'libreoffice-writer.desktop', 'nautilus.desktop', 'gnome-documents.desktop' ]</default>
+       <_summary>List of desktop file IDs for favorite applications</_summary>
+       <_description>
+         The applications corresponding to these identifiers
diff --git a/gnome-base/gnome-shell/gnome-shell-3.8.3-r2.ebuild b/gnome-base/gnome-shell/gnome-shell-3.8.4-r1.ebuild
index 481a44e64242..4899929b4772 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.8.3-r2.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.8.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.8.3-r2.ebuild,v 1.5 2013/07/29 20:24:45 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.8.4-r1.ebuild,v 1.1 2013/08/23 09:27:51 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -12,8 +12,6 @@ inherit autotools eutils gnome2 multilib pax-utils python-r1 systemd
 DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
 HOMEPAGE="http://live.gnome.org/GnomeShell"
 
-SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/gnome/${P}-patches.tar.xz"
-
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
 IUSE="+bluetooth +i18n +networkmanager"
@@ -123,6 +121,9 @@ DEPEND="${COMMON_DEPEND}
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 src_prepare() {
+	# Change favorites defaults, bug #479918
+	epatch "${FILESDIR}/${PN}-defaults.patch"
+
 	# Fix automagic gnome-bluetooth dep, bug #398145
 	epatch "${FILESDIR}/${PN}-3.7.90-bluetooth-flag.patch"
 
@@ -132,8 +133,20 @@ src_prepare() {
 	# Re-lock the screen if we're restarted from a previously crashed shell (from 'master')
 	epatch "${FILESDIR}/${PN}-3.8.3-relock-screen.patch"
 
-	# Apply patches from gnome-3.8 branch
-	epatch "${WORKDIR}/${P}-patches/"*.patch
+	# Reset opacity when not animating (from 3.8 branch)
+	epatch "${FILESDIR}/${P}-reset-opacity.patch"
+
+	# Unconditionally allocate scrollbars (from 3.8 branch)
+	epatch "${FILESDIR}/${P}-allocate-scrollbars.patch"
+
+	# ScreenShield: don't allow events through the lock dialog (from 3.8 branch)
+	epatch "${FILESDIR}/${P}-events-lock.patch"
+
+	# Revert "background: fix asynchronous management of background loading operations" (#481918)
+	epatch "${FILESDIR}/${P}-revert-async.patch"
+
+	# AppDisplay/FrequentView: filter out hidden applications (from 'master')
+	epatch "${FILESDIR}/${PN}-3.8.4-nodisplay.patch"
 
 	epatch_user
 
@@ -217,7 +230,7 @@ pkg_postinst() {
 
 	if ! systemd_is_booted; then
 		ewarn "${PN} needs Systemd to be *running* for working"
-		ewarn "properly. Please follow the this guide to migrate:"
+		ewarn "properly. Please follow this guide to migrate:"
 		ewarn "http://wiki.gentoo.org/wiki/Systemd"
 	fi
 }