xbase/xbase.patch@f4a0b439d0fb
xbase/xbase.patch
Fri, 15 Oct 2010 19:06:09 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Fri, 15 Oct 2010 19:06:09 +0200
- changeset 263
- f4a0b439d0fb
- parent 97
- da688f850c6d
- permissions
- -rw-r--r--
Correct shared library and plugin link logic, as well as informal text.
Update file server URL, update build resource estimations, correct RPATH
logic, allow for qmake(1) static to shared library changes via CONFIG
argument, correct documentation broken title and index links, correct
shared library install path, install only one set of (correct) plugins,
install the designer shared library (as required by QtCreator), announce
features related to shared linking using qmake(1), and correclty
substitute hard coded paths in prl and la library files.
1 Index: tv/tvbrowse.cpp
2 --- tv/tvbrowse.cpp.orig 2000-09-20 22:34:02 +0200
3 +++ tv/tvbrowse.cpp 2006-01-15 00:23:04 +0100
4 @@ -28,8 +28,8 @@
5 #include <stdlib.h>
6 #include <stdio.h>
7 #include <string.h>
8 -#include <iomanip.h>
9 -#include <strstream.h>
10 +#include <sstream>
11 +#include <iomanip>
13 #define Uses_TEvent
14 #include <tvision/tv.h>
15 Index: tv/tvxbase.cpp
16 --- tv/tvxbase.cpp.orig 2000-09-20 22:34:02 +0200
17 +++ tv/tvxbase.cpp 2006-01-15 00:23:04 +0100
18 @@ -23,7 +23,7 @@
19 Foundation, Inc., or see http://www.gnu.org/.
20 */
22 -#include <iostream.h>
23 +#include <iostream>
25 #define Uses_TApplication
26 #define Uses_TButton
27 Index: xbase/dbf.h
28 --- xbase/dbf.h.orig 2001-01-13 21:20:53 +0100
29 +++ xbase/dbf.h 2006-01-15 00:23:04 +0100
30 @@ -65,7 +65,7 @@
31 #include <xbase/xtypes.h>
32 #include <xbase/xdate.h>
34 -#include <iostream.h>
35 +#include <iostream>
36 #include <stdio.h>
38 /*! \file dbf.h
39 Index: xbase/ndx.cpp
40 --- xbase/ndx.cpp.orig 2001-03-21 01:28:53 +0100
41 +++ xbase/ndx.cpp 2006-01-15 00:23:04 +0100
42 @@ -66,7 +66,8 @@
43 #endif
45 #include <xbase/xbase.h>
46 -#include <iostream.h>
47 +#include <iostream>
48 +using std::cout;
50 #ifdef XB_INDEX_NDX
52 Index: xbase/stack.cpp
53 --- xbase/stack.cpp.orig 2000-11-10 20:04:17 +0100
54 +++ xbase/stack.cpp 2006-01-15 00:23:04 +0100
55 @@ -59,7 +59,8 @@
57 #include <string.h>
58 #include <stdlib.h>
59 -#include <iostream.h>
60 +#include <iostream>
61 +using std::cout;
63 #include <xbase/xstack.h>
65 Index: xbase/xbstring.cpp
66 --- xbase/xbstring.cpp.orig 2001-02-20 18:53:26 +0100
67 +++ xbase/xbstring.cpp 2006-01-15 00:23:04 +0100
68 @@ -582,7 +582,7 @@
69 //! Short description.
70 /*!
71 */
72 -XBDLLEXPORT ostream& operator << ( ostream& os, const xbString& xbs ) {
73 +XBDLLEXPORT std::ostream& operator << ( std::ostream& os, const xbString& xbs ) {
74 return os << xbs.data;
75 }
77 Index: xbase/xbstring.h
78 --- xbase/xbstring.h.orig 2001-01-27 06:00:32 +0100
79 +++ xbase/xbstring.h 2006-01-15 00:23:04 +0100
80 @@ -56,7 +56,11 @@
81 #endif
83 #include <stdlib.h>
84 -#include <iostream.h>
85 +#include <iostream>
86 +
87 +using std::endl;
88 +using std::cin;
89 +using std::cout;
91 /*! \file xbstring.h
92 */
93 @@ -119,7 +123,7 @@
94 bool operator <= ( const xbString& ) const;
95 bool operator >= ( const xbString& ) const;
97 - friend ostream& operator << ( ostream&, const xbString& );
98 + friend std::ostream& operator << ( std::ostream&, const xbString& );
100 xbString &remove(size_t pos = 0, int n = npos);
101 xbString mid(size_t pos = 0, int n = npos) const;
102 Index: ltmain.sh
103 --- ltmain.sh.orig 2000-06-01 08:03:18 +0200
104 +++ ltmain.sh 2006-01-15 10:05:44 +0100
105 @@ -728,7 +728,7 @@
106 ;;
107 esac
108 deplibs="$deplibs $arg"
109 - lib_search_path="$lib_search_path `expr $arg : '-L\(.*\)'`"
110 + lib_search_path="$lib_search_path `expr x$arg : 'x-L\(.*\)'`"
111 ;;
113 -l*) deplibs="$deplibs $arg" ;;
