| 1 |
jlec 12/06/30 17:15:51 |
| 2 |
|
| 3 |
Added: xbsql-0.11-ncurses64.patch xbsql-0.11-xbase64.patch |
| 4 |
xbsql-0.11-autotools.patch |
| 5 |
Log: |
| 6 |
dev-db/xbsql: Add fixes for newer xbase library, use autotools-utils and autoreconf, respect LDFLAGS, #334897 |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha114/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 dev-db/xbsql/files/xbsql-0.11-ncurses64.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/xbsql/files/xbsql-0.11-ncurses64.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/xbsql/files/xbsql-0.11-ncurses64.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: xbsql-0.11-ncurses64.patch |
| 17 |
=================================================================== |
| 18 |
--- xbsql-0.11/configure.BAD 2005-08-18 10:34:49.000000000 -0500 |
| 19 |
+++ xbsql-0.11/configure 2005-08-18 10:36:22.000000000 -0500 |
| 20 |
@@ -6977,10 +6977,15 @@ |
| 21 |
if test -f /usr/lib/libncurses.so |
| 22 |
then |
| 23 |
curses=ncurses |
| 24 |
- |
| 25 |
+ elif test -f /usr/lib64/libncurses.so |
| 26 |
+ then |
| 27 |
+ curses=ncurses |
| 28 |
elif test -f /usr/lib/libcurses.so |
| 29 |
then |
| 30 |
curses=curses |
| 31 |
+ elif test -f /usr/lib64/libcurses.so |
| 32 |
+ then |
| 33 |
+ curses=curses |
| 34 |
else |
| 35 |
{ { echo "$as_me:6985: error: No (n)curses installation" >&5 |
| 36 |
echo "$as_me: error: No (n)curses installation" >&2;} |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.1 dev-db/xbsql/files/xbsql-0.11-xbase64.patch |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/xbsql/files/xbsql-0.11-xbase64.patch?rev=1.1&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/xbsql/files/xbsql-0.11-xbase64.patch?rev=1.1&content-type=text/plain |
| 44 |
|
| 45 |
Index: xbsql-0.11-xbase64.patch |
| 46 |
=================================================================== |
| 47 |
diff -up xbsql-0.11/xbsql/Makefile.am.BAD xbsql-0.11/xbsql/Makefile.am |
| 48 |
--- xbsql-0.11/xbsql/Makefile.am.BAD 2009-08-19 23:32:27.481185284 -0400 |
| 49 |
+++ xbsql-0.11/xbsql/Makefile.am 2009-08-19 23:32:47.157206308 -0400 |
| 50 |
@@ -17,10 +17,10 @@ libxbsql_la_SOURCES = xb_value.cpp xb_el |
| 51 |
xb_assignlist.cpp xb_create.cpp \ |
| 52 |
xbsql.tab.c xb_datetime.cpp |
| 53 |
|
| 54 |
-libxbsql_la_LDFLAGS = -lxbase $(DEBUG) |
| 55 |
+libxbsql_la_LIBADD = -lxbase64 |
| 56 |
|
| 57 |
xql_SOURCES = xql.cpp |
| 58 |
-xql_LDADD = -lxbase -lreadline -l$(CURSES) ./libxbsql.la |
| 59 |
+xql_LDADD = -lxbase64 -lreadline -l$(CURSES) ./libxbsql.la |
| 60 |
|
| 61 |
# |
| 62 |
# |
| 63 |
diff -up xbsql-0.11/xbsql/Makefile.in.BAD xbsql-0.11/xbsql/Makefile.in |
| 64 |
--- xbsql-0.11/xbsql/Makefile.in.BAD 2009-08-19 23:32:54.384058775 -0400 |
| 65 |
+++ xbsql-0.11/xbsql/Makefile.in 2009-08-19 23:33:03.928059382 -0400 |
| 66 |
@@ -108,10 +108,10 @@ libxbsql_la_SOURCES = xb_value.cpp xb_el |
| 67 |
xbsql.tab.c xb_datetime.cpp |
| 68 |
|
| 69 |
|
| 70 |
-libxbsql_la_LDFLAGS = -lxbase $(DEBUG) |
| 71 |
+libxbsql_la_LIBADD = -lxbase64 |
| 72 |
|
| 73 |
xql_SOURCES = xql.cpp |
| 74 |
-xql_LDADD = -lxbase -lreadline -l$(CURSES) ./libxbsql.la |
| 75 |
+xql_LDADD = -lxbase64 -lreadline -l$(CURSES) ./libxbsql.la |
| 76 |
|
| 77 |
|
| 78 |
#install-data-hook: |
| 79 |
diff -up xbsql-0.11/xbsql/xbsql.cpp.BAD xbsql-0.11/xbsql/xbsql.cpp |
| 80 |
--- xbsql-0.11/xbsql/xbsql.cpp.BAD 2009-08-19 23:34:23.880063863 -0400 |
| 81 |
+++ xbsql-0.11/xbsql/xbsql.cpp 2009-08-19 23:34:47.393184432 -0400 |
| 82 |
@@ -207,7 +207,7 @@ void XBaseSQL::setError |
| 83 |
break ; |
| 84 |
|
| 85 |
default : |
| 86 |
- e = xbStrError (rc) ; |
| 87 |
+ e = GetErrorMessage (rc) ; |
| 88 |
break ; |
| 89 |
} |
| 90 |
|
| 91 |
@@ -230,7 +230,7 @@ void XBaseSQL::setError |
| 92 |
char t[1024] ; |
| 93 |
va_list aptr ; |
| 94 |
|
| 95 |
- strcpy (t, xbStrError (rc)) ; |
| 96 |
+ strcpy (t, GetErrorMessage (rc)) ; |
| 97 |
strcat (t, ": ") ; |
| 98 |
int l = strlen(t) ; |
| 99 |
|
| 100 |
diff -up xbsql-0.11/xbsql/xbsql.h.BAD xbsql-0.11/xbsql/xbsql.h |
| 101 |
--- xbsql-0.11/xbsql/xbsql.h.BAD 2009-08-19 23:35:45.087088919 -0400 |
| 102 |
+++ xbsql-0.11/xbsql/xbsql.h 2009-08-19 23:34:06.949184421 -0400 |
| 103 |
@@ -43,8 +43,7 @@ XBSQL_API int strncasecmp (const char *s |
| 104 |
|
| 105 |
#endif |
| 106 |
|
| 107 |
-#include <xbase/xbase.h> |
| 108 |
-#include <xbase/xbexcept.h> |
| 109 |
+#include <xbase64/xbase64.h> |
| 110 |
|
| 111 |
class XBaseSQL ; |
| 112 |
class XBSQLTable ; |
| 113 |
|
| 114 |
|
| 115 |
|
| 116 |
1.1 dev-db/xbsql/files/xbsql-0.11-autotools.patch |
| 117 |
|
| 118 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/xbsql/files/xbsql-0.11-autotools.patch?rev=1.1&view=markup |
| 119 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/xbsql/files/xbsql-0.11-autotools.patch?rev=1.1&content-type=text/plain |
| 120 |
|
| 121 |
Index: xbsql-0.11-autotools.patch |
| 122 |
=================================================================== |
| 123 |
xbsql/Makefile.am | 7 +------ |
| 124 |
1 files changed, 1 insertions(+), 6 deletions(-) |
| 125 |
|
| 126 |
diff --git a/xbsql/Makefile.am b/xbsql/Makefile.am |
| 127 |
index c281358..5a09198 100644 |
| 128 |
--- a/xbsql/Makefile.am |
| 129 |
+++ b/xbsql/Makefile.am |
| 130 |
@@ -1,9 +1,4 @@ |
| 131 |
-DEBUG = -g |
| 132 |
-CC = g++ |
| 133 |
-CFLAGS = -UNO_READLINE -I/usr/local/include $(DEBUG) |
| 134 |
-CXXFLAGS = -UNO_READLINE -I/usr/local/include $(DEBUG) |
| 135 |
-LDFLAGS = $(DEBUG) |
| 136 |
-INCLUDE = -I/usr/local/include |
| 137 |
+CC = $(CXX) |
| 138 |
|
| 139 |
lib_LTLIBRARIES = libxbsql.la |
| 140 |
bin_PROGRAMS = xql |
Archives