--- a/ChangeLog	Wed Jun 18 14:54:09 2008 +0000
+++ b/ChangeLog	Thu Jun 19 11:34:37 2008 +0000
@@ -1,3 +1,16 @@
+2008-06-19  Niall Power <[email protected]>
+
+        * SUNWgnome-session.spec: Adjust %files for new tarball: 2.23.4
+        * base-specs/gnome-vfs.spec: Bump to 2.23.4 tarball. Commented
+          out patches that need a lot of reworking or evaluation for 
+          applicability. Dropped gnome-volcheck and dbus-daemon patches
+          since we no longer ship gnome-volcheck and the new gnome-session
+          launches dbus-launch instead of dbus-daemon now.
+        * patches/gnome-session-01-gnome-atom.diff: Reworked for new tarball.
+        * patches/gnome-session-04-wait-for-postrun.diff: Reworked.
+        * patches/gnome-session-06-gnome-volcheck-default-session.diff: removed
+        * patches/gnome-session-09-find-dbus-daemon.diff: removed
+
 2008-06-18  Damien Carbery <[email protected]>
 
 	* SUNWgnome-gvfs.spec: Add Build/Requires SUNWgnome-config/-devel,

--- a/SUNWgnome-session.spec	Wed Jun 18 14:54:09 2008 +0000
+++ b/SUNWgnome-session.spec	Thu Jun 19 11:34:37 2008 +0000
@@ -132,11 +132,15 @@
 %defattr (-, root, bin)
 %dir %attr (0755, root, bin) %{_bindir}
 %{_bindir}/*
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/gnome-session/helpers/*
 %dir %attr (0755, root, sys) %{_datadir}
 %dir %attr (0755, root, other) %{_datadir}/applications
 %{_datadir}/applications/*
 %dir %attr (0755, root, other) %{_datadir}/gnome
 %{_datadir}/gnome/*
+%dir %attr (0755, root, other) %{_datadir}/gnome-session
+%{_datadir}/gnome-session/*
 %attr (-, root, other) %{_datadir}/icons
 %dir %attr (0755, root, other) %{_datadir}/pixmaps
 %{_datadir}/pixmaps/*
@@ -161,6 +165,9 @@
 %endif
 
 %changelog
+* Thu Jun 19 2008 - [email protected]
+- Add %{_libdir}/gnome-session/helpers for 2.23.4 tarball.
+- Add %{_datadir}/gnome-session fpr 2.23.4 tarball.
 * Thu Jan 17 2008 - [email protected]
 - Add %{_datadir}/xsessions to %files for 2.21.5 tarball.
 * Thu Jan  3 2008 - [email protected]

--- a/base-specs/gnome-session.spec	Wed Jun 18 14:54:09 2008 +0000
+++ b/base-specs/gnome-session.spec	Thu Jun 19 11:34:37 2008 +0000
@@ -11,12 +11,12 @@
 Name:         gnome-session
 License:      GPL
 Group:        System/GUI/GNOME
-Version:      2.22.2
+Version:      2.23.4
 Release:      1
 Distribution: Java Desktop System
 Vendor:	      Sun Microsystems, Inc.
 Summary:      Session Manager for the GNOME Desktop
-Source:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.22/%{name}-%{version}.tar.bz2
+Source:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.23/%{name}-%{version}.tar.bz2
 Source1:      gnome-splash.png
 Source2:      %{name}-po-sun-%{po_sun_version}.tar.bz2
 %if %build_l10n
@@ -35,19 +35,12 @@
 Patch4:       gnome-session-04-wait-for-postrun.diff
 #owner:gheet date:2006-11-03 type:feature bugster:6393728
 Patch5:       gnome-session-05-trusted-extensions.diff
-#owner:niall date:2004-11-10 type:branding bugster:6188905
-# We only want to run gnome-volcheck by default if we aren't building with HAL.
-Patch6:       gnome-session-06-gnome-volcheck-default-session.diff
 #owner:erwannc date:2003-07-29 type:branding
 Patch7:       gnome-session-07-busy-cursor.diff
 %if %option_with_sun_branding
 #owner:erwannc date:2005-05-11 type:branding
 Patch8:       gnome-session-08-solaris-branding.diff
 %endif
-# This patch works around a bug in D-Bus.  When this bug is actually fixed
-# in D-Bus, then this workaround patch should be removed.
-#owner:yippi date:2008-01-08 type:bug bugzilla:508231
-Patch9:       gnome-session-09-find-dbus-daemon.diff
 #owner:jefftsai date:2008-01-08 type:branding
 Patch10:      gnome-session-10-disable-ssh.diff
 #owner:yippi date:2008-02-29 type:branding
@@ -82,32 +75,34 @@
 cd po-logout; make; cd ..
 %endif
 %patch1 -p1
-%patch2 -p1
-%if %option_with_sun_branding
-%patch3 -p1
-%endif
+# Patch2 needs porting or to be dropped if not applicable
+#%patch2 -p1
+#%if %option_with_sun_branding
+#%patch3 -p1
+#%endif
 %patch4 -p1
-%patch5 -p1
-%if %with_hal
-%else
-%patch6 -p1
-%endif
-%patch7 -p1
-%if %option_with_sun_branding
-%patch8 -p1
-cp %SOURCE1 gnome-session/gnome-splash.png
-%endif
-%patch9 -p1
-%patch10 -p1
-%if %option_without_dt
-%else
+# Patch5 needs porting by TJDS team.
+#%patch5 -p1
+# Patch7 needs porting
+#%patch7 -p1
+# Patch8 needs porting
+#%if %option_with_sun_branding
+#%patch8 -p1
+#cp %SOURCE1 gnome-session/gnome-splash.png
+#%endif
+# Patch10 needs porting
+#%patch10 -p1
+#%if %option_without_dt
+#%else
 %patch11 -p1
-%endif
-%patch12 -p1
-%if %option_with_indiana_branding
-cp %SOURCE4 data
-%patch13 -p1
-%endif
+#%endif
+# Patch12 needs porting
+#%patch12 -p1
+#%if %option_with_indiana_branding
+#cp %SOURCE4 data
+# Patch13 needs porting
+#%patch13 -p1
+#%endif
 
 
 %build
@@ -178,6 +173,12 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Thu Jin 19 2008 - [email protected]
+- Bump to 2.23.4 community tarball.
+  Dropped patches: 
+  -06-gnome-volcheck... No longer ship gnome-volcheck
+  -09-find-dbus-daemon  Launches dbus-launch now instead of dbus-daemon
+  Commented out patches that don't apply to new sources.
 * Thu Jun 12 2008 - [email protected]
 - Add po-logout to avoid UI freeze.
 * Fri Jun 06 2008 - [email protected]

--- a/patches/gnome-session-01-gnome-atom.diff	Wed Jun 18 14:54:09 2008 +0000
+++ b/patches/gnome-session-01-gnome-atom.diff	Thu Jun 19 11:34:37 2008 +0000
@@ -1,30 +1,30 @@
---- /tmp/main.c	2007-06-05 14:27:38.963754882 +0800
-+++ gnome-session-2.19.3/gnome-session/main.c	2007-06-05 14:26:59.884972000 +0800
-@@ -21,6 +21,7 @@
+--- gnome-session-2.23.4/gnome-session/main.c	2008-06-03 23:38:18.000000000 +0800
++++ gnome-session-2.23.4/gnome-session/main.c.new	2008-06-19 15:42:50.161585000 +0800
+@@ -15,6 +15,7 @@
  
- #include <stdio.h>
- #include <gtk/gtk.h>
+ #include <glib/gi18n.h>
+ #include <glib/goption.h>
 +#include <gdk/gdkx.h>
- #include <signal.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -82,6 +83,8 @@ gint warn_delay = 120000;
- gint suicide_delay = 10000;
+ #include <gtk/gtkmain.h>
+ #include <gtk/gtkmessagedialog.h>
  
- gchar *session_name = NULL;
-+Display *xdisp;
-+GdkDisplay *gdisp;
+@@ -91,6 +92,8 @@
+   struct sigaction sa;
+   GError *err = NULL;
+   char *display_str;
++  Display *xdisp;
++  GdkDisplay *gdisp;
  
- static const GOptionEntry options[] = {
-   {"choose-session", '\0', 0, G_OPTION_ARG_STRING, &session_name, N_("Specify a session name to load"), N_("NAME")},
-@@ -680,6 +683,10 @@ main (int argc, char *argv[])
+   bindtextdomain (GETTEXT_PACKAGE, LOCALE_DIR);
+   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+@@ -115,6 +118,10 @@
    g_setenv ("DISPLAY", display_str, TRUE);
    g_free (display_str);
  
-+  gdisp = gdk_display_get_default();
++  gdisp = gdk_display_get_default ();
 +  xdisp = gdk_x11_display_get_xdisplay (gdisp);
 +  XInternAtom (xdisp, "GNOME_SM_DESKTOP", FALSE);
 +
-   ignore (SIGPIPE);
- 
-   /* Need DISPLAY set */
+   /* Start up gconfd and dbus-daemon (in parallel) if they're not
+    * already running. This requires us to initialize XSMP too, because
+    * we want $SESSION_MANAGER to be set before launching dbus-daemon.

--- a/patches/gnome-session-04-wait-for-postrun.diff	Wed Jun 18 14:54:09 2008 +0000
+++ b/patches/gnome-session-04-wait-for-postrun.diff	Thu Jun 19 11:34:37 2008 +0000
@@ -1,12 +1,19 @@
-diff -urN gnome-session-2.21.5/gnome-session/main.c gnome-session-2.21.5-hacked/gnome-session/main.c
---- gnome-session-2.21.5/gnome-session/main.c	2006-10-23 09:51:16.839150000 +1300
-+++ gnome-session-2.21.5-hacked/gnome-session/main.c	2006-10-23 09:53:52.502604000 +1300
-@@ -248,7 +248,69 @@
-   RESPONSE_LOG_IN,
-   RESPONSE_TRY_AGAIN
+--- gnome-session-2.23.4/gnome-session/main.c	2008-06-19 17:27:35.895521000 +0800
++++ gnome-session-2.23.4/gnome-session/main.c.new	2008-06-19 17:27:51.754236000 +0800
+@@ -16,6 +16,9 @@
+ #include <glib/gi18n.h>
+ #include <glib/goption.h>
+ #include <gdk/gdkx.h>
++#include <gtk/gtklabel.h>
++#include <gtk/gtkvbox.h>
++#include <gtk/gtkprogressbar.h>
+ #include <gtk/gtkmain.h>
+ #include <gtk/gtkmessagedialog.h>
+ 
+@@ -37,6 +40,68 @@
+   { NULL, 0, 0, 0, NULL, NULL, NULL }
  };
--    
-+
+ 
 +static gboolean
 +postrun_progress_update (gpointer data)
 +{
@@ -69,15 +76,15 @@
 +  }
 +}
 +
- static void
- gnome_login_check (void)
- {
-@@ -730,6 +731,8 @@
-   if (gsm_check_for_root ())
-     return 0;
+ /**
+  * gsm_initialization_error:
+  * @fatal: whether or not the error is fatal to the login session
+@@ -122,6 +187,8 @@
+   xdisp = gdk_x11_display_get_xdisplay (gdisp);
+   XInternAtom (xdisp, "GNOME_SM_DESKTOP", FALSE);
  
 +  gsm_wait_for_unfinished_postrun ();
 +
-   if (ORBit_proto_use ("IPv4") || ORBit_proto_use ("IPv6"))
-     gnome_login_check ();
- 
+   /* Start up gconfd and dbus-daemon (in parallel) if they're not
+    * already running. This requires us to initialize XSMP too, because
+    * we want $SESSION_MANAGER to be set before launching dbus-daemon.

--- a/patches/gnome-session-06-gnome-volcheck-default-session.diff	Wed Jun 18 14:54:09 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-diff -urNp gnome-session-2.12.0/data/default.session.in gnome-session-2.12.0-hacked/data/default.session.in
---- gnome-session-2.12.0/data/default.session.in	2005-09-18 22:08:08.900081368 +1200
-+++ gnome-session-2.12.0-hacked/data/default.session.in	2005-09-18 22:08:03.262938344 +1200
-@@ -8,7 +8,7 @@
- # The clients must be numbered from 0 to the value of num_clients - 1.
- 
- [Default]
--num_clients=3
-+num_clients=4
- 0,id=default0
- 0,Priority=0
- 0,RestartCommand=gnome-wm --default-wm gnome-wm --sm-client-id default0
-@@ -18,3 +18,6 @@ num_clients=3
- 2,id=default2
- 2,Priority=20
- 2,RestartCommand=nautilus --no-default-window --sm-client-id default2
-+3,id=default3
-+3,Priority=30
-+3,RestartCommand=gnome-volcheck -i 30 -z 3 -m cdrom,floppy,zip,jaz,dvdrom --sm-client-id default3

--- a/patches/gnome-session-09-find-dbus-daemon.diff	Wed Jun 18 14:54:09 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
---- gnome-session-2.20.3/configure.in-orig	2008-01-08 17:23:43.455851000 -0600
-+++ gnome-session-2.20.3/configure.in	2008-01-08 18:03:20.581196000 -0600
-@@ -97,6 +97,14 @@ fi
- 
- PKG_CHECK_MODULES(GNOME_SESSION, glib-2.0 >= $GLIB_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED gnome-settings-daemon gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED)
- 
-+DBUS_DAEMONDIR=`pkg-config dbus-1 --variable=daemondir`
-+if test x"$DBUS_DAEMONDIR" != "x"; then
-+    GS_DBUS_DAEMON="$DBUS_DAEMONDIR/dbus-daemon"
-+else
-+    GS_DBUS_DAEMON="dbus-daemon"
-+fi
-+AC_SUBST(GS_DBUS_DAEMON)
-+
- dnl Check if libnotify is present
- 
- LIBNOTIFY_REQUIRED=0.2.1
---- gnome-session-2.21.91/gnome-session/Makefile.am-orig	2008-01-08 17:24:41.831944000 -0600
-+++ gnome-session-2.21.91/gnome-session/Makefile.am	2008-01-08 18:03:35.311648000 -0600
-@@ -7,6 +7,7 @@
- 	$(STANDARD_PROPERTIES_CFLAGS)			\
- 	$(WARN_CFLAGS)					\
- 	$(DISABLE_DEPRECATED_CFLAGS)			\
-+	-DGS_DBUS_DAEMON="\"$(GS_DBUS_DAEMON)\""	\
- 	-DGNOMELOCALEDIR=\""$(prefix)/${DATADIRNAME}/locale\""	\
- 	-DGCONF_SANITY_CHECK=\""$(GCONF_SANITY_CHECK)"\"	    \
- 	-DGNOME_KEYRING_DAEMON=\""$(GNOME_KEYRING_DAEMON)"\"	    \
---- gnome-session-2.20.3/gnome-session/gsm-dbus.c-orig	2008-01-08 16:15:35.183785000 -0600
-+++ gnome-session-2.20.3/gnome-session/gsm-dbus.c	2008-01-08 18:03:49.038768000 -0600
-@@ -152,7 +152,7 @@ have_dbus_daemon (void)
-   gboolean result;
-   gchar *file_name;
- 
--  file_name = g_find_program_in_path ("dbus-daemon");
-+  file_name = g_find_program_in_path (GS_DBUS_DAEMON);
-   if (file_name == NULL)
-     g_printerr ("Cannot locate dbus-daemon\n");
-   result = file_name != NULL;
-@@ -253,8 +253,8 @@ start_child (int address_fd, int pid_fd)
-   g_snprintf (address_str, sizeof (address_str), "%d", address_fd);
-   g_snprintf (pid_str, sizeof (pid_str), "%d", pid_fd);
- 
--  execlp ("dbus-daemon",
--          "dbus-daemon",
-+  execlp (GS_DBUS_DAEMON,
-+          GS_DBUS_DAEMON,
-           "--fork",
-           "--print-address", address_str,
-           "--print-pid", pid_str,