Add patch from gnome-3.3 to respect the gnome.fallback=0/1 kernel boot line, and improve support for gnome-extra/cinnamon.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

6 files changed, 253 insertions, 6 deletions

diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog
index fb7d6a262d1e..8df982cf20cf 100644
--- a/gnome-base/gnome-session/ChangeLog
+++ b/gnome-base/gnome-session/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnome-base/gnome-session
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.307 2011/11/28 06:37:21 tetromino Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.308 2012/01/25 03:53:57 tetromino Exp $
+
+*gnome-session-3.2.1-r1 (25 Jan 2012)
+
+  25 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +files/10-user-dirs-update-gnome-r1, +files/15-xdg-data-gnome-r1,
+  +gnome-session-3.2.1-r1.ebuild,
+  +files/gnome-session-3.2.1-kernel-boot-line.patch:
+  Add patch from gnome-3.3 to respect the gnome.fallback=0/1 kernel boot line,
+  and improve support for gnome-extra/cinnamon.
 
   28 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
   gnome-session-3.2.1.ebuild:
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index 416c30f2fa2d..17cb04687dd2 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -2,7 +2,9 @@
 Hash: SHA256
 
 AUX 10-user-dirs-update-gnome 264 RMD160 92eba5fafd59d6cf051138acd247127b7afcc32b SHA1 8a75d6f0cc0a2ab05ee0542cf0ed921c761c9fca SHA256 f060f401bf0e3f7dad91ce675666853de062d8523a3749f1040c4895bc3db931
+AUX 10-user-dirs-update-gnome-r1 299 RMD160 c76707fdce421431884beeabd60d5f0ce7716d26 SHA1 6adf982b43d2eeaa86622ecfd6b5f70eb772a9c2 SHA256 4baf3771a18f87db323580d868f232bf33830f72dcc54b4b3aa3d9bc9cce05e5
 AUX 15-xdg-data-gnome 227 RMD160 b42bf6342d18a00fe38b49264ef8a43c8ce87af9 SHA1 a365c288d94015e55c36bd25623b516ed27db352 SHA256 dca4022749bd9a7657dc077546ce0bc65312e87054e6f98761a7f1dd5f6a88cd
+AUX 15-xdg-data-gnome-r1 262 RMD160 6305f879183ecafae77d4cfd7bf035d44d801924 SHA1 99c5eb8187a608ab0b8cffe68eedb10e73dc1968 SHA256 860767c9ee4fc9e0d29c20cd8143311db7d0981ed4f590069d0d9edf46ec0b24
 AUX Gnome 2391 RMD160 dee0875327352ae70f71b73257deb8ccc5bbc3ba SHA1 9d6f5c7c4f7aee36ea64b30c57b9cb9818664c42 SHA256 ffc912945278c88ef854c8988b0042675ffa78525592f34580ee76c1f25309d3
 AUX defaults.list 14535 RMD160 a3685d3d781fb517f49c6cf90bab68dc86ff1ea1 SHA1 248881f0bfa80e533acea3ccd6380750b7e14474 SHA256 d2d362a6f43ce9f36b8958f052657e884c92034e788420677977a279275702e7
 AUX gnome-session-2.32.0-session-saving-button.patch 21424 RMD160 11c4db9951859c2749473a7969693469c9d9e277 SHA1 f7c2f8d98c6deac63ca9448977bdcfa29ae80d52 SHA256 7a2dd8771180bc460fdc034ad95d61ed83b14952b16b17c3cb9a10aade8a1a97
@@ -11,17 +13,19 @@ AUX gnome-session-2.32.1-dialog-size2.patch 1114 RMD160 bd9587678b2bf4dffab7959b
 AUX gnome-session-2.32.1-gnome3-conditions.patch 4552 RMD160 429b39d3338fb26eb96c94d4087579c5620393b3 SHA1 d96cd45515d484c6d82fe135b5b678349850490b SHA256 88482711f19399b766ed562c43511d8a6db1e1df2790945cd1819d7f616af42e
 AUX gnome-session-2.32.1-gsettings-conditions.patch 5085 RMD160 257d3bd04034abad8e638d71ddf63226883ede4c SHA1 5e1d577e89b79ec252aafe99beb56deca388f4fb SHA256 a57d614d533a54d0d3c186d521c53caad7150d4dc19863b9171472b1a48c01b0
 AUX gnome-session-2.32.1-idle-transition.patch 1802 RMD160 aec519f8b0bfff589c079d365dbdf134333f4f69 SHA1 67bcb498be8410c3ea3f0bdfc0bc42a880827208 SHA256 6e80574672ff9e4b9a63796959d1e83af0f184eb4ad507bcbe6589c364b63038
+AUX gnome-session-3.2.1-kernel-boot-line.patch 3611 RMD160 3b3b07935ea4428c17dc8ffdc73f5e394c76115a SHA1 099f2201ac34440067a02d69991933055ef0c8c7 SHA256 aea66b7bac863f2b334003e1eb5fa7a4cec97883df2632c0bf039d70541d09c6
 DIST gnome-session-2.32.1.tar.bz2 774842 RMD160 c579bf197b38c8df7df14c751c056be86695a287 SHA1 7d4c7652247606a972a2f1e50a6a6339809a5b9e SHA256 22d93ce433fcf9c7ce6b5f36dd81f64e692ea0e41faaa0f61159ddac28c3686a
 DIST gnome-session-3.2.1.tar.xz 700852 RMD160 ce31f04f2ced486f0bca59e7e64cf1194f401eff SHA1 a330cb69c3a1126ed57d36a58004987275e8982a SHA256 a87dcf57fec83cc8fad4e7b84542c5005a70a2107d184f247f0b112f07a043b3
 EBUILD gnome-session-2.32.1-r2.ebuild 2181 RMD160 62ce137f70d6fabe0531cc10c8e5a66b884edafc SHA1 29e676cd69295adca01f209f7ed751a3690d1445 SHA256 1a0b4219a56f9e944d7badbc96769cc474058a7fc521b7a787060c72caf54c4f
 EBUILD gnome-session-2.32.1-r3.ebuild 2889 RMD160 ecd42181dde0ac33408a89d741f2696a22fea104 SHA1 e085b6fe13ee3a8b3034bc060f758b7c05fe2c30 SHA256 9c569247827b9a8126663841c34bb8cd21ca0a897360b00462a282d090eecd23
+EBUILD gnome-session-3.2.1-r1.ebuild 3180 RMD160 24bf8e176deceda29b0c2610350372679c41977d SHA1 be46f9d8c806af5102542d825bd305bf531a72ce SHA256 d4ca0038f227049cf6afad930446eb11371c165a211e5364abb02781c2fb5457
 EBUILD gnome-session-3.2.1.ebuild 2963 RMD160 4f4b0d677a5893611899da19923d19ba95ded206 SHA1 274cc87053917b0110fbd37dcaaba69bc0e8c3c4 SHA256 05abed24d4bb7d070db0e6d434d2502e6d38ff30033935e95394ca1e7ee6571a
-MISC ChangeLog 44752 RMD160 641819b2a834cb319dc494a6719618f67ce19809 SHA1 92a49c0fc4acb2f9a3005c035e717af1bd73afc5 SHA256 b8d9d6a7eb5f8e7eac86cae44f6f553ec1433bbce5c448fe2968ca184abbd775
+MISC ChangeLog 45133 RMD160 8f37b57a0bf7ef60ed16d7e260e55cba451e8e8b SHA1 a8b97285e40e94dba2931d625fc4a47d4de89d61 SHA256 55c65a76105124be030c65bbb5400a2af00061a2f140cc45da3ec47de80ee94f
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk7TLCcACgkQdjK8w9WeBnCMJAEAkGb5IC/uaw4G4+BNYDkPDa4k
-XbsGwCYwGkABu/ST/EEA/122imF2t/W0hX2Ibuy89Lj+K8URPrg4z9uhCSC9ynGq
-=Tt5i
+iF4EAREIAAYFAk8ffOkACgkQdjK8w9WeBnAjaQD8CWHqgBC2UDn/vkOKmQxNuXPp
+pWecLm0zHAMPjArC8poBAIlKMz1hML1x+KWXIoUdP9hpvwiXRI6F+Nf16wRmbRUJ
+=vL5q
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-session/files/10-user-dirs-update-gnome-r1 b/gnome-base/gnome-session/files/10-user-dirs-update-gnome-r1
new file mode 100755
index 000000000000..61fd08c51141
--- /dev/null
+++ b/gnome-base/gnome-session/files/10-user-dirs-update-gnome-r1
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# Create various XDG directories, and write ~/.config/user-dirs.dirs, etc.
+# That file is read by glib to get XDG_PICTURES_DIR, etc
+
+if [ "$DESKTOP_SESSION" = "gnome" -o "$DESKTOP_SESSION" = "cinnamon" ]; then
+	if type xdg-user-dirs-update &>/dev/null; then
+		xdg-user-dirs-update
+	fi
+fi
diff --git a/gnome-base/gnome-session/files/15-xdg-data-gnome-r1 b/gnome-base/gnome-session/files/15-xdg-data-gnome-r1
new file mode 100644
index 000000000000..5eaa6985d9dc
--- /dev/null
+++ b/gnome-base/gnome-session/files/15-xdg-data-gnome-r1
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ "$DESKTOP_SESSION" = "gnome" -o "$DESKTOP_SESSION" = "cinnamon" ]; then
+	if [ -z "$XDG_DATA_DIRS" ]; then
+		export XDG_DATA_DIRS=/usr/share/gnome:/usr/local/share/:/usr/share/
+	else
+		export XDG_DATA_DIRS=/usr/share/gnome:"$XDG_DATA_DIRS"
+	fi
+fi
diff --git a/gnome-base/gnome-session/files/gnome-session-3.2.1-kernel-boot-line.patch b/gnome-base/gnome-session/files/gnome-session-3.2.1-kernel-boot-line.patch
new file mode 100644
index 000000000000..fa5678b838d6
--- /dev/null
+++ b/gnome-base/gnome-session/files/gnome-session-3.2.1-kernel-boot-line.patch
@@ -0,0 +1,107 @@
+From a8ccac0ef5074229b562b90dc8dcf183c0440395 Mon Sep 17 00:00:00 2001
+From: Vincent Untz <vuntz@gnome.org>
+Date: Wed, 19 Oct 2011 13:14:50 +0200
+Subject: [PATCH] tools: Look at gnome.fallback argument in kernel boot line
+
+This is a quick way to let users easily force the fallback (or
+non-fallback mode) with gnome.fallback=0/1 on boot.
+---
+ tools/gnome-session-check-accelerated-helper.c |   64 ++++++++++++++++++++++++
+ 1 files changed, 64 insertions(+), 0 deletions(-)
+
+diff --git a/tools/gnome-session-check-accelerated-helper.c b/tools/gnome-session-check-accelerated-helper.c
+index 3f83f76..c1b49e2 100644
+--- a/tools/gnome-session-check-accelerated-helper.c
++++ b/tools/gnome-session-check-accelerated-helper.c
+@@ -70,7 +70,9 @@
+ /* for strcasestr */
+ #define _GNU_SOURCE
+ 
++#include <ctype.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+ 
+ #include <X11/Xlib.h>
+@@ -87,6 +89,54 @@ _print_error (const char *str)
+ }
+ 
+ static int
++_parse_kcmdline (void)
++{
++        FILE *kcmdline;
++        char *line = NULL;
++        size_t line_len = 0;
++        int ret = -1;
++
++        kcmdline = fopen("/proc/cmdline", "r");
++        if (kcmdline == NULL)
++                return ret;
++
++        while (getline (&line, &line_len, kcmdline) != -1) {
++                const char *arg;
++                const char *str;
++                int key_len = strlen ("gnome.fallback=");
++
++                if (line == NULL)
++                        break;
++
++                /* don't break if we found the argument once: last mention wins */
++
++                str = line;
++                do {
++                        arg = strstr (str, "gnome.fallback=");
++                        str = arg + key_len;
++
++                        if (arg &&
++                                        (arg == line || isspace (arg[-1])) && /* gnome.fallback= is really the beginning of an argument */
++                                        (isdigit (arg[key_len]))) { /* the first character of the value of this argument is an integer */
++                                if ((arg[key_len+1] == '\0' || isspace (arg[key_len+1]))) /* the value of this argument is only one character long */
++                                        ret = arg[key_len] - '0';
++                                else /* invalid value */
++                                        ret = 0xDEAD;
++
++                        }
++                } while (arg != NULL);
++
++                free (line);
++                line = NULL;
++                line_len = 0;
++        }
++
++        fclose (kcmdline);
++
++        return ret;
++}
++
++static int
+ _has_composite (Display *display)
+ {
+         int dummy1, dummy2;
+@@ -257,9 +307,23 @@ _is_max_texture_size_big_enough (Display *display)
+ int
+ main (int argc, char **argv)
+ {
++        int      kcmdline_parsed;
+         Display *display = NULL;
+         int      ret = 1;
+ 
++        kcmdline_parsed = _parse_kcmdline ();
++        if (kcmdline_parsed >= 0) {
++                if (kcmdline_parsed == 0) {
++                        _print_error ("Non-fallback mode forced by kernel command line.");
++                        ret = 0;
++                        goto out;
++                } else if (kcmdline_parsed == 1) {
++                        _print_error ("Fallback mode forced by kernel command line.");
++                        goto out;
++                } else
++                        _print_error ("Invalid value for gnome.fallback passed in kernel command line.");
++        }
++
+         display = XOpenDisplay (NULL);
+         if (!display) {
+                 _print_error ("No X display.");
+-- 
+1.7.8.4
+
diff --git a/gnome-base/gnome-session/gnome-session-3.2.1-r1.ebuild b/gnome-base/gnome-session/gnome-session-3.2.1-r1.ebuild
new file mode 100644
index 000000000000..68c58facfa8f
--- /dev/null
+++ b/gnome-base/gnome-session/gnome-session-3.2.1-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2012 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.2.1-r1.ebuild,v 1.1 2012/01/25 03:53:57 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+
+inherit eutils gnome2
+
+DESCRIPTION="Gnome session manager"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 LGPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="doc ipv6 elibc_FreeBSD"
+
+# 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.28.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/gconf-2:2
+	>=sys-power/upower-0.9.0
+	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"
+# 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]"
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/perl-5
+	>=sys-devel/gettext-0.10.40
+	>=dev-util/pkgconfig-0.17
+	>=dev-util/intltool-0.40.6
+	!<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
+
+pkg_setup() {
+	# TODO: convert libnotify to a configure option
+	G2CONF="${G2CONF}
+		--disable-deprecation-flags
+		--disable-schemas-compile
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		$(use_enable doc docbook-docs)
+		$(use_enable ipv6)"
+	DOCS="AUTHORS ChangeLog NEWS README"
+}
+
+src_prepare() {
+	# Patch from 3.3 to respect gnome.fallback=0/1 kernel boot line
+	epatch "${FILESDIR}/${P}-kernel-boot-line.patch"
+
+	gnome2_src_prepare
+}
+
+src_install() {
+	gnome2_src_install
+
+	dodir /etc/X11/Sessions
+	exeinto /etc/X11/Sessions
+	doexe "${FILESDIR}/Gnome"
+
+	dodir /usr/share/gnome/applications/
+	insinto /usr/share/gnome/applications/
+	doins "${FILESDIR}/defaults.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
+}
+
+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
+}