update to 2.24.0

This switches to the gnome-2.24 release branch.

6 files changed, 59 insertions, 31 deletions

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
+ }
+ 
+