Add build fix for bsd, check for execinfo and link to it if needed, bug #275524, gnome bug #587088

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 182 insertions, 6 deletions

diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog
index eab8654c541a..037c47879151 100644
--- a/gnome-base/gnome-session/ChangeLog
+++ b/gnome-base/gnome-session/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/gnome-session
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.236 2009/05/23 14:54:11 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.237 2009/06/26 20:49:45 aballier Exp $
+
+*gnome-session-2.26.1-r1 (26 Jun 2009)
+
+  26 Jun 2009; Alexis Ballier <aballier@gentoo.org>
+  +gnome-session-2.26.1-r1.ebuild,
+  +files/gnome-session-2.26.1-execinfo.patch:
+  Add build fix for bsd, check for execinfo and link to it if needed, bug
+  #275524, gnome bug #587088
 
   23 May 2009; Gilles Dartiguelongue <eva@gentoo.org>
   -gnome-session-2.22.3.ebuild, gnome-session-2.26.1.ebuild:
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index c7ba4c5c4600..bb916f1bcaa4 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -7,6 +7,7 @@ AUX gnome-session-2.19.2-no-asserts.patch 865 RMD160 c69115c8a6e0821d361c6354c6c
 AUX gnome-session-2.22.3-gsd-spawn.patch 9005 RMD160 a5ef84a8701f43d91e61edf6c46264de3057f581 SHA1 3f923280228aafc242d49a6ff45f6ca9e42b9e90 SHA256 27f5a81eb52fcbb57189d4385d1e154af9dc6d1401445247cdcca18dc986dbeb
 AUX gnome-session-2.23.5-polkit-automagic.patch 1235 RMD160 2b5fee32765d8745fea0d27b1e834592cdc0b316 SHA1 942a4a41abc28596f8baac7ff41c03a677ac64db SHA256 cb2daab00d2ae8c143cc7577e512092dada71a97a05ff7ea085dfa53bcf9b61a
 AUX gnome-session-2.24.2-shutdown.patch 2809 RMD160 a26a418511dc5ff7a56252ea005a8f24190e0743 SHA1 4162514ba914bb7753dbceadfd654201c940c2a8 SHA256 50e71a8dd347d43b19cae80a50169365ac923a62d30c8e4c52f1223c2f008ed5
+AUX gnome-session-2.26.1-execinfo.patch 2622 RMD160 551043a2e2b0cf8b8e82901b50af446ddff4efe1 SHA1 8cb42b57f70c0fbbe76eb022ee162dec6d9b5e9a SHA256 957ba19acd36e07dd96e19d07936d902b5259383cb3cd5222f6aff58b3fc6843
 DIST gentoo-splash.png 78064 RMD160 e75052892920e1c919aae1f6e53853c27b2e063f SHA1 e93c5f77389a5351af9948f7677c5592355cf860 SHA256 24fa48bc26db0d446e0098b3e94fd3cdec4610faca0b3282da0bec79bedbc179
 DIST gnome-session-2.22.3.tar.bz2 773853 RMD160 a35065aa665ada5081f3fe19abc70950f8588e34 SHA1 817e007009e6e43cd2f1980e6d90546e7117cc9d SHA256 07ec872ae8213c4e92072ff74451caa2b6afb747fd0b07d2cea40cfcd32b7176
 DIST gnome-session-2.24.3.tar.bz2 792300 RMD160 2cd9fb8435f452873ca8bd34fd51276d24282a48 SHA1 a48bcf47b879db439cec193e4191909409e7efcb SHA256 2d59d979467459261cc741c64ce2ba6aaccd7a31cccb5b13b2ea46858e1bc636
@@ -14,13 +15,14 @@ DIST gnome-session-2.26.1-gentoo-patches.tar.bz2 6060 RMD160 acbb15102d5e2c6a17e
 DIST gnome-session-2.26.1.tar.bz2 835266 RMD160 d4eb6a0fc639a257645b2e4138055d9e1bd9f9a6 SHA1 3c8dc68f197c6b5a7d30e3ce04e65954bfe12070 SHA256 35e304ec42ed69a2b98377fd7cfac19fa00ca53bb5d6307094ebf077c00dbc32
 EBUILD gnome-session-2.22.3-r1.ebuild 2115 RMD160 6c9fbb9072b38fb9e162048f6c30706d03fe5f27 SHA1 a21447d9e69e27761089f98f272910e7ce16a2ed SHA256 da10117a817ea92d8be4371fb263d7ed2839c794f5274a6f03d2d45f353e0abe
 EBUILD gnome-session-2.24.3.ebuild 1948 RMD160 5897beb4dae8fc6f363fdf1c87c0b12b75b6634e SHA1 63c1d8ab8e21d94b465ada3c5db54225aac66f31 SHA256 51bb5a07493cff28b99a0affd796d53ea3561ea697b456b213ca935e9eea7c41
+EBUILD gnome-session-2.26.1-r1.ebuild 2219 RMD160 c82f612027be42cf0cc5221933ecef75fbea1d5d SHA1 575f2108d048c8cda30f59b80cfec52485cf4dac SHA256 ffc68b3115ffbf336f569e7841ec38835d4a47472559dbe43a481cd2ccb26061
 EBUILD gnome-session-2.26.1.ebuild 2090 RMD160 8144f7128c3344f91128e6c555670bd130b10ee3 SHA1 72e0cb1fa784fc6e38600c34c8c1d0e050356a6d SHA256 b01208a63898c9810c92381dc79b693b026e822399ef4033c456c0fc5b19e554
-MISC ChangeLog 32579 RMD160 bb0204f89f7a39ab66ef94425f1a6b7aa44d7012 SHA1 bd2ca3e5e9cefd19a3d026cea5f75f85fb2d4e7b SHA256 d936c995165c3de16df8856049c647b5ff35b47503d0215ce227a1079271da7b
+MISC ChangeLog 32861 RMD160 fb0047802aaa4e8d4be3d125c86f5d3ab6ea249c SHA1 0a401be0a8f7d9611251f5c06251e5ab73a29f49 SHA256 21bbdf0b1be90708837c8f49c1bc319fac925ef87d0b8647fbe48c23d8970072
 MISC metadata.xml 269 RMD160 6bbdafdb02cf28eb4f772d7e330519eb07ab4dcb SHA1 18a2628db0509bf3ccd54f626f3bdd4b7c3a7a43 SHA256 a735ba6a51fe0c18552eda7327e431b231fd7b590a82ba9f1cc32b0c1a38e50e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.12 (GNU/Linux)
 
-iEYEARECAAYFAkoYDhgACgkQ1fmVwcYIWAYfwwCg0YRYmYN6P+Wn1svi64tgwCcR
-fYAAoIaYJLvHuvtNPM7+SId81Ix2IA7g
-=o/1e
+iEYEARECAAYFAkpFNBwACgkQvFcC4BYPU0p/RQCfSne2ZKaegRa2X/NxC+xoKys9
+DvcAnRQQz9DEDyy/RQ3xHgzROUkfVoCH
+=EUis
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-session/files/gnome-session-2.26.1-execinfo.patch b/gnome-base/gnome-session/files/gnome-session-2.26.1-execinfo.patch
new file mode 100644
index 000000000000..a4903e2cf037
--- /dev/null
+++ b/gnome-base/gnome-session/files/gnome-session-2.26.1-execinfo.patch
@@ -0,0 +1,81 @@
+From 6b551c1c6061fe6431ff265f7acc7ff227236b7d Mon Sep 17 00:00:00 2001
+From: Alexis Ballier <aballier@gentoo.org>
+Date: Fri, 26 Jun 2009 21:42:41 +0200
+Subject: [PATCH] Fix build on systems without execinfo in the libc.
+
+Try to see if we have execinfo.h, and if we need to link to an extra library for using it. For instance FreeBSD does not have execinfo.h but a port has been made and we can use libexecinfo.
+---
+ configure.in                       |    9 +++++++++
+ gnome-session/Makefile.am          |    1 +
+ gnome-session/gdm-signal-handler.c |    6 ++++++
+ 3 files changed, 16 insertions(+), 0 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 1b8067c..55a566c 100644
+--- a/configure.in
++++ b/configure.in
+@@ -253,6 +253,15 @@ AC_HEADER_STDC
+ AC_CHECK_HEADERS(syslog.h tcpd.h sys/param.h)
+ 
+ dnl ====================================================================
++dnl check for backtrace support
++dnl ====================================================================
++
++AC_CHECK_HEADERS(execinfo.h)
++LIBEXECINFO=""
++AC_CHECK_LIB(execinfo, backtrace, [LIBEXECINFO="-lexecinfo"],[])
++AC_SUBST(LIBEXECINFO)
++
++dnl ====================================================================
+ dnl Check for newish X interface
+ dnl ====================================================================
+ oCFLAGS="$CFLAGS"
+diff --git a/gnome-session/Makefile.am b/gnome-session/Makefile.am
+index d5cb98c..fb81bb8 100644
+--- a/gnome-session/Makefile.am
++++ b/gnome-session/Makefile.am
+@@ -53,6 +53,7 @@ gnome_session_LDADD =				\
+ 	$(POLKIT_GNOME_LIBS)			\
+ 	$(XRENDER_LIBS)				\
+ 	$(XTEST_LIBS)				\
++	$(LIBEXECINFO)				\
+ 	$(NULL)
+ 
+ gnome_session_SOURCES =				\
+diff --git a/gnome-session/gdm-signal-handler.c b/gnome-session/gdm-signal-handler.c
+index 58dca7d..353f79f 100644
+--- a/gnome-session/gdm-signal-handler.c
++++ b/gnome-session/gdm-signal-handler.c
+@@ -27,7 +27,9 @@
+ #include <unistd.h>
+ #include <string.h>
+ #include <signal.h>
++#if HAVE_EXECINFO_H
+ #include <execinfo.h>
++#endif
+ #include <syslog.h>
+ #include <sys/wait.h>
+ #include <sys/stat.h>
+@@ -160,6 +162,7 @@ signal_io_watch (GIOChannel       *ioc,
+ static void
+ fallback_get_backtrace (void)
+ {
++#if HAVE_EXECINFO_H
+         void *  frames[64];
+         size_t  size;
+         char ** strings;
+@@ -174,8 +177,11 @@ fallback_get_backtrace (void)
+                 free (strings);
+                 syslog (LOG_CRIT, "******************* END **********************************");
+         } else {
++#endif
+                 g_warning ("GDM crashed, but symbols couldn't be retrieved.");
++#if HAVE_EXECINFO_H
+         }
++#endif
+ }
+ 
+ 
+-- 
+1.6.3.3
+
diff --git a/gnome-base/gnome-session/gnome-session-2.26.1-r1.ebuild b/gnome-base/gnome-session/gnome-session-2.26.1-r1.ebuild
new file mode 100644
index 000000000000..a7516dc04bcf
--- /dev/null
+++ b/gnome-base/gnome-session/gnome-session-2.26.1-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2009 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.26.1-r1.ebuild,v 1.1 2009/06/26 20:49:45 aballier Exp $
+
+EAPI="2"
+
+inherit eutils gnome2 autotools
+
+DESCRIPTION="Gnome session manager"
+HOMEPAGE="http://www.gnome.org/"
+SRC_URI="${SRC_URI}
+	mirror://gentoo/${P}-gentoo-patches.tar.bz2
+	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 doc ipv6 policykit elibc_FreeBSD"
+
+RDEPEND=">=dev-libs/glib-2.16
+	>=x11-libs/gtk+-2.11.1
+	>=gnome-base/libglade-2.3.6
+	>=dev-libs/dbus-glib-0.76
+	>=gnome-base/gconf-2
+	>=x11-libs/startup-notification-0.9
+	policykit? ( >=gnome-extra/policykit-gnome-0.7 )
+	elibc_FreeBSD? ( dev-libs/libexecinfo )
+
+	x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libX11
+	x11-libs/libXtst
+	x11-apps/xdpyinfo"
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5
+	>=sys-devel/gettext-0.10.40
+	>=dev-util/pkgconfig-0.17
+	>=dev-util/intltool-0.40
+	!<gnome-base/gdm-2.20.4
+	doc? (
+		app-text/xmlto
+		dev-libs/libxslt )"
+# gnome-base/gdm does not provide gnome.desktop anymore
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+pkg_setup() {
+	# TODO: convert libnotify to a configure option
+	G2CONF="${G2CONF}
+		--docdir=/usr/share/doc/${PF}
+		$(use_enable doc docbook-docs)
+		$(use_enable ipv6)
+		$(use_enable policykit polkit)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Patch for Gentoo Branding (bug #42687)
+	use branding && epatch "${FILESDIR}/${PN}-2.17.90.1-gentoo-branding.patch"
+
+	# Fix shutdown/restart capability, upstream bug #549150
+	epatch "${WORKDIR}/${PN}-2.26.1-shutdown.patch"
+
+	# Add "session saving" button back, upstream bug #575544
+	epatch "${WORKDIR}/${PN}-2.26.1-session-saving-button.patch"
+
+	epatch "${FILESDIR}/${P}-execinfo.patch"
+	eautoreconf
+}
+
+src_install() {
+	gnome2_src_install
+
+	dodir /etc/X11/Sessions
+	exeinto /etc/X11/Sessions
+	doexe "${FILESDIR}/Gnome" || die "doexe failed"
+
+	# Our own splash for world domination
+	if use branding ; then
+		insinto /usr/share/pixmaps/splash/
+		doins "${DISTDIR}/gentoo-splash.png" || die "doins failed"
+	fi
+}