[gentoo-commits] proj/gnome:master commit in: gnome-base/gdm/, gnome-base/gdm/files/

["Alexandre Restovtsev" <tetromino@gmail.com>]

commit:     110e267c48f5629a139700722bc6ceee1f59eea7
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 23 07:07:12 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sun Oct 23 08:32:23 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=110e267c

gnome-base/gdm: 3.2.0-r1 → 3.2.1.1

Bump, now uses a different way of setting gsettings defaults, and the
gdm Xsession script now explicitly calls "xhost +si:localuser:`id -un`"
(which should not make a difference on Gentoo, since we were doing it
anyway in /etc/xinit/xinitrc.d/00-xhost).

Also, drop .la files; they are entirely unnecessary.

---
 .../files/gdm-3.1.91-disable-accessibility.patch   |   60 ------------------
 .../gdm/files/gdm-3.2.1.1-custom-session.patch     |   51 +++++++++++++++
 .../files/gdm-3.2.1.1-disable-accessibility.patch  |   65 ++++++++++++++++++++
 .../{gdm-3.2.0-r1.ebuild => gdm-3.2.1.1.ebuild}    |   18 +++---
 4 files changed, 124 insertions(+), 70 deletions(-)

diff --git a/gnome-base/gdm/files/gdm-3.1.91-disable-accessibility.patch b/gnome-base/gdm/files/gdm-3.1.91-disable-accessibility.patch
deleted file mode 100644
index 54bc4a7..0000000
--- a/gnome-base/gdm/files/gdm-3.1.91-disable-accessibility.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 947f39a9de41495eadd58f92a84d350d4e6e6580 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Wed, 14 Sep 2011 22:09:56 -0400
-Subject: [PATCH 2/2] Disable a11y in gconf and gsettings defaults
-
----
- data/make-dconf-override-db.sh |    6 +++---
- data/session-setup.entries     |    4 ++--
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/data/make-dconf-override-db.sh b/data/make-dconf-override-db.sh
-index 638fe1d..af8fa9c 100755
---- a/data/make-dconf-override-db.sh
-+++ b/data/make-dconf-override-db.sh
-@@ -13,10 +13,10 @@ trap 'rm -rf $TMPDIR; kill $DBUS_SESSION_BUS_PID' ERR
- 
- gsettings set org.gnome.power-manager show-actions false || :
- 
--gsettings set org.gnome.desktop.a11y.keyboard enable true
-+gsettings set org.gnome.desktop.a11y.keyboard enable false
- gsettings set org.gnome.desktop.background show-desktop-icons false
- gsettings set org.gnome.desktop.default-applications.terminal exec '"/bin/true"'
--gsettings set org.gnome.desktop.interface toolkit-accessibility true
-+gsettings set org.gnome.desktop.interface toolkit-accessibility false
- 
- gsettings set org.gnome.desktop.lockdown disable-application-handlers true
- gsettings set org.gnome.desktop.lockdown disable-command-line true
-@@ -48,7 +48,7 @@ gsettings list-schemas | egrep '^org\.gnome\.settings-daemon\.plugins\.' | while
-     gsettings set $schema active false
- done
- 
--gsettings set org.gnome.settings-daemon.plugins.a11y-keyboard active true
-+gsettings set org.gnome.settings-daemon.plugins.a11y-keyboard active false
- gsettings set org.gnome.settings-daemon.plugins.background active true
- gsettings set org.gnome.settings-daemon.plugins.cursor active true
- gsettings set org.gnome.settings-daemon.plugins.media-keys active true
-diff --git a/data/session-setup.entries b/data/session-setup.entries
-index b84e16f..a47d761 100644
---- a/data/session-setup.entries
-+++ b/data/session-setup.entries
-@@ -406,14 +406,14 @@
-     <entry>
-       <key>/desktop/gnome/interface/accessibility</key>
-       <value>
--        <bool>true</bool>
-+        <bool>false</bool>
-       </value>
-     </entry>
- 
-     <entry>
-       <key>/desktop/gnome/accessibility/keyboard/enable</key>
-       <value>
--        <bool>true</bool>
-+        <bool>false</bool>
-       </value>
-     </entry>
- 
--- 
-1.7.6.1
-

diff --git a/gnome-base/gdm/files/gdm-3.2.1.1-custom-session.patch b/gnome-base/gdm/files/gdm-3.2.1.1-custom-session.patch
new file mode 100644
index 0000000..0642f7c
--- /dev/null
+++ b/gnome-base/gdm/files/gdm-3.2.1.1-custom-session.patch
@@ -0,0 +1,51 @@
+From b96c19976b6876648fd91949f78f06cf5d269b18 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Tue, 2 Nov 2010 23:19:07 +0100
+Subject: [PATCH] make custom session work
+
+Gentoo bug: #216984
+
+fix custom sessions not doing sourcing in the proper order.
+---
+ data/Xsession.in |   18 +++++++++---------
+ 1 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/data/Xsession.in b/data/Xsession.in
+index 118518c..201be92 100755
+--- a/data/Xsession.in
++++ b/data/Xsession.in
+@@ -155,15 +155,6 @@ fi
+ 
+ xhost +si:localuser:`id -un` || :
+ 
+-# run all system xinitrc shell scripts.
+-if [ -d /etc/X11/xinit/xinitrc.d ]; then
+-    for i in /etc/X11/xinit/xinitrc.d/* ; do
+-        if [ -x "$i" -a ! -d "$i" ]; then
+-	    . "$i"
+-        fi
+-    done
+-fi
+-
+ if [ "x$command" = "xcustom" ] ; then
+   if [ -x "$HOME/.xsession" ]; then
+     command="$HOME/.xsession"
+@@ -191,6 +182,15 @@ if [ "x$command" = "xdefault" ] ; then
+   fi
+ fi
+ 
++# run all system xinitrc shell scripts.
++if [ -d /etc/X11/xinit/xinitrc.d ]; then
++    for i in /etc/X11/xinit/xinitrc.d/* ; do
++        if [ -x "$i" -a ! -d "$i" ]; then
++	    . "$i"
++        fi
++    done
++fi
++
+ # add ssh-agent if found
+ sshagent="`gdmwhich ssh-agent`"
+ if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then
+-- 
+1.7.7
+

diff --git a/gnome-base/gdm/files/gdm-3.2.1.1-disable-accessibility.patch b/gnome-base/gdm/files/gdm-3.2.1.1-disable-accessibility.patch
new file mode 100644
index 0000000..ab8325f
--- /dev/null
+++ b/gnome-base/gdm/files/gdm-3.2.1.1-disable-accessibility.patch
@@ -0,0 +1,65 @@
+From 91bd106c72362e51fbfa6966bc71dd0bb12d479d Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gmail.com>
+Date: Wed, 14 Sep 2011 22:09:56 -0400
+Subject: [PATCH] Disable a11y in gconf and gsettings defaults
+
+---
+ data/00-upstream-settings  |    6 +++---
+ data/session-setup.entries |    4 ++--
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/data/00-upstream-settings b/data/00-upstream-settings
+index 1511b7b..87410cb 100644
+--- a/data/00-upstream-settings
++++ b/data/00-upstream-settings
+@@ -7,7 +7,7 @@
+ #
+ 
+ [org/gnome/desktop/a11y/keyboard]
+-enable=true
++enable=false
+ 
+ [org/gnome/desktop/background]
+ show-desktop-icons=false
+@@ -16,7 +16,7 @@ show-desktop-icons=false
+ exec='/bin/true'
+ 
+ [org/gnome/desktop/interface]
+-toolkit-accessibility=true
++toolkit-accessibility=false
+ 
+ [org/gnome/desktop/lockdown]
+ disable-application-handlers=true
+@@ -35,7 +35,7 @@ session-name='gdm-shell'
+ event-sounds=true
+ 
+ [org/gnome/settings-daemon/plugins/a11y-keyboard]
+-active=true
++active=false
+ 
+ [org/gnome/settings-daemon/plugins/a11y-settings]
+ active=false
+diff --git a/data/session-setup.entries b/data/session-setup.entries
+index b84e16f..a47d761 100644
+--- a/data/session-setup.entries
++++ b/data/session-setup.entries
+@@ -406,14 +406,14 @@
+     <entry>
+       <key>/desktop/gnome/interface/accessibility</key>
+       <value>
+-        <bool>true</bool>
++        <bool>false</bool>
+       </value>
+     </entry>
+ 
+     <entry>
+       <key>/desktop/gnome/accessibility/keyboard/enable</key>
+       <value>
+-        <bool>true</bool>
++        <bool>false</bool>
+       </value>
+     </entry>
+ 
+-- 
+1.7.7
+

diff --git a/gnome-base/gdm/gdm-3.2.0-r1.ebuild b/gnome-base/gdm/gdm-3.2.1.1.ebuild
similarity index 94%
rename from gnome-base/gdm/gdm-3.2.0-r1.ebuild
rename to gnome-base/gdm/gdm-3.2.1.1.ebuild
index fc6e066..3bb548a 100644
--- a/gnome-base/gdm/gdm-3.2.0-r1.ebuild
+++ b/gnome-base/gdm/gdm-3.2.1.1.ebuild
@@ -3,6 +3,7 @@
 # $Header: $
 
 EAPI="4"
+GNOME2_LA_PUNT="yes"
 GCONF_DEBUG="yes"
 
 inherit autotools eutils gnome2 pam systemd
@@ -25,7 +26,7 @@ SRC_URI="${SRC_URI}
 
 # NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686
 # nspr used by smartcard extension
-# dconf, dbus and g-s-d are needed at build time for make-dconf-override-db.sh
+# dconf, dbus and g-s-d are needed at install time for dconf update
 COMMON_DEPEND="
 	>=dev-libs/dbus-glib-0.74
 	>=dev-libs/glib-2.29.3:2
@@ -155,7 +156,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-2.32.0-fix-vt-problems.patch"
 
 	# make custom session work, bug #216984
-	epatch "${FILESDIR}/${PN}-2.32.0-custom-session.patch"
+	epatch "${FILESDIR}/${PN}-3.2.1.1-custom-session.patch"
 
 	# ssh-agent handling must be done at xinitrc.d, bug #220603
 	epatch "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch"
@@ -167,17 +168,12 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-3.1.91-hardcoded-gnome-session-path-env.patch"
 
 	# don't load accessibility support at runtime when USE=-accessibility
-	if ! use accessibility; then
-		epatch "${FILESDIR}/${PN}-3.1.91-disable-accessibility.patch"
-		# force gsettings override db to be regenerated
-		rm -f data/dconf-override-db
-	fi
+	use accessibility || epatch "${FILESDIR}/${PN}-3.2.1.1-disable-accessibility.patch"
 
 	# make gdm-fallback session the default if USE=-gnome-shell
 	if ! use gnome-shell; then
-		sed -e 's:"gdm-shell":"gdm-fallback":' \
-			-i data/make-dconf-override-db.sh || die "sed failed"
-		rm -f data/dconf-override-db
+		sed -e "s:'gdm-shell':'gdm-fallback':" \
+			-i data/00-upstream-settings || die "sed failed"
 	fi
 
 	mkdir -p "${S}"/m4
@@ -224,6 +220,8 @@ src_install() {
 pkg_postinst() {
 	gnome2_pkg_postinst
 
+	dbus-launch dconf update || die "'dconf update' failed"
+
 	ewarn
 	ewarn "This is an EXPERIMENTAL release, please bear with its bugs and"
 	ewarn "visit us on #gentoo-desktop if you have problems."