1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/xbase/xbase.patch Fri Jan 16 20:54:43 2009 +0100
1.3 @@ -0,0 +1,129 @@
1.4 +Index: xbase-2.0.0/tv/tvbrowse.cpp
1.5 +--- xbase-2.0.0/tv/tvbrowse.cpp.orig 2000-09-20 22:34:02 +0200
1.6 ++++ xbase-2.0.0/tv/tvbrowse.cpp 2006-01-15 00:23:04 +0100
1.7 +@@ -28,8 +28,8 @@
1.8 + #include <stdlib.h>
1.9 + #include <stdio.h>
1.10 + #include <string.h>
1.11 +-#include <iomanip.h>
1.12 +-#include <strstream.h>
1.13 ++#include <sstream>
1.14 ++#include <iomanip>
1.15 +
1.16 + #define Uses_TEvent
1.17 + #include <tvision/tv.h>
1.18 +Index: xbase-2.0.0/tv/tvxbase.cpp
1.19 +--- xbase-2.0.0/tv/tvxbase.cpp.orig 2000-09-20 22:34:02 +0200
1.20 ++++ xbase-2.0.0/tv/tvxbase.cpp 2006-01-15 00:23:04 +0100
1.21 +@@ -23,7 +23,7 @@
1.22 + Foundation, Inc., or see http://www.gnu.org/.
1.23 + */
1.24 +
1.25 +-#include <iostream.h>
1.26 ++#include <iostream>
1.27 +
1.28 + #define Uses_TApplication
1.29 + #define Uses_TButton
1.30 +Index: xbase-2.0.0/xbase/dbf.h
1.31 +--- xbase-2.0.0/xbase/dbf.h.orig 2001-01-13 21:20:53 +0100
1.32 ++++ xbase-2.0.0/xbase/dbf.h 2006-01-15 00:23:04 +0100
1.33 +@@ -65,7 +65,7 @@
1.34 + #include <xbase/xtypes.h>
1.35 + #include <xbase/xdate.h>
1.36 +
1.37 +-#include <iostream.h>
1.38 ++#include <iostream>
1.39 + #include <stdio.h>
1.40 +
1.41 + /*! \file dbf.h
1.42 +Index: xbase-2.0.0/xbase/ndx.cpp
1.43 +--- xbase-2.0.0/xbase/ndx.cpp.orig 2001-03-21 01:28:53 +0100
1.44 ++++ xbase-2.0.0/xbase/ndx.cpp 2006-01-15 00:23:04 +0100
1.45 +@@ -66,7 +66,8 @@
1.46 + #endif
1.47 +
1.48 + #include <xbase/xbase.h>
1.49 +-#include <iostream.h>
1.50 ++#include <iostream>
1.51 ++using std::cout;
1.52 +
1.53 + #ifdef XB_INDEX_NDX
1.54 +
1.55 +Index: xbase-2.0.0/xbase/stack.cpp
1.56 +--- xbase-2.0.0/xbase/stack.cpp.orig 2000-11-10 20:04:17 +0100
1.57 ++++ xbase-2.0.0/xbase/stack.cpp 2006-01-15 00:23:04 +0100
1.58 +@@ -59,7 +59,8 @@
1.59 +
1.60 + #include <string.h>
1.61 + #include <stdlib.h>
1.62 +-#include <iostream.h>
1.63 ++#include <iostream>
1.64 ++using std::cout;
1.65 +
1.66 + #include <xbase/xstack.h>
1.67 +
1.68 +Index: xbase-2.0.0/xbase/xbstring.cpp
1.69 +--- xbase-2.0.0/xbase/xbstring.cpp.orig 2001-02-20 18:53:26 +0100
1.70 ++++ xbase-2.0.0/xbase/xbstring.cpp 2006-01-15 00:23:04 +0100
1.71 +@@ -582,7 +582,7 @@
1.72 + //! Short description.
1.73 + /*!
1.74 + */
1.75 +-XBDLLEXPORT ostream& operator << ( ostream& os, const xbString& xbs ) {
1.76 ++XBDLLEXPORT std::ostream& operator << ( std::ostream& os, const xbString& xbs ) {
1.77 + return os << xbs.data;
1.78 + }
1.79 +
1.80 +Index: xbase-2.0.0/xbase/xbstring.h
1.81 +--- xbase-2.0.0/xbase/xbstring.h.orig 2001-01-27 06:00:32 +0100
1.82 ++++ xbase-2.0.0/xbase/xbstring.h 2006-01-15 00:23:04 +0100
1.83 +@@ -56,7 +56,11 @@
1.84 + #endif
1.85 +
1.86 + #include <stdlib.h>
1.87 +-#include <iostream.h>
1.88 ++#include <iostream>
1.89 ++
1.90 ++using std::endl;
1.91 ++using std::cin;
1.92 ++using std::cout;
1.93 +
1.94 + /*! \file xbstring.h
1.95 + */
1.96 +@@ -119,7 +123,7 @@
1.97 + bool operator <= ( const xbString& ) const;
1.98 + bool operator >= ( const xbString& ) const;
1.99 +
1.100 +- friend ostream& operator << ( ostream&, const xbString& );
1.101 ++ friend std::ostream& operator << ( std::ostream&, const xbString& );
1.102 +
1.103 + xbString &remove(size_t pos = 0, int n = npos);
1.104 + xbString mid(size_t pos = 0, int n = npos) const;
1.105 +Index: xbsql-0.11/xbsql/Makefile.in
1.106 +--- xbsql-0.11/xbsql/Makefile.in.orig 2003-03-28 21:03:25 +0100
1.107 ++++ xbsql-0.11/xbsql/Makefile.in 2006-01-15 10:01:51 +0100
1.108 +@@ -108,10 +108,10 @@
1.109 + xbsql.tab.c xb_datetime.cpp
1.110 +
1.111 +
1.112 +-libxbsql_la_LDFLAGS = -lxbase $(DEBUG)
1.113 ++libxbsql_la_LDFLAGS = @LDFLAGS@ -lxbase $(DEBUG)
1.114 +
1.115 + xql_SOURCES = xql.cpp
1.116 +-xql_LDADD = -lxbase -lreadline -l$(CURSES) ./libxbsql.la
1.117 ++xql_LDADD = @LDFLAGS@ -lxbase -lreadline -l$(CURSES) ./libxbsql.la
1.118 +
1.119 +
1.120 + #install-data-hook:
1.121 +Index: xbase-2.0.0/ltmain.sh
1.122 +--- xbase-2.0.0/ltmain.sh.orig 2000-06-01 08:03:18 +0200
1.123 ++++ xbase-2.0.0/ltmain.sh 2006-01-15 10:05:44 +0100
1.124 +@@ -728,7 +728,7 @@
1.125 + ;;
1.126 + esac
1.127 + deplibs="$deplibs $arg"
1.128 +- lib_search_path="$lib_search_path `expr $arg : '-L\(.*\)'`"
1.129 ++ lib_search_path="$lib_search_path `expr x$arg : 'x-L\(.*\)'`"
1.130 + ;;
1.131 +
1.132 + -l*) deplibs="$deplibs $arg" ;;
