Set XCURSOR_THEME from current dconf settings so non-gtk applications get the right...

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D

diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog
index 5deeb6630163182fe0e77891120f7f7a97aed7fc..11b97e63ea46b7ec54f3b273b2ab5618c5353752 100644 (file)
--- a/gnome-base/gnome-session/ChangeLog
+++ b/gnome-base/gnome-session/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnome-base/gnome-session
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.348 2015/03/15 13:23:03 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.349 2015/03/22 17:50:31 tetromino Exp $
+
+*gnome-session-3.14.0-r2 (22 Mar 2015)
+
+  22 Mar 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +gnome-session-3.14.0-r2.ebuild, +files/90-xcursor-theme-gnome:
+  Set XCURSOR_THEME from current dconf settings so non-gtk applications get the
+  right mouse cursor.
+  Note: you will have to log out and back in to update the env variable after
+  changing the mouse cursor in gnome-tweak-tool.
 
   15 Mar 2015; Pacho Ramos <pacho@gentoo.org> gnome-session-3.14.0-r1.ebuild:
   x86 stable, bug 534012

diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index bffd229764e1b06e7fb0029ebd1f053bddb27be4..f00f32b575a0bedba5fd7d611486bd945727ad15 100644 (file)
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -3,6 +3,7 @@ Hash: SHA256
 
 AUX 10-user-dirs-update-gnome-r1 299 SHA256 4baf3771a18f87db323580d868f232bf33830f72dcc54b4b3aa3d9bc9cce05e5 SHA512 9e4b7e32546433e913928f0e357eef2936750bea0996dbb33443bc1f2ac32a3e38880abad6985a229382ef06138583de65b6f1e76dea3ac4577e10fec7f46b2a WHIRLPOOL 0dca330c2bedd4cfb056d162550680f4fcf89b94598ace9e02d0289d9e6a4414aa184b2444ce768e8f757ee9ce492fa9288616c25ca8885dbe92dffec28fd9f6
 AUX 15-xdg-data-gnome-r1 262 SHA256 860767c9ee4fc9e0d29c20cd8143311db7d0981ed4f590069d0d9edf46ec0b24 SHA512 aecdebbaaad1bd3032d687975017f040b58520fe8d5848dc5fd9b726aba8904dda314a315d3ee33e76bb11eddf8785a939a0a83634d99ba74a0342683840fcbc WHIRLPOOL dbf53f428300ec213eb7397f88cdb54a7c4c4f6bf9d45a07e84894db83e95906cb45a217d437db1e875c000c77c5658b97b6f21050c8d89d20b0750a102aac2e
+AUX 90-xcursor-theme-gnome 384 SHA256 e54babb8c0d0ad33eaa0f80985c802b0656fad9d1d60df2f1aa979f38356d8e0 SHA512 3d692715a744303f31a78ddf7aaefdbece8c50ebc5dfaac84cdfb6430155db465ab0140340eea4b5caf6d4dff030736eca9d028f24ed1d41ebc345fa309a4a4b WHIRLPOOL 68bc6c55d6a10cd14539eae6cc34f746c2bc485f96112317213f89c579a9ae7b259c0969155e2c8b30e88d62e19196bcdec559bb2cf3a3816034957c1fa5997e
 AUX Gnome 2391 SHA256 ffc912945278c88ef854c8988b0042675ffa78525592f34580ee76c1f25309d3 SHA512 a994e811855c822c3f03354ec7608587f4102e6e9039dd35aec75e825b7610b259d4e1e7246cb6136ec2f7a4d27c1859dc02945fb13c448aafc26b8a2dae53a6 WHIRLPOOL 7c3d492309bd3916b24ab48e0fc31a7924ce1ce6661f27770e6b8cc3c902fd06c1f22f6950d46dcac97b8d82a9f95f0b5cc12235dd0e78bc34b4cb2a5f0a7da0
 AUX defaults.list-r1 16386 SHA256 e98a66ad71c7e2233334ec5484b768cfd91e38fa428ec376c0ef1a3d8ca7116f SHA512 bf98a58dbcd0673f2cd157ed867a0bb282108a28466347524f7dadcf6d1c791404d642b5373a9d4eb50a965beafc1c278edfb0423b3112e65f56227561429939 WHIRLPOOL 84c8c32b8f45be1120e50c6e497a8c723b954e6da34c13a85ac3420c6c7cb4cb7eb2f93a83cb05598f5b3c22fe5530ff4db5c65a872d71a620ce1418ee8cb317
 AUX defaults.list-r2 16773 SHA256 ebb1be82f7a24e2e3a82ccb93ca5a19a348f1d00330b03bbba27124dffa816bf SHA512 2e761609871e1508136ef9a324a506ac4318d53727445dbcc8ddcf8e7b44f8f6172834dda3aa5e8f9c2ab7fc186c6c674adddef8c3bf6b4e9467e7570867ee65 WHIRLPOOL 0d42647906e882936db706488ede69bfed824ca91af63d08f9dc5b9f3ffe1b2e076f6c0f210e24da173b06c1e793827118c8248f506eff89b95e083678ae7396
@@ -12,13 +13,26 @@ DIST gnome-session-3.12.1.tar.xz 718380 SHA256 fa308771ac18bc5f77e5a5be3b2d93df1
 DIST gnome-session-3.14.0.tar.xz 736128 SHA256 b1e6e805478b863eda58e61ecd0e13961f63dd76e2d49692affc5a1d00f2c184 SHA512 7a1b1bd229e38963d5e104fd9b649ab597b4026a59b87820c8517699e63cb066f2aa52b74eb30a052dc4017c30eb16dc16a779a14580af9c1e876edcdd9bd020 WHIRLPOOL a756904a53c7e84dee6d85a2066fe8993f338021e1c07d65c025b1cbae03fedaa169fd19c02203dfc962b69b99d8d3926c17324f15e62e7b6c7e633927140cfa
 EBUILD gnome-session-3.12.1-r1.ebuild 3391 SHA256 39f591221ab7472bb8ccb229c94912f511c0d6bba319bbe4b87f3e2db8dfab65 SHA512 0cbf360c5cb9192eb2c173194d6a3398010458c81eb003ce8736c48155e222d6aa16fdb4060c2ad6c947492d7cf9d0619046818a531bef9ac3c154e3238500d9 WHIRLPOOL 67e3afe45b78da02a7cfbec00dde337799bfce912daac4a8b5ad13f6b6ccd29f19fffdfb1dc4fc9dbfc07da4a226e848b7faf35afe1a806699541451bf7c15c6
 EBUILD gnome-session-3.14.0-r1.ebuild 3503 SHA256 90b603a78124d5ee2eabd8c73bf443be2ee0fcf0424125fde23212ae4c8d65cd SHA512 362fe5e024b6a3ad4931b9e4dcdf90f14923bd786fc2cc3c32eca5a7fc47e8adc29f4eab67aa48ed7cda8ae4bce47696462a41643314cc091627d82e25c22845 WHIRLPOOL 5ed001e932f7afeec0abe84024aaa90b2b532b3fbb8b00153b58673410dfd8f8fdc70787ffd7702c89eada575f0752f8ba52331cdfb43a733c0fbc4bfafaf53c
+EBUILD gnome-session-3.14.0-r2.ebuild 3774 SHA256 48bea8b6242643a18eac3584474adc51b440e7964784b531516593b7a9ac17a0 SHA512 3dc91d657dbc831ddf9501b961a678b3602d33920613316d1e9311073dcba888219bd75f728f4cf24a729eccb973c0218a502784dc8b6601693a8286d0e802a3 WHIRLPOOL e8a0b667b699ff3d9be59deffe0090f3f792c03baa103e7e04b22df71bca675bc6251325c5989afe0c957a20c4a87520a48126dd690d158cc71e050aa6dd9e58
 EBUILD gnome-session-3.14.0.ebuild 3388 SHA256 e2ef9f2f9b56d4378b6db4fb67b60fa3ecac69ffa7960df85054fa4a81818f75 SHA512 7b923b193ac191c6ea5c945802775b344663c9ab442e10451a10a82bfa37878dbbe1ecd009f48e0b2b42d864944502e157e442ca834d10fa8e45ff4e4eb2fe1c WHIRLPOOL 1947d4ba6e07741cb15349e4bc24853b472ad94350091e2edc7a9eb2fd4e44f9c4e5e0130302bbc22e211ca72dff0007074849c3755038dde020e1fb1d3377eb
-MISC ChangeLog 53100 SHA256 0806295b659ce3b5d554c3088bc3dc82a9e24bf89fcab8a8a16447aea5f3e35d SHA512 36c9c12cbaf734aa73e76519c6286f9b7b56588a9064c00e8cee9822fb9af1ec170654cadb3f7eb4ad40ab53b6fe7a3d1975af867d9b38a34a964fd0e90ee3e8 WHIRLPOOL 02b693814f64b0c117697f087aa34df8fc43c108198d128a4e389dfe020e85413a478322edd1c23b0b3bd81622e58983079fd25e26f33dda267c42fffe5e6523
+MISC ChangeLog 53499 SHA256 860adac16215a773d0981c20b02725831960183cdf3367754d6ea14350842466 SHA512 f42e50d3916d9df566977c5978cf6ba3ee802e650e84342f432bd7fe82fa02722712f20dfd9caf8ae8230c1e07d2224f817cf1c8c4c20678f6f9dc43a0550a9f WHIRLPOOL 2ca8c799b9e6f54ecf7a7a00c4661180d575aac2ceb0f6e3230d18c2786f0133f30384539f8944189410afda28b2a8add1ba679da95f44701296e851416be482
 MISC metadata.xml 278 SHA256 4b6d5cc443e75f79675a992f133fdcf809fc528ca0e53bdbaf96a69383323c1d SHA512 32c59f5a0898ec7378ad33ac5a3f885f9b825633dfc0373603d413e8bf36b264c4efe03b8c0f4813237474ad858f929a74643869b7604c128e1ac5a5d1875b60 WHIRLPOOL 5552633b5518f886a89fa3a7b69ca5e8e7b81cc3436dc573e10990a4dea1e40ef14731a756501266449bbde0d9211145f9dccf3e3b728036645d6de1a6995295
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlUFh6kACgkQCaWpQKGI+9RAxwCfYvp8h3YIbSSrReM2mpho/Nxm
-6a0AmwRf7QOwbjY+q5MvxuF+BEQxEREb
-=gBjk
+iQJ8BAEBCABmBQJVDwDxXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
+OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNfVoQALJr5dVBqhFN7hisep2QnZZA
+O5iBUnSVsOrdz0/Yd/tm4geZ5orsnFcghi4Tha+9/i9LqFUnVX/tHsyTMXxrUNkw
+JmK/EeXMCfq2dVmK6n0/wMEqSZNa5BPANTH6SvBBlZsYV5WzZDUce1/k2zW11ehs
+qg4BoqF7uCCitfDjhNflG6y1r6iLjLDosxDnb+jP/6RwzQv20slo8i9/5ib5weZM
+ViF59Agl2SggmsmjE22gthEvHt+MMoq6oqSOV2xbToKktz0nSJ1F3UfPnox+T34b
+8kZ4wrpDAsGbPl3hOTQ3qVbri5cA8zA64zk9h5Y+ftd3tOTa7sPq4ywS300ycRlC
+gp32eZ57Ndp+2M7fHsUFtZbmIkmS3c95oN3d6J1ugoOSETaF+AA+RvdkERzjGaQs
+h9wU52v/8NidmzyO1QM1t3+6W5cPCnEBVHv/GqeqBMiSt731/C8N+wYAA1fVyTJd
+qmekSSigHLf/+WToCh/Hq5GiKPRswSI0EOLL2NGhCgc0BVVZh8Gx05H/3hueqDf4
+i06kwTRSdV9sBu9JZ44jS2aDpUMxQz8PlsqfkzakhYGnLnAWjIFmIOVheHrkpH02
+zvOFgk4YdQXx2eYqbJrBZFCYqnz7n5vjaJhFvp3jmx/vo1TjFnIz2NUsWkvkbuO3
+UrGWWC9rlBIr+hQR0ly5
+=t6zO
 -----END PGP SIGNATURE-----

diff --git a/gnome-base/gnome-session/files/90-xcursor-theme-gnome b/gnome-base/gnome-session/files/90-xcursor-theme-gnome
new file mode 100644 (file)
index 0000000..13bc453
--- /dev/null
+++ b/gnome-base/gnome-session/files/90-xcursor-theme-gnome
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+if [ "$DESKTOP_SESSION" = "gnome" -o "$DESKTOP_SESSION" = "cinnamon" ]; then
+    XCURSOR_THEME=`dconf read /org/gnome/desktop/interface/cursor-theme` 2> /dev/null
+    if [ x"$XCURSOR_THEME" = "x" ]; then
+        export XCURSOR_THEME="Adwaita"
+    else
+        # 'dconf read' wraps string output in single quotes
+        eval export "XCURSOR_THEME=$XCURSOR_THEME"
+    fi
+fi

diff --git a/gnome-base/gnome-session/gnome-session-3.14.0-r2.ebuild b/gnome-base/gnome-session/gnome-session-3.14.0-r2.ebuild
new file mode 100644 (file)
index 0000000..f9ba1c4
--- /dev/null
+++ b/gnome-base/gnome-session/gnome-session-3.14.0-r2.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-3.14.0-r2.ebuild,v 1.1 2015/03/22 17:50:31 tetromino Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+inherit gnome2
+
+DESCRIPTION="Gnome session manager"
+HOMEPAGE="https://git.gnome.org/browse/gnome-session"
+
+LICENSE="GPL-2 LGPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="doc elibc_FreeBSD gconf ipv6 systemd"
+
+# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
+# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
+# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
+# gdk-pixbuf used in the inhibit dialog
+COMMON_DEPEND="
+       >=dev-libs/glib-2.40.0:2
+       x11-libs/gdk-pixbuf:2
+       >=x11-libs/gtk+-2.90.7:3
+       >=dev-libs/json-glib-0.10
+       >=dev-libs/dbus-glib-0.76
+       >=gnome-base/gnome-desktop-3.9.91:3=
+       elibc_FreeBSD? ( dev-libs/libexecinfo )
+
+       virtual/opengl
+       x11-libs/libSM
+       x11-libs/libICE
+       x11-libs/libXau
+       x11-libs/libX11
+       x11-libs/libXcomposite
+       x11-libs/libXext
+       x11-libs/libXrender
+       x11-libs/libXtst
+       x11-misc/xdg-user-dirs
+       x11-misc/xdg-user-dirs-gtk
+       x11-apps/xdpyinfo
+
+       gconf? ( >=gnome-base/gconf-2:2 )
+       systemd? ( >=sys-apps/systemd-183:0= )
+"
+# Pure-runtime deps from the session files should *NOT* be added here
+# Otherwise, things like gdm pull in gnome-shell
+# gnome-themes-standard is needed for the failwhale dialog themeing
+# sys-apps/dbus[X] is needed for session management
+RDEPEND="${COMMON_DEPEND}
+       gnome-base/gnome-settings-daemon
+       >=gnome-base/gsettings-desktop-schemas-0.1.7
+       >=x11-themes/gnome-themes-standard-2.91.92
+       sys-apps/dbus[X]
+       !systemd? ( sys-auth/consolekit )
+"
+DEPEND="${COMMON_DEPEND}
+       >=dev-lang/perl-5
+       >=sys-devel/gettext-0.10.40
+       dev-libs/libxslt
+       >=dev-util/intltool-0.40.6
+       virtual/pkgconfig
+       !<gnome-base/gdm-2.20.4
+       doc? (
+               app-text/xmlto
+               dev-libs/libxslt )
+"
+# gnome-common needed for eautoreconf
+# gnome-base/gdm does not provide gnome.desktop anymore
+
+src_prepare() {
+       # Validate autostart condition gsettings key (from '3.14')
+       epatch "${FILESDIR}"/${P}-validate-autostart.patch
+       gnome2_src_prepare
+}
+
+src_configure() {
+       # 1. Avoid automagic on old upower releases
+       # 2. xsltproc is always checked due to man configure
+       #    switch, even if USE=-doc
+       gnome2_src_configure \
+               --disable-deprecation-flags \
+               --enable-session-selector \
+               $(use_enable doc docbook-docs) \
+               $(use_enable gconf) \
+               $(use_enable ipv6) \
+               $(use_enable systemd) \
+               UPOWER_CFLAGS="" \
+               UPOWER_LIBS=""
+               # gnome-session-selector pre-generated man page is missing
+               #$(usex !doc XSLTPROC=$(type -P true))
+}
+
+src_install() {
+       gnome2_src_install
+
+       dodir /etc/X11/Sessions
+       exeinto /etc/X11/Sessions
+       doexe "${FILESDIR}/Gnome"
+
+       insinto /usr/share/applications
+       newins "${FILESDIR}/defaults.list-r3" gnome-mimeapps.list
+
+       dodir /etc/X11/xinit/xinitrc.d/
+       exeinto /etc/X11/xinit/xinitrc.d/
+       newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
+
+       # This should be done here as discussed in bug #270852
+       newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome
+
+       # Set XCURSOR_THEME from current dconf setting instead of installing
+       # default cursor symlink globally and affecting other DEs (bug #543488)
+       # https://bugzilla.gnome.org/show_bug.cgi?id=711703
+       newexe "${FILESDIR}/90-xcursor-theme-gnome" 90-xcursor-theme-gnome
+}
+
+pkg_postinst() {
+       gnome2_pkg_postinst
+
+       if ! has_version gnome-base/gdm && ! has_version kde-base/kdm; then
+               ewarn "If you use a custom .xinitrc for your X session,"
+               ewarn "make sure that the commands in the xinitrc.d scripts are run."
+       fi
+}