xbase/xbase.patch@da688f850c6d (annotated)
xbase/xbase.patch
Fri, 16 Jan 2009 20:54:43 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Fri, 16 Jan 2009 20:54:43 +0100
- changeset 97
- da688f850c6d
- child 98
- b48a2cd3a7b1
- permissions
- -rw-r--r--
Import package vendor original specs for necessary manipulations.
| michael@97 | 1 | Index: xbase-2.0.0/tv/tvbrowse.cpp |
| michael@97 | 2 | --- xbase-2.0.0/tv/tvbrowse.cpp.orig 2000-09-20 22:34:02 +0200 |
| michael@97 | 3 | +++ xbase-2.0.0/tv/tvbrowse.cpp 2006-01-15 00:23:04 +0100 |
| michael@97 | 4 | @@ -28,8 +28,8 @@ |
| michael@97 | 5 | #include <stdlib.h> |
| michael@97 | 6 | #include <stdio.h> |
| michael@97 | 7 | #include <string.h> |
| michael@97 | 8 | -#include <iomanip.h> |
| michael@97 | 9 | -#include <strstream.h> |
| michael@97 | 10 | +#include <sstream> |
| michael@97 | 11 | +#include <iomanip> |
| michael@97 | 12 | |
| michael@97 | 13 | #define Uses_TEvent |
| michael@97 | 14 | #include <tvision/tv.h> |
| michael@97 | 15 | Index: xbase-2.0.0/tv/tvxbase.cpp |
| michael@97 | 16 | --- xbase-2.0.0/tv/tvxbase.cpp.orig 2000-09-20 22:34:02 +0200 |
| michael@97 | 17 | +++ xbase-2.0.0/tv/tvxbase.cpp 2006-01-15 00:23:04 +0100 |
| michael@97 | 18 | @@ -23,7 +23,7 @@ |
| michael@97 | 19 | Foundation, Inc., or see http://www.gnu.org/. |
| michael@97 | 20 | */ |
| michael@97 | 21 | |
| michael@97 | 22 | -#include <iostream.h> |
| michael@97 | 23 | +#include <iostream> |
| michael@97 | 24 | |
| michael@97 | 25 | #define Uses_TApplication |
| michael@97 | 26 | #define Uses_TButton |
| michael@97 | 27 | Index: xbase-2.0.0/xbase/dbf.h |
| michael@97 | 28 | --- xbase-2.0.0/xbase/dbf.h.orig 2001-01-13 21:20:53 +0100 |
| michael@97 | 29 | +++ xbase-2.0.0/xbase/dbf.h 2006-01-15 00:23:04 +0100 |
| michael@97 | 30 | @@ -65,7 +65,7 @@ |
| michael@97 | 31 | #include <xbase/xtypes.h> |
| michael@97 | 32 | #include <xbase/xdate.h> |
| michael@97 | 33 | |
| michael@97 | 34 | -#include <iostream.h> |
| michael@97 | 35 | +#include <iostream> |
| michael@97 | 36 | #include <stdio.h> |
| michael@97 | 37 | |
| michael@97 | 38 | /*! \file dbf.h |
| michael@97 | 39 | Index: xbase-2.0.0/xbase/ndx.cpp |
| michael@97 | 40 | --- xbase-2.0.0/xbase/ndx.cpp.orig 2001-03-21 01:28:53 +0100 |
| michael@97 | 41 | +++ xbase-2.0.0/xbase/ndx.cpp 2006-01-15 00:23:04 +0100 |
| michael@97 | 42 | @@ -66,7 +66,8 @@ |
| michael@97 | 43 | #endif |
| michael@97 | 44 | |
| michael@97 | 45 | #include <xbase/xbase.h> |
| michael@97 | 46 | -#include <iostream.h> |
| michael@97 | 47 | +#include <iostream> |
| michael@97 | 48 | +using std::cout; |
| michael@97 | 49 | |
| michael@97 | 50 | #ifdef XB_INDEX_NDX |
| michael@97 | 51 | |
| michael@97 | 52 | Index: xbase-2.0.0/xbase/stack.cpp |
| michael@97 | 53 | --- xbase-2.0.0/xbase/stack.cpp.orig 2000-11-10 20:04:17 +0100 |
| michael@97 | 54 | +++ xbase-2.0.0/xbase/stack.cpp 2006-01-15 00:23:04 +0100 |
| michael@97 | 55 | @@ -59,7 +59,8 @@ |
| michael@97 | 56 | |
| michael@97 | 57 | #include <string.h> |
| michael@97 | 58 | #include <stdlib.h> |
| michael@97 | 59 | -#include <iostream.h> |
| michael@97 | 60 | +#include <iostream> |
| michael@97 | 61 | +using std::cout; |
| michael@97 | 62 | |
| michael@97 | 63 | #include <xbase/xstack.h> |
| michael@97 | 64 | |
| michael@97 | 65 | Index: xbase-2.0.0/xbase/xbstring.cpp |
| michael@97 | 66 | --- xbase-2.0.0/xbase/xbstring.cpp.orig 2001-02-20 18:53:26 +0100 |
| michael@97 | 67 | +++ xbase-2.0.0/xbase/xbstring.cpp 2006-01-15 00:23:04 +0100 |
| michael@97 | 68 | @@ -582,7 +582,7 @@ |
| michael@97 | 69 | //! Short description. |
| michael@97 | 70 | /*! |
| michael@97 | 71 | */ |
| michael@97 | 72 | -XBDLLEXPORT ostream& operator << ( ostream& os, const xbString& xbs ) { |
| michael@97 | 73 | +XBDLLEXPORT std::ostream& operator << ( std::ostream& os, const xbString& xbs ) { |
| michael@97 | 74 | return os << xbs.data; |
| michael@97 | 75 | } |
| michael@97 | 76 | |
| michael@97 | 77 | Index: xbase-2.0.0/xbase/xbstring.h |
| michael@97 | 78 | --- xbase-2.0.0/xbase/xbstring.h.orig 2001-01-27 06:00:32 +0100 |
| michael@97 | 79 | +++ xbase-2.0.0/xbase/xbstring.h 2006-01-15 00:23:04 +0100 |
| michael@97 | 80 | @@ -56,7 +56,11 @@ |
| michael@97 | 81 | #endif |
| michael@97 | 82 | |
| michael@97 | 83 | #include <stdlib.h> |
| michael@97 | 84 | -#include <iostream.h> |
| michael@97 | 85 | +#include <iostream> |
| michael@97 | 86 | + |
| michael@97 | 87 | +using std::endl; |
| michael@97 | 88 | +using std::cin; |
| michael@97 | 89 | +using std::cout; |
| michael@97 | 90 | |
| michael@97 | 91 | /*! \file xbstring.h |
| michael@97 | 92 | */ |
| michael@97 | 93 | @@ -119,7 +123,7 @@ |
| michael@97 | 94 | bool operator <= ( const xbString& ) const; |
| michael@97 | 95 | bool operator >= ( const xbString& ) const; |
| michael@97 | 96 | |
| michael@97 | 97 | - friend ostream& operator << ( ostream&, const xbString& ); |
| michael@97 | 98 | + friend std::ostream& operator << ( std::ostream&, const xbString& ); |
| michael@97 | 99 | |
| michael@97 | 100 | xbString &remove(size_t pos = 0, int n = npos); |
| michael@97 | 101 | xbString mid(size_t pos = 0, int n = npos) const; |
| michael@97 | 102 | Index: xbsql-0.11/xbsql/Makefile.in |
| michael@97 | 103 | --- xbsql-0.11/xbsql/Makefile.in.orig 2003-03-28 21:03:25 +0100 |
| michael@97 | 104 | +++ xbsql-0.11/xbsql/Makefile.in 2006-01-15 10:01:51 +0100 |
| michael@97 | 105 | @@ -108,10 +108,10 @@ |
| michael@97 | 106 | xbsql.tab.c xb_datetime.cpp |
| michael@97 | 107 | |
| michael@97 | 108 | |
| michael@97 | 109 | -libxbsql_la_LDFLAGS = -lxbase $(DEBUG) |
| michael@97 | 110 | +libxbsql_la_LDFLAGS = @LDFLAGS@ -lxbase $(DEBUG) |
| michael@97 | 111 | |
| michael@97 | 112 | xql_SOURCES = xql.cpp |
| michael@97 | 113 | -xql_LDADD = -lxbase -lreadline -l$(CURSES) ./libxbsql.la |
| michael@97 | 114 | +xql_LDADD = @LDFLAGS@ -lxbase -lreadline -l$(CURSES) ./libxbsql.la |
| michael@97 | 115 | |
| michael@97 | 116 | |
| michael@97 | 117 | #install-data-hook: |
| michael@97 | 118 | Index: xbase-2.0.0/ltmain.sh |
| michael@97 | 119 | --- xbase-2.0.0/ltmain.sh.orig 2000-06-01 08:03:18 +0200 |
| michael@97 | 120 | +++ xbase-2.0.0/ltmain.sh 2006-01-15 10:05:44 +0100 |
| michael@97 | 121 | @@ -728,7 +728,7 @@ |
| michael@97 | 122 | ;; |
| michael@97 | 123 | esac |
| michael@97 | 124 | deplibs="$deplibs $arg" |
| michael@97 | 125 | - lib_search_path="$lib_search_path `expr $arg : '-L\(.*\)'`" |
| michael@97 | 126 | + lib_search_path="$lib_search_path `expr x$arg : 'x-L\(.*\)'`" |
| michael@97 | 127 | ;; |
| michael@97 | 128 | |
| michael@97 | 129 | -l*) deplibs="$deplibs $arg" ;; |
