--- a/ChangeLog	Tue Feb 16 05:38:34 2010 +0000
+++ b/ChangeLog	Tue Feb 16 06:01:48 2010 +0000
@@ -1,3 +1,11 @@
+2010-02-15  Brian Cameron  <[email protected]>
+
+	* SFEopenbox.spec, patches/openbox-01-union.diff,
+	  patches/openbox-02-session.diff: Bump to 3.4.11.  Remove upstream
+	  patches.
+	* patches/lxde-common-01-startlxde.diff: Fix script so it runs.
+	* patches/lxsession-02-fixcrash.diff: Fix crashing problem.
+
 2010-02-15  Brian Cameron  <[email protected]>
 
 	* SFEmenu-cache.spec: Bump to 0.3.0.

--- a/SFEopenbox.spec	Tue Feb 16 05:38:34 2010 +0000
+++ b/SFEopenbox.spec	Tue Feb 16 06:01:48 2010 +0000
@@ -9,17 +9,10 @@
 
 Name:                    SFEopenbox
 Summary:                 a free window manager for the X Window System
-Version:                 3.4.7.2
+Version:                 3.4.11
 Source:                  http://icculus.org/openbox/releases/openbox-%{version}.tar.gz
 URL:                     http://icculus.org/openbox/index.php/Main_Page
 
-# Refer to Sun Studio compiler bugs 4614572 and 6525110
-# owner:alfred date:2009-06-02 type:bug
-# reported as bug 3869.
-Patch1:                  openbox-01-union.diff
-# reported as bug 4253.
-Patch2:                  openbox-02-session.diff
-
 SUNW_BaseDir:            %{_basedir}
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
@@ -40,9 +33,6 @@
 %prep
 %setup -q -n openbox-%version
 
-%patch1 -p1
-%patch2 -p1
-
 %build
 CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
 if test "x$CPUS" = "x" -o $CPUS = 0; then
@@ -83,6 +73,8 @@
 %dir %attr (0755, root, bin) %{_includedir}
 %{_includedir}/*
 %dir %attr (0755, root, sys) %{_datadir}
+%dir %attr (0755, root, other) %{_datadir}/applications
+%{_datadir}/applications/*
 %dir %attr (0755, root, other) %{_datadir}/pixmaps
 %{_datadir}/pixmaps/*
 %dir %attr (0755, root, other) %{_datadir}/gnome
@@ -109,6 +101,8 @@
 %endif
 
 %changelog
+* Mon Feb 15 2010 - [email protected]
+- Bump to 3.4.11.
 * Tue Aug 04 2009 - [email protected]
 - Add patch openbox-02-session.diff so that the script works
   with Nevada bourne-shell.

--- a/patches/lxde-common-01-startlxde.diff	Tue Feb 16 05:38:34 2010 +0000
+++ b/patches/lxde-common-01-startlxde.diff	Tue Feb 16 06:01:48 2010 +0000
@@ -1,8 +1,11 @@
 --- lxde-common-0.4.2/startlxde.in-orig	2009-08-06 20:47:38.642288000 -0500
 +++ lxde-common-0.4.2/startlxde.in	2009-08-06 20:47:57.090355000 -0500
-@@ -1,7 +1,8 @@
+@@ -1,7 +1,11 @@
  #!/bin/sh
  
++PATH=$PATH:/usr/X11/bin
++export PATH
++
  if [ -z "$XDG_CONFIG_HOME" ]; then
 -    export XDG_CONFIG_HOME="$HOME/.config"
 +    XDG_CONFIG_HOME="$HOME/.config"
@@ -10,7 +13,7 @@
  fi
  
  # Ensure the existance of pcmanfm config file
-@@ -22,7 +23,8 @@ fi
+@@ -22,7 +26,8 @@ fi
  xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES -remove _NET_CURRENT_DESKTOP 2> /dev/null
  
  # Enable GTK+2 integration for OpenOffice.org, if available.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/lxsession-02-fixcrash.diff	Tue Feb 16 06:01:48 2010 +0000
@@ -0,0 +1,24 @@
+--- lxsession-0.4.1/lxsession/autostart.c-orig	2010-02-15 23:44:17.201266230 -0600
++++ lxsession-0.4.1/lxsession/autostart.c	2010-02-15 23:45:07.606075883 -0600
+@@ -189,7 +189,7 @@ static void launch_autostart_file( const
+             for( i = 0; i < n; ++i )
+             {
+                 /* Only start this program if we are in the "OnlyShowIn" list */
+-                if( 0 == strcmp( de_name, only_show_in[ i ] ) )
++                if(de_name != NULL &&  0 == strcmp( de_name, only_show_in[ i ] ) )
+                     break;
+             }
+             if( i >= n )    /* our session name is not found in the list */
+--- lxsession-0.4.1/lxsession/lxsession.c-orig	2010-02-15 23:41:33.847859021 -0600
++++ lxsession-0.4.1/lxsession/lxsession.c	2010-02-15 23:43:36.050621365 -0600
+@@ -311,7 +311,9 @@ int main(int argc, char** argv)
+ 
+     if ( G_UNLIKELY(!de_name) )
+         session_name = session_name;
+-    g_setenv( "XDG_CURRENT_DESKTOP", de_name, TRUE );
++    if (de_name != NULL) {
++        g_setenv( "XDG_CURRENT_DESKTOP", de_name, TRUE );
++    }
+ 
+     /* FIXME: load environment variables? */
+ 

--- a/patches/openbox-01-union.diff	Tue Feb 16 05:38:34 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
---- openbox-3.4.7.2/openbox/actions/desktop.c.orig	2009-06-02 12:32:41.303067177 +0800
-+++ openbox-3.4.7.2/openbox/actions/desktop.c	2009-06-02 12:34:49.882891434 +0800
-@@ -21,7 +21,7 @@
-             gboolean wrap;
-             ObDirection dir;
-         } rel;
--    };
-+    } aa;
-     gboolean send;
-     gboolean follow;
- } Options;
-@@ -130,9 +130,9 @@
-     Options *o = g_new0(Options, 1);
-     o->type = ABSOLUTE;
-     if ((n = parse_find_node("desktop", node)))
--        o->abs.desktop = parse_int(doc, n) - 1;
-+        o->aa.abs.desktop = parse_int(doc, n) - 1;
-     else
--        o->abs.desktop = screen_desktop;
-+        o->aa.abs.desktop = screen_desktop;
-     return o;
- }
- 
-@@ -143,9 +143,9 @@
-     Options *o = setup_follow(i, doc, node);
-     o->type = ABSOLUTE;
-     if ((n = parse_find_node("desktop", node)))
--        o->abs.desktop = parse_int(doc, n) - 1;
-+        o->aa.abs.desktop = parse_int(doc, n) - 1;
-     else
--        o->abs.desktop = screen_desktop;
-+        o->aa.abs.desktop = screen_desktop;
-     return o;
- }
- 
-@@ -155,12 +155,12 @@
-     xmlNodePtr n;
- 
-     o->type = RELATIVE;
--    o->rel.linear = lin;
--    o->rel.dir = dir;
--    o->rel.wrap = TRUE;
-+    o->aa.rel.linear = lin;
-+    o->aa.rel.dir = dir;
-+    o->aa.rel.wrap = TRUE;
- 
-     if ((n = parse_find_node("wrap", node)))
--        o->rel.wrap = parse_bool(doc, n);
-+        o->aa.rel.wrap = parse_bool(doc, n);
- }
- 
- static gpointer setup_go_next_func(ObParseInst *i, xmlDocPtr doc,
-@@ -270,11 +270,11 @@
-         d = screen_last_desktop;
-         break;
-     case ABSOLUTE:
--        d = o->abs.desktop;
-+        d = o->aa.abs.desktop;
-         break;
-     case RELATIVE:
-         d = screen_find_desktop(screen_desktop,
--                                o->rel.dir, o->rel.wrap, o->rel.linear);
-+                                o->aa.rel.dir, o->aa.rel.wrap, o->aa.rel.linear);
-         break;
-     }
- 

--- a/patches/openbox-02-session.diff	Tue Feb 16 05:38:34 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
---- openbox-3.4.7.2/data/xsession/openbox-session.in-orig	2009-08-04 19:07:08.772505000 -0500
-+++ openbox-3.4.7.2/data/xsession/openbox-session.in	2009-08-04 19:07:15.280456000 -0500
-@@ -10,10 +10,10 @@ fi
- AUTOSTART="$HOME/.config/openbox/autostart.sh"
- GLOBALAUTOSTART="@configdir@/openbox/autostart.sh"
- 
--if test -e $AUTOSTART; then
-+if test -f $AUTOSTART; then
-     . $AUTOSTART
- else
--    if test -e $GLOBALAUTOSTART; then
-+    if test -f $GLOBALAUTOSTART; then
-         . $GLOBALAUTOSTART
-     fi
- fi