- ough.. recent stuff

Changed files:
    3dwm-SDL-in-usr-X11R6.patch -> 1.1
    3dwm-autocrap.patch -> 1.1
    3dwm-gcc32.patch -> 1.1
    3dwm-omniORB4.patch -> 1.1

diff --git a/3dwm-SDL-in-usr-X11R6.patch b/3dwm-SDL-in-usr-X11R6.patch
new file mode 100644 (file)
index 0000000..500f272
--- /dev/null
+++ b/3dwm-SDL-in-usr-X11R6.patch
@@ -0,0 +1,13 @@
+diff -ur 3dwm-0.3.2/server/Makefile.am 3dwm-0.3.2-/server/Makefile.am
+--- 3dwm-0.3.2/server/Makefile.am      Thu Aug 16 13:32:23 2001
++++ 3dwm-0.3.2-/server/Makefile.am     Mon Feb  3 20:17:28 2003
+@@ -32,7 +32,7 @@
+ # USA
+ # ------------------------------------------------------------------------
+ 
+-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include/Nobel
++INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include/Nobel -I/usr/X11R6/include
+ CXXFLAGS = $(ORBCXXFLAGS)
+ 
+ bin_PROGRAMS = tdwm-server
+

diff --git a/3dwm-autocrap.patch b/3dwm-autocrap.patch
new file mode 100644 (file)
index 0000000..85ae77e
--- /dev/null
+++ b/3dwm-autocrap.patch
@@ -0,0 +1,89 @@
+diff -ur 3dwm-0.3.1/config/macros/utils.m4 3dwm-0.3.1-/config/macros/utils.m4
+--- 3dwm-0.3.1/config/macros/utils.m4  Mon May 28 14:47:24 2001
++++ 3dwm-0.3.1-/config/macros/utils.m4 Mon Feb  3 16:42:23 2003
+@@ -889,5 +889,5 @@
+ fi
+ ])dnl
+ 
+-divert
++divert(0)
+ 
+diff -ur 3dwm-0.3.1/config/macros/mdl_have_opengl.m4 3dwm-0.3.1-/config/macros/mdl_have_opengl.m4
+--- 3dwm-0.3.1/config/macros/mdl_have_opengl.m4        Mon Aug 20 15:48:53 2001
++++ 3dwm-0.3.1-/config/macros/mdl_have_opengl.m4       Mon Feb  3 16:53:35 2003
+@@ -73,10 +73,10 @@
+   AC_CACHE_CHECK([for OpenGL], mdl_cv_have_OpenGL,
+   [
+ dnl Check for Mesa first, unless we were asked not to.
+-    AC_HELP_STRING([--with-Mesa],
+-                   [Prefer the Mesa library over a vendors native OpenGL library (default=yes)],
+-                   with_Mesa_help_string)
+-    AC_ARG_ENABLE(Mesa, $with_Mesa_help_string, use_Mesa=$enableval, use_Mesa=yes)
++    AC_ARG_ENABLE(Mesa, 
++      AC_HELP_STRING([--with-Mesa],
++                   [Prefer the Mesa library over a vendors native OpenGL library (default=yes)])
++    [use_Mesa=$enableval], [use_Mesa=yes])
+ 
+     if test x"$use_Mesa" = xyes; then
+        GL_search_list="MesaGL   GL"
+diff -ur 3dwm-0.3.2/aclocal.m4 3dwm-0.3.2--/aclocal.m4
+--- 3dwm-0.3.2/aclocal.m4      Mon Feb  3 21:30:17 2003
++++ 3dwm-0.3.2--/aclocal.m4    Mon Feb  3 21:29:33 2003
+@@ -967,7 +967,7 @@
+                               fi
+                       fi
+                       msg=enabled
+-                      AC_DEFINE(DEBUG)
++                      AC_DEFINE(DEBUG, 1, [debugging])
+               else
+                       msg=disabled
+               fi
+@@ -1432,7 +1432,7 @@
+ CFLAGS=`echo "$CFLAGS" | sed -e 's/-O3//g'`
+ CFLAGS="$CFLAGS -O0 -pg"
+ LDFLAGS="$LDFLAGS -pg"
+-AC_DEFINE(profile)
++AC_DEFINE(profile, 1, [profiling])
+ msg="enabled"
+ ],[
+ msg="disabled"
+diff -ur 3dwm-0.3.2/config/macros/compiler.m4 3dwm-0.3.2--/config/macros/compiler.m4
+--- 3dwm-0.3.2/config/macros/compiler.m4       Mon May 28 14:47:24 2001
++++ 3dwm-0.3.2--/config/macros/compiler.m4     Mon Feb  3 21:28:54 2003
+@@ -99,7 +99,7 @@
+                               fi
+                       fi
+                       msg=enabled
+-                      AC_DEFINE(DEBUG)
++                      AC_DEFINE(DEBUG, 1, [debugging])
+               else
+                       msg=disabled
+               fi
+diff -ur 3dwm-0.3.2/config/macros/utils.m4 3dwm-0.3.2--/config/macros/utils.m4
+--- 3dwm-0.3.2/config/macros/utils.m4  Mon Feb  3 21:30:17 2003
++++ 3dwm-0.3.2--/config/macros/utils.m4        Mon Feb  3 21:29:14 2003
+@@ -381,7 +381,7 @@
+ CFLAGS=`echo "$CFLAGS" | sed -e 's/-O3//g'`
+ CFLAGS="$CFLAGS -O0 -pg"
+ LDFLAGS="$LDFLAGS -pg"
+-AC_DEFINE(profile)
++AC_DEFINE(profile, 1, [profiling])
+ msg="enabled"
+ ],[
+ msg="disabled"
+diff -ur 3dwm-0.3.2/configure.in 3dwm-0.3.2--/configure.in
+--- 3dwm-0.3.2/configure.in    Mon Feb  3 21:30:17 2003
++++ 3dwm-0.3.2--/configure.in  Mon Feb  3 21:28:04 2003
+@@ -37,9 +37,9 @@
+ AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
+ 
+ dnl Export defines
+-AC_DEFINE_UNQUOTED(MAJOR_VERSION)
+-AC_DEFINE_UNQUOTED(MINOR_VERSION)
+-AC_DEFINE_UNQUOTED(PATCH_LEVEL)
++AC_DEFINE_UNQUOTED(MAJOR_VERSION, $MAJOR_VERSION, [major version])
++AC_DEFINE_UNQUOTED(MINOR_VERSION, $MINOR_VERSION, [minor version])
++AC_DEFINE_UNQUOTED(PATCH_LEVEL, $PATCH_LEVEL, [patch level])
+ 
+ dnl AC_HEADLINE(dnl
+ dnl   3Dwm, The Three-Dimensional User Environment, dnl

diff --git a/3dwm-gcc32.patch b/3dwm-gcc32.patch
new file mode 100644 (file)
index 0000000..63f4aec
--- /dev/null
+++ b/3dwm-gcc32.patch
@@ -0,0 +1,65 @@
+diff -ur 3dwm-0.3.1/src/Celsius/SAX/ExpatParser.cc 3dwm-0.3.1-/src/Celsius/SAX/ExpatParser.cc
+--- 3dwm-0.3.1/src/Celsius/SAX/ExpatParser.cc  Tue Aug 21 10:51:42 2001
++++ 3dwm-0.3.1-/src/Celsius/SAX/ExpatParser.cc Mon Feb  3 18:17:12 2003
+@@ -62,13 +63,13 @@
+       _docHandler(0), _errorHandler(0)
+ {
+     // Associate the parser with a pointer to this instance
+-    XML_SetUserData(_parser, this);
++    XML_SetUserData((XML_ParserStruct*)_parser, this);
+ }
+ 
+ ExpatParser::~ExpatParser()
+ {
+     // Delete the parser
+-    XML_ParserFree(_parser);
++    XML_ParserFree((XML_ParserStruct*)_parser);
+ }
+ 
+ void ExpatParser::setEntityResolver(EntityResolver *resolver)
+@@ -88,13 +89,13 @@
+     
+     // If this is a valid handler, set event handler functions
+     if (_docHandler) {
+-      XML_SetElementHandler(_parser, startElementHandler, endElementHandler);
+-      XML_SetCharacterDataHandler(_parser, characterDataHandler);
++      XML_SetElementHandler((XML_ParserStruct*)_parser, startElementHandler, endElementHandler);
++      XML_SetCharacterDataHandler((XML_ParserStruct*)_parser, characterDataHandler);
+     }
+     // It is not, clear out handlers to stop handling events
+     else {
+-      XML_SetElementHandler(_parser, 0, 0);
+-      XML_SetCharacterDataHandler(_parser, 0);
++      XML_SetElementHandler((XML_ParserStruct*)_parser, 0, 0);
++      XML_SetCharacterDataHandler((XML_ParserStruct*)_parser, 0);
+     }
+ }
+       
+@@ -123,19 +124,19 @@
+       is.read(buffer, BUFFER_SIZE);
+       
+       // Parse it and report any errors
+-      if (!XML_Parse(_parser, buffer, is.gcount(), false))
+-          throw ParseException(XML_ErrorString(XML_GetErrorCode(_parser)),
++      if (!XML_Parse((XML_ParserStruct*)_parser, buffer, is.gcount(), false))
++          throw ParseException(XML_ErrorString(XML_GetErrorCode((XML_ParserStruct*)_parser)),
+                                publicId, systemId, 
+-                               XML_GetCurrentLineNumber(_parser),
+-                               XML_GetCurrentColumnNumber(_parser));
++                               XML_GetCurrentLineNumber((XML_ParserStruct*)_parser),
++                               XML_GetCurrentColumnNumber((XML_ParserStruct*)_parser));
+     }
+     
+     // We need to call expat with a final flag set to true
+-    if (!XML_Parse(_parser, 0, 0, true))
+-      throw ParseException(XML_ErrorString(XML_GetErrorCode(_parser)),
++    if (!XML_Parse((XML_ParserStruct*)_parser, 0, 0, true))
++      throw ParseException(XML_ErrorString(XML_GetErrorCode((XML_ParserStruct*)_parser)),
+                            publicId, systemId, 
+-                           XML_GetCurrentLineNumber(_parser),
+-                           XML_GetCurrentColumnNumber(_parser));
++                           XML_GetCurrentLineNumber((XML_ParserStruct*)_parser),
++                           XML_GetCurrentColumnNumber((XML_ParserStruct*)_parser));
+     
+     // Finally, if we have a document handler, send an end event to it
+     if (_docHandler) _docHandler->endDocument();

diff --git a/3dwm-omniORB4.patch b/3dwm-omniORB4.patch
new file mode 100644 (file)
index 0000000..9181e8b
--- /dev/null
+++ b/3dwm-omniORB4.patch
@@ -0,0 +1,24 @@
+diff -ur 3dwm-0.3.2/configure.in 3dwm-0.3.2-/configure.in
+--- 3dwm-0.3.2/configure.in    Wed Dec 11 11:07:41 2002
++++ 3dwm-0.3.2-/configure.in   Mon Feb  3 20:18:56 2003
+@@ -152,7 +152,7 @@
+ dnl ORB variables
+ ORBCXXFLAGS="-D__OMNIORB3__ -D__x86__ -D__linux__ -D__OSVERSION__=2"
+ ORBOPTFLAGS="-fno-default-inline -fomit-frame-pointer -fnonnull-objects"
+-ORBLIBS="-lomniORB3 -lomnithread -ltcpwrapGK -lomniDynamic3"
++ORBLIBS="-lomniORB4 -lomnithread -lomniDynamic4"
+ AC_SUBST(ORBCXXFLAGS)
+ AC_SUBST(ORBOPTFLAGS)
+ AC_SUBST(ORBLIBS)
+diff -ur 3dwm-0.3.2/include/Nobel/CORBA.hh 3dwm-0.3.2-/include/Nobel/CORBA.hh
+--- 3dwm-0.3.2/include/Nobel/CORBA.hh  Tue Jun 19 00:58:34 2001
++++ 3dwm-0.3.2-/include/Nobel/CORBA.hh Mon Feb  3 19:55:22 2003
+@@ -42,7 +42,7 @@
+ //using namespace std;
+ 
+ // -- omniORB Includes
+-#include <omniORB3/CORBA.h>
++#include <omniORB4/CORBA.h>
+ 
+ // -- Celsius Includes
+ #include "Celsius/Exception.hh"