xbase/xbase.patch@4ecfc2416fd8 (annotated)
xbase/xbase.patch
Tue, 29 Mar 2011 19:46:35 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Tue, 29 Mar 2011 19:46:35 +0200
- changeset 333
- 4ecfc2416fd8
- parent 97
- da688f850c6d
- permissions
- -rw-r--r--
Correct and introduce slightly needed logic, leading to better reliability:
Update bash(1) patch logic, correct several buildconf make location
errors, correct failed bash(1) configure invocation, enable perl(1) to
build with unpathed make(1), patch rpm(1) to correctly link with
internal libdb(3), and lastly unsuscessfully try to reorganize rpm patch
hunks.
| michael@98 | 1 | Index: tv/tvbrowse.cpp |
| michael@98 | 2 | --- tv/tvbrowse.cpp.orig 2000-09-20 22:34:02 +0200 |
| michael@98 | 3 | +++ 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@98 | 15 | Index: tv/tvxbase.cpp |
| michael@98 | 16 | --- tv/tvxbase.cpp.orig 2000-09-20 22:34:02 +0200 |
| michael@98 | 17 | +++ 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@98 | 27 | Index: xbase/dbf.h |
| michael@98 | 28 | --- xbase/dbf.h.orig 2001-01-13 21:20:53 +0100 |
| michael@98 | 29 | +++ 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@98 | 39 | Index: xbase/ndx.cpp |
| michael@98 | 40 | --- xbase/ndx.cpp.orig 2001-03-21 01:28:53 +0100 |
| michael@98 | 41 | +++ 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@98 | 52 | Index: xbase/stack.cpp |
| michael@98 | 53 | --- xbase/stack.cpp.orig 2000-11-10 20:04:17 +0100 |
| michael@98 | 54 | +++ 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@98 | 65 | Index: xbase/xbstring.cpp |
| michael@98 | 66 | --- xbase/xbstring.cpp.orig 2001-02-20 18:53:26 +0100 |
| michael@98 | 67 | +++ 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@98 | 77 | Index: xbase/xbstring.h |
| michael@98 | 78 | --- xbase/xbstring.h.orig 2001-01-27 06:00:32 +0100 |
| michael@98 | 79 | +++ 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@98 | 102 | Index: ltmain.sh |
| michael@98 | 103 | --- ltmain.sh.orig 2000-06-01 08:03:18 +0200 |
| michael@98 | 104 | +++ ltmain.sh 2006-01-15 10:05:44 +0100 |
| michael@97 | 105 | @@ -728,7 +728,7 @@ |
| michael@97 | 106 | ;; |
| michael@97 | 107 | esac |
| michael@97 | 108 | deplibs="$deplibs $arg" |
| michael@97 | 109 | - lib_search_path="$lib_search_path `expr $arg : '-L\(.*\)'`" |
| michael@97 | 110 | + lib_search_path="$lib_search_path `expr x$arg : 'x-L\(.*\)'`" |
| michael@97 | 111 | ;; |
| michael@97 | 112 | |
| michael@97 | 113 | -l*) deplibs="$deplibs $arg" ;; |
