summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'gnome-base')
-rw-r--r--gnome-base/gnome-session/ChangeLog9
-rw-r--r--gnome-base/gnome-session/files/digest-gnome-session-2.20.06
-rw-r--r--gnome-base/gnome-session/files/gnome-session-2.19.2-no-asserts.patch31
-rw-r--r--gnome-base/gnome-session/gnome-session-2.20.0.ebuild69
4 files changed, 114 insertions, 1 deletions
diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog
index e363a124e134..bc5078bd0942 100644
--- a/gnome-base/gnome-session/ChangeLog
+++ b/gnome-base/gnome-session/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for gnome-base/gnome-session
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.194 2007/09/23 05:31:51 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.195 2007/10/04 16:54:21 compnerd Exp $
+
+*gnome-session-2.20.0 (04 Oct 2007)
+
+ 04 Oct 2007; Saleem Abdulrasool <compnerd@gentoo.org>
+ +files/gnome-session-2.19.2-no-asserts.patch,
+ +gnome-session-2.20.0.ebuild:
+ Version bump for GNOME 2.20
23 Sep 2007; Tom Gall <tgall@gentoo.org> gnome-session-2.18.3.ebuild:
stable on ppc64
diff --git a/gnome-base/gnome-session/files/digest-gnome-session-2.20.0 b/gnome-base/gnome-session/files/digest-gnome-session-2.20.0
new file mode 100644
index 000000000000..0f9ec80e3d0c
--- /dev/null
+++ b/gnome-base/gnome-session/files/digest-gnome-session-2.20.0
@@ -0,0 +1,6 @@
+MD5 f02a80d3f1435547a479312c15cc1030 gentoo-splash.png 78064
+RMD160 e75052892920e1c919aae1f6e53853c27b2e063f gentoo-splash.png 78064
+SHA256 24fa48bc26db0d446e0098b3e94fd3cdec4610faca0b3282da0bec79bedbc179 gentoo-splash.png 78064
+MD5 3ef5601a46ee6c382bf6288ced8b06a5 gnome-session-2.20.0.tar.bz2 751968
+RMD160 c55e17f8fc14c17491626c4305244d24b70ef3d4 gnome-session-2.20.0.tar.bz2 751968
+SHA256 bdce51182f6c46aa6a595a7d91bda4e6c78889895b9d3c437af9f26bc379ceba gnome-session-2.20.0.tar.bz2 751968
diff --git a/gnome-base/gnome-session/files/gnome-session-2.19.2-no-asserts.patch b/gnome-base/gnome-session/files/gnome-session-2.19.2-no-asserts.patch
new file mode 100644
index 000000000000..eb61c89f2ab6
--- /dev/null
+++ b/gnome-base/gnome-session/files/gnome-session-2.19.2-no-asserts.patch
@@ -0,0 +1,31 @@
+--- gnome-session/main.c 2007-01-22 20:15:57.000000000 -0600
++++ gnome-session/main.c 2007-01-22 20:17:57.000000000 -0600
+@@ -572,7 +572,6 @@
+ GError *err;
+ int status;
+ char *display_str;
+- char **versions;
+ GConfClient *gconf_client;
+ GOptionContext *goption_context;
+ gboolean dbus_daemon_owner;
+@@ -580,20 +579,6 @@
+ if (getenv ("GSM_VERBOSE_DEBUG"))
+ gsm_set_verbose (TRUE);
+
+- /* Help eradicate the critical warnings in unstable releases of GNOME */
+- versions = g_strsplit (VERSION, ".", 3);
+- if (versions && versions [0] && versions [1])
+- {
+- int major;
+- major = atoi (versions [1]);
+- if ((major % 2) != 0)
+- {
+- g_setenv ("G_DEBUG", "fatal_criticals", FALSE);
+- g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL);
+- }
+- }
+- g_strfreev (versions);
+-
+ set_lang();
+ set_gtk1_theme_rcfile ();
+
diff --git a/gnome-base/gnome-session/gnome-session-2.20.0.ebuild b/gnome-base/gnome-session/gnome-session-2.20.0.ebuild
new file mode 100644
index 000000000000..5eaad3221db3
--- /dev/null
+++ b/gnome-base/gnome-session/gnome-session-2.20.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.20.0.ebuild,v 1.1 2007/10/04 16:54:21 compnerd Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="Gnome session manager"
+HOMEPAGE="http://www.gnome.org/"
+SRC_URI="${SRC_URI}
+ branding? ( mirror://gentoo/gentoo-splash.png )"
+
+LICENSE="GPL-2 LGPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="branding esd ipv6 tcpd"
+
+RDEPEND=">=dev-libs/glib-2.13
+ >=x11-libs/gtk+-2.3.1
+ x11-libs/libXau
+ x11-apps/xdpyinfo
+ >=gnome-base/libgnomeui-2.2
+ >=gnome-base/control-center-2.15.4
+ >=x11-libs/libnotify-0.2.1
+ >=gnome-base/gconf-2
+ >=gnome-base/gnome-keyring-0.5.1
+ || (
+ >=dev-libs/dbus-glib-0.71
+ ( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.35 )
+ )
+ esd? ( >=media-sound/esound-0.2.26 )
+ tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
+DEPEND="${RDEPEND}
+ x11-apps/xrdb
+ >=sys-devel/gettext-0.10.40
+ >=dev-util/pkgconfig-0.17
+ >=dev-util/intltool-0.35
+ !gnome-base/gnome-core"
+
+# gnome-base/gnome-core overwrite /usr/bin/gnome-session
+DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+pkg_setup() {
+ # TODO: convert libnotify to a configure option
+ G2CONF="${G2CONF} $(use_enable ipv6) $(use_enable esd) $(use_enable tcpd tcp-wrappers)"
+}
+
+src_unpack() {
+ gnome2_src_unpack
+
+ # Patch for Gentoo Branding (bug #42687)
+ use branding && epatch "${FILESDIR}/${PN}-2.17.90.1-gentoo-branding.patch"
+
+ # Get rid of random asserts in tons of programs due to development versions
+ epatch "${FILESDIR}/${PN}-2.19.2-no-asserts.patch"
+}
+
+src_install() {
+ gnome2_src_install
+
+ dodir /etc/X11/Sessions
+ exeinto /etc/X11/Sessions
+ doexe "${FILESDIR}/Gnome"
+
+ # Our own splash for world domination
+ if use branding ; then
+ insinto /usr/share/pixmaps/splash/
+ doins "${DISTDIR}/gentoo-splash.png"
+ fi
+}