diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-07-21 14:00:00 -0400 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-07-21 14:00:39 -0400 |
| commit | be3a4aab29b50febafcaffa2bc8390ff40089b21 (patch) | |
| tree | f2440fb563095d579fce4425ff4a1cad563df573 /gnome-base/gnome-shell | |
| parent | gnome-base/gnome-control-center: sync with gx86 (diff) | |
| download | gnome-be3a4aab29b50febafcaffa2bc8390ff40089b21.tar.gz gnome-be3a4aab29b50febafcaffa2bc8390ff40089b21.tar.bz2 gnome-be3a4aab29b50febafcaffa2bc8390ff40089b21.zip | |
gnome-base/gnome-shell: sync with gx86
Diffstat (limited to 'gnome-base/gnome-shell')
| -rw-r--r-- | gnome-base/gnome-shell/Manifest | 6 | ||||
| -rw-r--r-- | gnome-base/gnome-shell/gnome-shell-9999.ebuild | 15 |
2 files changed, 15 insertions, 6 deletions
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest index 3f3aba2d..d5ce28c6 100644 --- a/gnome-base/gnome-shell/Manifest +++ b/gnome-base/gnome-shell/Manifest @@ -1,3 +1,3 @@ -AUX gnome-shell-3.2.1-automagic-gnome-bluetooth.patch 1841 RMD160 4b57dfeb42f299ef74799409132778b60ddc7a09 SHA1 4acf93b0bda58660b6c7ed5c8fdb6b06df86c035 SHA256 df5f86858b8abc08225ffb7679e829250e05a419b439b2ecad0f02bd93b670b2 -AUX gnome-shell-3.4.0-optional-networkmanager.patch 8532 RMD160 6519f66a7b189f8e837e23a79d0904bb45a38f7e SHA1 897771c4038c19c4be62576f104d9a1fc7c6dacb SHA256 487bfd9772799cdd1969b252056af4934870de4704a0bea581876b966e9c754c -EBUILD gnome-shell-9999.ebuild 6579 RMD160 2450e8a7ec2068dfa989679ca01b674c86dbdf9d SHA1 d5d1c734e9fb0bb4a51e602473bab31aa249bf01 SHA256 44005470733d73fc3a05720a590d8ef4e00b89e1c1bfd222bc6f4a831f022430 +AUX gnome-shell-3.2.1-automagic-gnome-bluetooth.patch 1841 SHA256 df5f86858b8abc08225ffb7679e829250e05a419b439b2ecad0f02bd93b670b2 SHA512 43848dd5d04c3d3162d38f12c742d96b44061184ee946a502bf61952e17f11a57722163dcf59c1b78086c047dfc6d2c3046bd4c975fcf45ca565a2ed099802bd WHIRLPOOL 410f10e1bf87d90a33d193d726041e8cf5d66513a6ba31082bc57dbf9aefbb04c5ca3c1ba691ab60da99f2eb0319a3c55f2ecb205616779a113652fe838fc4b6 +AUX gnome-shell-3.4.0-optional-networkmanager.patch 8532 SHA256 487bfd9772799cdd1969b252056af4934870de4704a0bea581876b966e9c754c SHA512 20c2bc1ec1dc93a00f7ce7862a90965da7ce055e37f1e54514bd8af9779f797075255f7a2e61e78f24aeca197cadc8ddf4ced1a58be51f36109654847928d5a7 WHIRLPOOL 59a98990664e3023171411b4250e2f774062a11064b647361318712275b3f50affc0321d8f9316623814c46a349c8fa356e4bdbcc90f9b5b757bc89b77ac2bb2 +EBUILD gnome-shell-9999.ebuild 7026 SHA256 6db2603d1e3d8988e6959df21090722371a0a35acbe4ce57ff4b4721dcca5ed6 SHA512 ce89676bc3d6f5f52497b8865ddbc4580f6266d044bbaefdefdf75d53fbb4e2ce87423a02a21762c862a3f71a67427c5e9c3b96195943fbcd9178201d84838f3 WHIRLPOOL 95b82d6bdbc3b72bb3ccad193957f150d6b71dc551e898d27df21729649bf5a6d03a64f4b364ca456d187a9bf91efc011fb6827c67cd848944dac7b457950800 diff --git a/gnome-base/gnome-shell/gnome-shell-9999.ebuild b/gnome-base/gnome-shell/gnome-shell-9999.ebuild index 86c0b8aa..c31aca0d 100644 --- a/gnome-base/gnome-shell/gnome-shell-9999.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-9999.ebuild @@ -152,7 +152,12 @@ src_install() { python_convert_shebangs 2 "${ED}/usr/bin/gnome-shell-extension-tool" # Required for gnome-shell on hardened/PaX, bug #398941 - pax-mark mr "${ED}usr/bin/gnome-shell" + # Future-proof for >=spidermonkey-1.8.7 following polkit's example + if has_version '<dev-lang/spidermonkey-1.8.7'; then + pax-mark mr "${ED}usr/bin/gnome-shell" + elif has_version '>=dev-lang/spidermonkey-1.8.7[jit]'; then + pax-mark m "${ED}usr/bin/gnome-shell" + fi } pkg_postinst() { @@ -178,7 +183,9 @@ pkg_postinst() { ewarn "fallback mode, or switch to open-source drivers." fi - if has_version "media-libs/mesa[video_cards_radeon]"; then + if has_version "media-libs/mesa[video_cards_radeon]" || + has_version "media-libs/mesa[video_cards_r300]" || + has_version "media-libs/mesa[video_cards_r600]"; then elog "GNOME Shell is unstable under classic-mode r300/r600 mesa drivers." elog "Make sure that gallium architecture for r300 and r600 drivers is" elog "selected using 'eselect mesa'." @@ -187,7 +194,9 @@ pkg_postinst() { fi fi - if has_version "media-libs/mesa[video_cards_intel]"; then + if has_version "media-libs/mesa[video_cards_intel]" || + has_version "media-libs/mesa[video_cards_i915]" || + has_version "media-libs/mesa[video_cards_i965]"; then elog "GNOME Shell is unstable under gallium-mode i915/i965 mesa drivers." elog "Make sure that classic architecture for i915 and i965 drivers is" elog "selected using 'eselect mesa'." |