update to 2.24.0

This switches to the gnome-2.24 release branch.

9 files changed, 87 insertions, 48 deletions

diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index a1fc779ca59..4cd5344e431 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.102 2008/09/06 20:54:34 wiz Exp $
+# $NetBSD: Makefile,v 1.103 2008/10/16 18:17:30 drochner Exp $
 #
 
-DISTNAME=		gnome-session-2.22.3
-PKGREVISION=		1
+DISTNAME=		gnome-session-2.24.0
 CATEGORIES=		x11 gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-session/2.22/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-session/2.24/}
 SITES.gnome-splash-2.16.0.png=	${MASTER_SITE_LOCAL:=gnome-splash/}
 EXTRACT_SUFX=		.tar.bz2
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX} gnome-splash-2.16.0.png
diff --git a/x11/gnome-session/PLIST b/x11/gnome-session/PLIST
index 7b89ad0864f..b6f6f3895f9 100644
--- a/x11/gnome-session/PLIST
+++ b/x11/gnome-session/PLIST
@@ -1,9 +1,12 @@
-@comment $NetBSD: PLIST,v 1.21 2008/04/25 04:02:23 bjs Exp $
+@comment $NetBSD: PLIST,v 1.22 2008/10/16 18:17:30 drochner Exp $
 bin/gnome-session
 bin/gnome-session-properties
-bin/gnome-session-remove
 bin/gnome-session-save
 bin/gnome-wm
+lib/gnome-session/helpers/at-spi-registryd-wrapper
+lib/gnome-session/helpers/gnome-keyring-daemon-wrapper
+lib/gnome-session/helpers/gnome-session-splash
+lib/gnome-session/helpers/gnome-settings-daemon-helper
 man/man1/gnome-session-save.1
 man/man1/gnome-session.1
 man/man1/gnome-wm.1
@@ -11,7 +14,12 @@ man/man1/session-properties.1
 man/man5/default.session.5
 share/applications/session-properties.desktop
 share/gconf/schemas/gnome-session.schemas
-share/gnome/default.session
+share/gnome-session/gsm-inhibit-dialog.glade
+share/gnome-session/session-properties.glade
+share/gnome/autostart/at-spi-registryd-wrapper.desktop
+share/gnome/autostart/gnome-keyring-daemon-wrapper.desktop
+share/gnome/autostart/gnome-session-splash.desktop
+share/gnome/autostart/gnome-settings-daemon-helper.desktop
 share/icons/hicolor/16x16/apps/session-properties.png
 share/icons/hicolor/22x22/apps/session-properties.png
 share/icons/hicolor/24x24/apps/session-properties.png
@@ -88,7 +96,7 @@ share/locale/sk/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/sl/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/sq/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/sr/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/sr@Latn/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/sr@latin/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/sv/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/ta/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/te/LC_MESSAGES/gnome-session-2.0.mo
@@ -113,6 +121,9 @@ share/pixmaps/splash/gnome-splash.png
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor
-@comment in gnome2-dirs: @dirrm share/gnome
+@dirrm share/gnome/autostart
+@dirrm share/gnome-session
 @comment in GConf: @dirrm share/gconf/schemas
 @comment in xdg-dirs: @dirrm share/applications
+@dirrm lib/gnome-session/helpers
+@dirrm lib/gnome-session
diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo
index 3288ccb15e8..d5736d19e45 100644
--- a/x11/gnome-session/distinfo
+++ b/x11/gnome-session/distinfo
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.40 2008/07/15 10:43:38 drochner Exp $
+$NetBSD: distinfo,v 1.41 2008/10/16 18:17:30 drochner Exp $
 
-SHA1 (gnome-session-2.22.3.tar.bz2) = 817e007009e6e43cd2f1980e6d90546e7117cc9d
-RMD160 (gnome-session-2.22.3.tar.bz2) = a35065aa665ada5081f3fe19abc70950f8588e34
-Size (gnome-session-2.22.3.tar.bz2) = 773853 bytes
+SHA1 (gnome-session-2.24.0.tar.bz2) = 5a4b329db62ae3518029982ae86fb1b138500c3e
+RMD160 (gnome-session-2.24.0.tar.bz2) = e0430e566ba61a2fe4a1390f0cfb5cf32eec437b
+Size (gnome-session-2.24.0.tar.bz2) = 797656 bytes
 SHA1 (gnome-splash-2.16.0.png) = 0d321be84c5668a2c0fecb494edc820d6b74ee9d
 RMD160 (gnome-splash-2.16.0.png) = 28667abaaef6ac20dde9f4101554a5043b4f9c96
 Size (gnome-splash-2.16.0.png) = 36601 bytes
-SHA1 (patch-aa) = 7cb4092f21ee08b7e7248df2cff677b678da22ec
-SHA1 (patch-ab) = b274bbe433151383ee0f2117dd2fb5746920be75
-SHA1 (patch-ac) = 35cc0f0982cb8ed711a4ebc45d2e9570725cbf95
-SHA1 (patch-ad) = c737a11ec9ab7c74e498644f81377ffb3c65ee94
+SHA1 (patch-aa) = 9a385124467efd98a71a41ec8e123c6e51316d40
+SHA1 (patch-ac) = f3a74bd3942269f44fab2d52262c2fedb3fd2848
+SHA1 (patch-ad) = fe18ad5dbb6851b81bf23a4dcb2eec2d32981730
+SHA1 (patch-ae) = 31759f8ee3f4415c43feb9ce5e93cba549de06a3
+SHA1 (patch-af) = b307190d2c0f8cc2e5aef8fec00868eaf5ddf8b9
diff --git a/x11/gnome-session/patches/patch-aa b/x11/gnome-session/patches/patch-aa
index cf44f63560b..cbde3f5a091 100644
--- a/x11/gnome-session/patches/patch-aa
+++ b/x11/gnome-session/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.10 2008/04/15 18:06:15 drochner Exp $
+$NetBSD: patch-aa,v 1.11 2008/10/16 18:17:30 drochner Exp $
 
---- gnome-session/Makefile.in.orig	2008-03-10 22:01:44.000000000 +0100
+--- gnome-session/Makefile.in.orig	2008-09-22 23:30:18.000000000 +0200
 +++ gnome-session/Makefile.in
-@@ -301,7 +301,7 @@ INCLUDES = \
- 	-DGNOME_KEYRING_DAEMON=\""$(GNOME_KEYRING_DAEMON)"\"	    \
- 	-DGNOME_ICONDIR=\""$(datadir)/pixmaps\""	\
- 	-DRSH_COMMAND=\""$(RSH_COMMAND)\""		\
--	-DGCONFTOOL_CMD=\""$(GCONFTOOL)\""		\
-+	-DGCONFTOOL_CMD=\""$(REAL_GCONFTOOL)\""		\
- 	-DDEFAULTDIR="\"$(defaultdir)\""		\
- 	-DAT_SPI_REGISTRYD_DIR="\"$(AT_SPI_REGISTRYD_DIR)\""	\
- 	-DTIME_UTILITY="\"$(TIME_UTILITY)\""		\
+@@ -312,7 +312,7 @@ INCLUDES = \
+ 	-DLIBEXECDIR=\"$(libexecdir)\"		\
+ 	-DGLADEDIR=\""$(pkgdatadir)"\"		\
+ 	-DGCONF_SANITY_CHECK=\""$(GCONF_SANITY_CHECK)"\" \
+-	-DGCONFTOOL_CMD=\"$(GCONFTOOL)\"
++	-DGCONFTOOL_CMD=\"$(REAL_GCONFTOOL)\"
+ 
+ test_inhibit_SOURCES = \
+ 	test-inhibit.c	\
diff --git a/x11/gnome-session/patches/patch-ab b/x11/gnome-session/patches/patch-ab
deleted file mode 100644
index a82b0127bdc..00000000000
--- a/x11/gnome-session/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2007/04/11 20:25:38 drochner Exp $
-
---- configure.orig	2007-03-12 19:59:01.000000000 +0100
-+++ configure
-@@ -26374,6 +26374,7 @@ case "$GNOME_SESSION_LIBS" in
- 		GNOME_HAVE_SM=no
- 		;;
- esac
-+GNOME_HAVE_SM=yes
- { echo "$as_me:$LINENO: result: $GNOME_HAVE_SM" >&5
- echo "${ECHO_T}$GNOME_HAVE_SM" >&6; }
- if test "$GNOME_HAVE_SM" = no ; then
diff --git a/x11/gnome-session/patches/patch-ac b/x11/gnome-session/patches/patch-ac
index b7cc6307208..9495ceee043 100644
--- a/x11/gnome-session/patches/patch-ac
+++ b/x11/gnome-session/patches/patch-ac
@@ -1,11 +1,11 @@
-$NetBSD: patch-ac,v 1.11 2008/04/25 04:02:23 bjs Exp $
+$NetBSD: patch-ac,v 1.12 2008/10/16 18:17:30 drochner Exp $
 
---- data/Makefile.in.orig	2008-04-10 10:34:02.000000000 -0400
+--- data/Makefile.in.orig	2008-09-22 23:30:16.000000000 +0200
 +++ data/Makefile.in
-@@ -628,8 +628,8 @@ info: info-recursive
+@@ -683,8 +683,8 @@ info: info-recursive
  info-am:
  
- install-data-am: install-data-local install-defaultDATA \
+ install-data-am: install-data-local install-gladeDATA \
 -	install-pixmapDATA install-schemasDATA install-settingsDATA \
 -	install-xsessionDATA
 +	install-pixmapDATA install-schemasDATA install-settingsDATA
diff --git a/x11/gnome-session/patches/patch-ad b/x11/gnome-session/patches/patch-ad
index 0614cf5e3be..0f17effdd4a 100644
--- a/x11/gnome-session/patches/patch-ad
+++ b/x11/gnome-session/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.6 2008/05/12 12:58:03 jmcneill Exp $
+$NetBSD: patch-ad,v 1.7 2008/10/16 18:17:30 drochner Exp $
 
---- gnome-session/gnome-wm.orig	2008-04-10 10:32:20.000000000 -0400
-+++ gnome-session/gnome-wm	2008-05-12 08:50:00.000000000 -0400
-@@ -119,15 +119,21 @@
+--- data/gnome-wm.orig	2008-09-22 23:21:08.000000000 +0200
++++ data/gnome-wm
+@@ -131,15 +131,21 @@ fi
  case `basename $WINDOW_MANAGER` in
    compiz)
      export LIBGL_ALWAYS_INDIRECT=1
diff --git a/x11/gnome-session/patches/patch-ae b/x11/gnome-session/patches/patch-ae
new file mode 100644
index 00000000000..17ee2a9d36b
--- /dev/null
+++ b/x11/gnome-session/patches/patch-ae
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.6 2008/10/16 18:17:30 drochner Exp $
+
+--- gnome-session/gsm-autostart-app.c.orig	2008-10-15 19:38:53.000000000 +0200
++++ gnome-session/gsm-autostart-app.c
+@@ -25,6 +25,7 @@
+ #include <string.h>
+ #include <sys/wait.h>
+ #include <errno.h>
++#include <signal.h>
+ 
+ #include <glib.h>
+ #include <gio/gio.h>
diff --git a/x11/gnome-session/patches/patch-af b/x11/gnome-session/patches/patch-af
new file mode 100644
index 00000000000..84ae5aaed3f
--- /dev/null
+++ b/x11/gnome-session/patches/patch-af
@@ -0,0 +1,28 @@
+$NetBSD: patch-af,v 1.1 2008/10/16 18:17:30 drochner Exp $
+
+--- gnome-session/gdm-signal-handler.c.orig	2008-10-15 19:43:48.000000000 +0200
++++ gnome-session/gdm-signal-handler.c
+@@ -27,7 +27,6 @@
+ #include <unistd.h>
+ #include <string.h>
+ #include <signal.h>
+-#include <execinfo.h>
+ #include <syslog.h>
+ #include <sys/wait.h>
+ #include <sys/stat.h>
+@@ -160,6 +159,7 @@ signal_io_watch (GIOChannel       *ioc,
+ static void
+ fallback_get_backtrace (void)
+ {
++#if 0
+         void *  frames[64];
+         size_t  size;
+         char ** strings;
+@@ -176,6 +176,7 @@ fallback_get_backtrace (void)
+         } else {
+                 g_warning ("GDM crashed, but symbols couldn't be retrieved.");
+         }
++#endif
+ }
+ 
+