OpenPKG Specs / file comparison

comparison: xbase/xbase.patch

xbase/xbase.patch

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

Mercurial Repository: OpenPKG Specs

Europalab SCM Repository Server

mercurial