Author: qboosh Date: Fri Nov 24 17:30:06 2006 GMT Module: SOURCES Tag: HEAD ---- Log message: - updated for 2.2.12
---- Files affected: SOURCES: unixODBC-libltdl-shared.patch (1.3 -> 1.4) , unixODBC-flex.patch (1.1 -> 1.2) , unixODBC-gODBCConfig.patch (1.4 -> 1.5) , unixODBC-symbols.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/unixODBC-libltdl-shared.patch diff -u SOURCES/unixODBC-libltdl-shared.patch:1.3 SOURCES/unixODBC-libltdl-shared.patch:1.4 --- SOURCES/unixODBC-libltdl-shared.patch:1.3 Wed Jul 7 23:34:45 2004 +++ SOURCES/unixODBC-libltdl-shared.patch Fri Nov 24 18:30:01 2006 @@ -8,10 +8,10 @@ odbcinst \ DriverManager \ odbcinstQ \ ---- unixODBC-2.2.9/configure.in.orig 2004-07-07 20:09:10.724120144 +0200 -+++ unixODBC-2.2.9/configure.in 2004-07-07 20:29:03.316818496 +0200 -@@ -135,15 +135,13 @@ - AC_MSG_CHECKING( Have we enabled using RTDL_GROUP ) +--- unixODBC-2.2.12/configure.in.orig 2006-11-24 14:08:23.129505000 +0100 ++++ unixODBC-2.2.12/configure.in 2006-11-24 14:09:58.329505000 +0100 +@@ -151,11 +151,10 @@ + AC_MSG_CHECKING( Have we enabled using RTLD_GROUP ) if test "x$rtldgroup" = "xtrue"; then AC_MSG_RESULT( yes ) -AC_LIBLTDL_CONVENIENCE @@ -23,7 +23,13 @@ dnl Check for dlopen support AC_LIBTOOL_DLOPEN --AC_CONFIG_SUBDIRS(libltdl) - +@@ -163,9 +162,6 @@ dnl Configure libtool AM_PROG_LIBTOOL + +-dnl Configure libltdl +-AC_CONFIG_SUBDIRS(libltdl) +- + use_builtin_libtool="no" + + dnl override the libtool lines if we use the system libs ================================================================ Index: SOURCES/unixODBC-flex.patch diff -u SOURCES/unixODBC-flex.patch:1.1 SOURCES/unixODBC-flex.patch:1.2 --- SOURCES/unixODBC-flex.patch:1.1 Thu Jul 10 11:35:32 2003 +++ SOURCES/unixODBC-flex.patch Fri Nov 24 18:30:01 2006 @@ -1,14 +1,6 @@ ---- unixODBC-2.2.6/sqp/lex.l.orig Wed Oct 17 18:40:32 2001 -+++ unixODBC-2.2.6/sqp/lex.l Thu Jul 10 11:23:35 2003 -@@ -178,6 +178,7 @@ - - '[^'\n]*$ { - yyerror( "Unterminated string" ); -+ YY_FLUSH_BUFFER; - } - - /*************************************** -@@ -236,8 +237,6 @@ +--- unixODBC-2.2.12/sqp/lex.l.orig 2005-10-12 10:20:04.000000000 +0200 ++++ unixODBC-2.2.12/sqp/lex.l 2006-11-24 14:10:55.239505000 +0100 +@@ -49,8 +49,6 @@ void yyerror( char *s ) { sprintf( g_szError, "%s processing '%s' on line %d", s, yytext, g_nLineNo ); @@ -17,3 +9,11 @@ } /********************************************************************** +@@ -224,6 +222,7 @@ + + '[^'\n]*$ { + yyerror( "Unterminated string" ); ++ YY_FLUSH_BUFFER; + } + + /*************************************** ================================================================ Index: SOURCES/unixODBC-gODBCConfig.patch diff -u SOURCES/unixODBC-gODBCConfig.patch:1.4 SOURCES/unixODBC-gODBCConfig.patch:1.5 --- SOURCES/unixODBC-gODBCConfig.patch:1.4 Sun Mar 27 13:35:02 2005 +++ SOURCES/unixODBC-gODBCConfig.patch Fri Nov 24 18:30:01 2006 @@ -1,6 +1,6 @@ ---- unixODBC-2.2.11/gODBCConfig/src/Makefile.am.orig 2004-09-29 16:23:50.000000000 +0200 -+++ unixODBC-2.2.11/gODBCConfig/src/Makefile.am 2005-03-27 12:45:46.264419832 +0200 -@@ -21,13 +21,14 @@ +--- unixODBC-2.2.12/gODBCConfig/src/Makefile.am.orig 2005-09-17 15:08:16.000000000 +0200 ++++ unixODBC-2.2.12/gODBCConfig/src/Makefile.am 2006-11-24 14:12:29.549505000 +0100 +@@ -21,13 +21,12 @@ support.c support.h \ interface.h \ callbacks.c callbacks.h @@ -8,19 +8,29 @@ + $(GNOME_LIBDIR) $(GNOMEUI_LIBS) \ + ../../odbcinst/libodbcinst.la ../../ini/libinilc.la - gODBCConfig_DEPENDENCIES = libgtkodbcconfig.la + gODBCConfig_DEPENDENCIES = libgtkodbcconfig.la ../../ini/libinilc.la -gODBCConfig_LDADD = $(GNOME_LIBDIR) \ - $(GNOMEUI_LIBS) \ +gODBCConfig_LDADD = \ $(INTLLIBS) \ - -L$(ODBCLIBS) $(ODBCLIB) \ - libgtkodbcconfig.la - +- libgtkodbcconfig.la \ +- ../../odbcinst/libodbcinst.la \ +- ../../ini/libinilc.la ++ libgtkodbcconfig.la +--- unixODBC-2.2.12/gODBCConfig/configure.in.orig 2005-09-16 20:09:56.000000000 +0200 ++++ unixODBC-2.2.12/gODBCConfig/configure.in 2006-11-24 15:23:16.209505000 +0100 +@@ -21,7 +21,7 @@ + dnl Add the languages which your application supports here. + ALL_LINGUAS="" + AM_GNU_GETTEXT([external]) +-AM_GNU_GETTEXT_VERSION(0.11.4 ++AM_GNU_GETTEXT_VERSION(0.11.4) ---- unixODBC-2.2.6/gODBCConfig/configure.in.orig 2003-07-21 12:56:54.000000000 +0200 -+++ unixODBC-2.2.6/gODBCConfig/configure.in 2003-08-09 10:37:38.000000000 +0200 -@@ -45,29 +45,6 @@ + dnl Set PACKAGE_LOCALE_DIR in config.h. + if test "x${prefix}" = "xNONE"; then +@@ -47,29 +47,6 @@ fi ]) odbcdir="" @@ -50,11 +60,12 @@ dnl Keep autoheader happy AC_DEFINE([ENABLE_NLS], [], [Description]) -@@ -79,7 +56,6 @@ +@@ -81,8 +58,7 @@ AC_DEFINE([PACKAGE_LOCALE_DIR], [], [Description]) AC_OUTPUT([ Makefile --macros/Makefile + macros/Makefile src/Makefile - po/Makefile.in +-po/Makefile.in ]) + ================================================================ Index: SOURCES/unixODBC-symbols.patch diff -u SOURCES/unixODBC-symbols.patch:1.1 SOURCES/unixODBC-symbols.patch:1.2 --- SOURCES/unixODBC-symbols.patch:1.1 Sun Aug 27 21:56:53 2006 +++ SOURCES/unixODBC-symbols.patch Fri Nov 24 18:30:01 2006 @@ -14,25 +14,19 @@ void sqpStoreDataType( char *pszType, int nPrecision, int nScale ) { HSQPDATATYPE hDataType; ---- unixODBC-2.2.11/cur/SQLConnect.c.orig 2002-11-25 16:37:54.000000000 +0100 -+++ unixODBC-2.2.11/cur/SQLConnect.c 2006-08-27 18:26:27.487091750 +0200 -@@ -275,7 +275,7 @@ +--- unixODBC-2.2.12/gODBCConfig/src/callbacks.c.orig 2006-04-18 12:29:28.000000000 +0200 ++++ unixODBC-2.2.12/gODBCConfig/src/callbacks.c 2006-11-24 17:44:31.329505000 +0100 +@@ -13,6 +13,13 @@ + #include "interface.h" + #include "support.h" - if ( !( cl_connection -> functions = malloc( sizeof( cl_template_func )))) - { -- dm_log_write( "CL " __FILE__, -+ dh -> dm_log_write( "CL " __FILE__, - __LINE__, - LOG_INFO, - LOG_INFO, ---- unixODBC-2.2.11/cur/SQLSetStmtOption.c.orig 2003-03-05 10:48:45.000000000 +0100 -+++ unixODBC-2.2.11/cur/SQLSetStmtOption.c 2006-08-27 18:27:52.680416000 +0200 -@@ -155,7 +155,7 @@ - - if ( ret == SQL_SUCCESS_WITH_INFO ) - { -- __post_internal_error( &cl_statement -> dm_statement -> error, -+ cl_statement -> cl_connection -> dh.__post_internal_error( &cl_statement -> dm_statement -> error, - ERROR_01S02, NULL, - cl_statement -> dm_statement -> connection -> - environment -> requested_version ); ++#ifndef WIN32 ++#ifndef HAVE_STRICMP ++#define stricmp(s1,s2) strcasecmp(s1,s2) ++#define strnicmp(s1,s2,n) strncasecmp(s1,s2,n) ++#endif ++#endif ++ + static char add_driver_name[ 257 ]; + static char add_driver_description[ 257 ]; + static char add_driver_driver[ 257 ]; ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/unixODBC-libltdl-shared.patch?r1=1.3&r2=1.4&f=u http://cvs.pld-linux.org/SOURCES/unixODBC-flex.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SOURCES/unixODBC-gODBCConfig.patch?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SOURCES/unixODBC-symbols.patch?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit