odbcjdbc - libiodbc related fixes

3 files changed, 41 insertions, 47 deletions

diff --git a/odbc-drivers/odbcjdbc/DETAILS b/odbc-drivers/odbcjdbc/DETAILS
index 9993dcd799..eeeb4c3fe4 100755
--- a/odbc-drivers/odbcjdbc/DETAILS
+++ b/odbc-drivers/odbcjdbc/DETAILS
@@ -2,15 +2,15 @@
 local SPELLX SFCVS
           SPELLX=OdbcJdbc
         WEB_SITE=http://www.ibphoenix.com
-         VERSION=beta-2.0.0137
-     SOURCE_HASH=sha512:7caf83c1bf201184e30076a2d3291139f5b1e92dbbb2aadfcfd9cb0bec17e54912d17cd747c0de9560e34c3563da63d61a5a7d059cfd5248bccae24e5f95e09d
+         VERSION=beta-2.0.0138
+     SOURCE_HASH=sha512:f9404befc8a8cbfd1530ce5e7592db3632c812950cf23a960bf90d3b88bb6a1896a9303a89108d548d84930c0872461d94c0e7cffc47ed35439488b50b092b21
           SOURCE=${SPELLX}-$VERSION-src.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/ODBC\_V2-0-BETA
    SOURCE_URL[0]=http://www.praktik.km.ua/downloads/$SOURCE
          LICENSE=IDPL
          ENTERED=20031205
             DOCS="ChangeLog  Install/HtmlHelp/*"
-        KEYWORDS="firebird database"
+        KEYWORDS="firebird database odbc"
            SHORT="OBDC/JDBC driver for Firebird database"
 cat << EOF
 OBDC/JDBC driver for Firebird database
diff --git a/odbc-drivers/odbcjdbc/HISTORY b/odbc-drivers/odbcjdbc/HISTORY
index 7b29679e8d..2c21290d30 100644
--- a/odbc-drivers/odbcjdbc/HISTORY
+++ b/odbc-drivers/odbcjdbc/HISTORY
@@ -1,3 +1,7 @@
+2006-06-28 Treeve Jelbert <treeve01@pi.be>
+	* DETAILS: version 2.0.0138
+	* fix.diff: updated patch, some changes now in tarball
+
 2006-06-27 Treeve Jelbert <treeve01@pi.be>
 	* DETAILS: version 2.0.0137
 	* PRE_BUILD: apply patches, removed sedit
diff --git a/odbc-drivers/odbcjdbc/fix.diff b/odbc-drivers/odbcjdbc/fix.diff
index 946910cc13..a86b6b0646 100644
--- a/odbc-drivers/odbcjdbc/fix.diff
+++ b/odbc-drivers/odbcjdbc/fix.diff
@@ -1,74 +1,64 @@
 diff -uNr ODBC_V2-0-BETA/OdbcJdbc/Builds/Gcc.lin/makefile.linux ODBC_V2-0-BETA.cp/OdbcJdbc/Builds/Gcc.lin/makefile.linux
 --- ODBC_V2-0-BETA/OdbcJdbc/Builds/Gcc.lin/makefile.linux	2004-12-21 19:39:24.000000000 +0100
-+++ ODBC_V2-0-BETA.cp/OdbcJdbc/Builds/Gcc.lin/makefile.linux	2006-06-26 15:39:04.000000000 +0200
-@@ -52,11 +52,11 @@
- endif

- 

- ifdef INTERBASE

--INCLUDEDIR      := -I/opt/interbase/include -I/usr/include/odbc $(INCLUDEDIR)

--EXTLIBDIR       := -L/opt/interbase/lib -L/usr/lib/unixODBC $(EXTLIBDIR)

-+INCLUDEDIR      := -I/usr/interbase/include -I/usr/include $(INCLUDEDIR)

-+EXTLIBDIR       := -L/usr/interbase/lib -L/usr/lib/unixODBC $(EXTLIBDIR)

++++ ODBC_V2-0-BETA.cp/OdbcJdbc/Builds/Gcc.lin/makefile.linux	2006-06-28 15:30:45.000000000 +0200
+@@ -55,8 +55,8 @@
+ INCLUDEDIR      := -I/opt/interbase/include -I/usr/include/odbc $(INCLUDEDIR)

+ EXTLIBDIR       := -L/opt/interbase/lib -L/usr/lib/unixODBC $(EXTLIBDIR)

  else

 -INCLUDEDIR      = -I/opt/firebird/include -I/usr/include/odbc

 -EXTLIBDIR       := -L/opt/firebird/lib -L/usr/lib/unixODBC $(EXTLIBDIR)

-+INCLUDEDIR      = -I/usr/firebird/include -I/usr/include

++INCLUDEDIR      = -I/usr/firebird/include -I/usr/include/odbc

 +EXTLIBDIR       := -L/usr/firebird/lib -L/usr/lib/unixODBC $(EXTLIBDIR)

  endif

  #

  

-@@ -75,10 +75,10 @@
+@@ -75,7 +75,7 @@
  LIST_ODBCJDBCSETUPSRC	= $(addprefix $(ODBCJDBCDIR)/, $(ODBCJDBCSETUPSRC_LINUX))

  LIST_ODBCJDBCSETUPOBJ	= $(addprefix $(BUILDDIR)/, $(ODBCJDBCSETUPSRC_LINUX:.cpp=.o))

  #

 -COMPFLAGS	= -g -w -D_REENTRANT -D_PTHREADS -DEXTERNAL $(INCLUDEDIR) -I$(FBINCDIR)

-+COMPFLAGS	= -DPIC -fPIC  $(CFLAGS) -w -D_REENTRANT -D_PTHREADS -DEXTERNAL $(INCLUDEDIR) -I$(FBINCDIR)

- #

--#LINKFLAGS	= -rdynamic -export-dynamic -shared 

--LINKFLAGS	= -shared

-+#LINKFLAGS	= -rdynamic -export-dynamic  -shared 

-+LINKFLAGS	=  -shared

- EXTLIBS		= $(EXTLIBDIR) -lcrypt -ldl

++COMPFLAGS	= -DPIC -fPIC $(CFLAGS) -w -D_REENTRANT -D_PTHREADS -DEXTERNAL $(INCLUDEDIR) -I$(FBINCDIR)

  #

- ISCDBC			= libIscDbc.so

+ #LINKFLAGS	= -rdynamic -export-dynamic -shared 

+ LINKFLAGS	= -shared

 diff -uNr ODBC_V2-0-BETA/OdbcJdbc/Builds/makefile.environ ODBC_V2-0-BETA.cp/OdbcJdbc/Builds/makefile.environ
 --- ODBC_V2-0-BETA/OdbcJdbc/Builds/makefile.environ	2003-12-13 19:27:26.000000000 +0100
-+++ ODBC_V2-0-BETA.cp/OdbcJdbc/Builds/makefile.environ	2006-06-26 13:37:51.000000000 +0200
++++ ODBC_V2-0-BETA.cp/OdbcJdbc/Builds/makefile.environ	2006-06-28 15:27:20.000000000 +0200
 @@ -3,8 +3,8 @@
  #FBINCDIR	= /mnt/third_party/interbase/sun5-2003-3-10/include

  #FBLIBDIR	= /mnt/third_party/interbase/sun5-2003-3-10/lib

  #

 -FBINCDIR	= d:/Firebird/include

 -FBLIBDIR	= d:/Firebird/lib

-+FBINCDIR	= /usr/irebird/include

-+FBLIBDIR	= /usr/firebird/lib

++#FBINCDIR	= /usr/firebird/include

++#FBLIBDIR	= /usr/firebird/lib

  #

  ISCDBCDIR 		= ../../IscDbc

  ODBCJDBCDIR 		= ../..

-diff -uNr ODBC_V2-0-BETA/OdbcJdbc/OdbcConnection.cpp ODBC_V2-0-BETA.cp/OdbcJdbc/OdbcConnection.cpp
---- ODBC_V2-0-BETA/OdbcJdbc/OdbcConnection.cpp	2006-06-21 16:52:14.000000000 +0200
-+++ ODBC_V2-0-BETA.cp/OdbcJdbc/OdbcConnection.cpp	2006-06-26 12:36:02.000000000 +0200
-@@ -1026,7 +1026,7 @@
+diff -uNr ODBC_V2-0-BETA/OdbcJdbc/MainUnicode.cpp ODBC_V2-0-BETA.cp/OdbcJdbc/MainUnicode.cpp
+--- ODBC_V2-0-BETA/OdbcJdbc/MainUnicode.cpp	2006-06-04 21:33:08.000000000 +0200
++++ ODBC_V2-0-BETA.cp/OdbcJdbc/MainUnicode.cpp	2006-06-28 15:38:11.000000000 +0200
+@@ -37,7 +37,9 @@
  

- void OdbcConnection::writeAttributeFileDSN(const char * attribute, const char * value)

- {

--	SQLWriteFileDSN (savedsn, "ODBC", attribute, value);

-+	SQLWriteFileDSN (savedsn, "ODBC", attribute, (char*)value);

- }

+ extern FILE	*logFile;

+ using namespace OdbcJdbcLibrary;

++#ifdef _WIN32
+ extern UINT codePage; // from Main.cpp

++#endif
  

- SQLRETURN OdbcConnection::sqlGetFunctions(SQLUSMALLINT functionId, SQLUSMALLINT * supportedPtr)

-diff -uNr ODBC_V2-0-BETA/OdbcJdbc/OdbcJdbc.h ODBC_V2-0-BETA.cp/OdbcJdbc/OdbcJdbc.h
---- ODBC_V2-0-BETA/OdbcJdbc/OdbcJdbc.h	2005-06-02 14:54:48.000000000 +0200
-+++ ODBC_V2-0-BETA.cp/OdbcJdbc/OdbcJdbc.h	2006-06-23 19:13:10.000000000 +0200
-@@ -137,3 +137,11 @@
+ template <typename TypeRealLen = SQLSMALLINT>

+ class ConvertingString

+diff -uNr ODBC_V2-0-BETA/OdbcJdbc/OdbcInstGetProp.cpp ODBC_V2-0-BETA.cp/OdbcJdbc/OdbcInstGetProp.cpp
+--- ODBC_V2-0-BETA/OdbcJdbc/OdbcInstGetProp.cpp	2006-06-21 16:54:06.000000000 +0200
++++ ODBC_V2-0-BETA.cp/OdbcJdbc/OdbcInstGetProp.cpp	2006-06-28 15:39:15.000000000 +0200
+@@ -1,4 +1,5 @@
  

- #endif

++#ifndef _IODBCUNIX_H
+ #ifndef _WIN32

+ #include <stdlib.h>

+ #include <memory.h>

+@@ -190,3 +191,4 @@
+ }

  

-+#ifndef UINT
-+#define UINT   SQLUINTEGER
-+#endif
-+
-+#ifndef DWORD
-+#define DWORD   SQLUINTEGER
+ #endif

 +#endif
-+