[gentoo-commits] gentoo-x86 commit in dev-db/hk_classes/files: hk_classes-0.8.3-gcc43.patch

[Timo Gurr (tgurr)]

tgurr       08/08/26 22:52:58

  Modified:             hk_classes-0.8.3-gcc43.patch
  Log:
  Update gcc 4.3 patch borrowed from mandriva, fixing bug #230251. Fix some quoting.
  (Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo x86_64)

Revision  Changes    Path
1.2                  dev-db/hk_classes/files/hk_classes-0.8.3-gcc43.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/hk_classes/files/hk_classes-0.8.3-gcc43.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/hk_classes/files/hk_classes-0.8.3-gcc43.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/hk_classes/files/hk_classes-0.8.3-gcc43.patch?r1=1.1&r2=1.2

Index: hk_classes-0.8.3-gcc43.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/hk_classes/files/hk_classes-0.8.3-gcc43.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hk_classes-0.8.3-gcc43.patch	25 Apr 2008 23:38:02 -0000	1.1
+++ hk_classes-0.8.3-gcc43.patch	26 Aug 2008 22:52:57 -0000	1.2
@@ -225,3 +225,97 @@
  {
  #ifdef HK_DEBUG
 
+--- hk_classes-0.8.3/hk_dbaseclasses/xbase/xblock.cpp~	2008-07-31 05:24:53.000000000 +0200
++++ hk_classes-0.8.3/hk_dbaseclasses/xbase/xblock.cpp	2008-07-31 05:25:00.000000000 +0200
+@@ -48,7 +48,7 @@
+ 
+ 
+ #include "xbase64.h"
+-
++#include <cerrno>
+ #ifdef HAVE_IO_H     // windows locking
+ #include <io.h>
+ #endif
+@@ -124,7 +124,7 @@
+   return 0;
+ }
+ 
+-#elif HAVE_FCNTL_H
++#else
+ 
+ xbShort xbLock::LockFile( int fn, xbShort LockType, xbOffT lockLen )
+ {
+--- hk_classes-0.8.3/hk_paradoxclasses/hk_paradoxcolumn.cpp~	2006-04-19 15:11:18.000000000 +0200
++++ hk_classes-0.8.3/hk_paradoxclasses/hk_paradoxcolumn.cpp	2008-07-31 05:33:42.000000000 +0200
+@@ -10,7 +10,7 @@
+ // ****************************************************************************
+ #include "hk_paradoxcolumn.h"
+ #include "hk_paradoxdatasource.h"
+-
++#include <cstring>
+ 
+ hk_paradoxcolumn::hk_paradoxcolumn(hk_paradoxdatasource* ds, const hk_string& tTRUE,const hk_string& tFALSE)
+ :hk_storagecolumn(ds,tTRUE,tFALSE)
+--- hk_classes-0.8.3/hk_paradoxclasses/hk_paradoxtable.cpp~	2006-06-29 20:10:18.000000000 +0200
++++ hk_classes-0.8.3/hk_paradoxclasses/hk_paradoxtable.cpp	2008-07-31 05:34:19.000000000 +0200
+@@ -16,6 +16,7 @@
+ #include "hk_paradoxconnection.h"
+ #include "hk_paradoxdatabase.h"
+ #include "hk_url.h"
++#include <cstring>
+ //#include <pxversion.h>
+ 
+ hk_paradoxtable::hk_paradoxtable(hk_paradoxdatabase* db,hk_presentation* p):hk_paradoxdatasource(db,p)
+--- hk_classes-0.8.3/hk_firebirdclasses/hk_firebirdcolumn.cpp~	2005-07-02 16:15:04.000000000 +0200
++++ hk_classes-0.8.3/hk_firebirdclasses/hk_firebirdcolumn.cpp	2008-07-31 07:53:52.000000000 +0200
+@@ -10,7 +10,7 @@
+ // ****************************************************************************
+ #include "hk_firebirdcolumn.h"
+ #include "hk_firebirddatasource.h"
+-
++#include <cstring>
+ 
+ hk_firebirdcolumn::hk_firebirdcolumn(hk_firebirddatasource* ds, const hk_string& tTRUE,const hk_string& tFALSE)
+ :hk_storagecolumn(ds,tTRUE,tFALSE)
+--- hk_classes-0.8.3/hk_firebirdclasses/hk_firebirdconnection.cpp~	2006-07-16 21:11:52.000000000 +0200
++++ hk_classes-0.8.3/hk_firebirdclasses/hk_firebirdconnection.cpp	2008-07-31 07:52:59.000000000 +0200
+@@ -14,6 +14,7 @@
+ #include <dirent.h>
+ #include <unistd.h>
+ #include <sys/stat.h>
++#include <cstring>
+ #ifdef HAVE_SSTREAM
+ #include <sstream>
+ #else
+--- hk_classes-0.8.3/hk_firebirdclasses/hk_firebirddatasource.cpp~	2006-06-29 20:10:17.000000000 +0200
++++ hk_classes-0.8.3/hk_firebirdclasses/hk_firebirddatasource.cpp	2008-07-31 07:53:29.000000000 +0200
+@@ -15,6 +15,7 @@
+ #include "hk_firebirdactionquery.h"
+ #include <hk_datetime.h>
+ #include <time.h>
++#include <cstring>
+ #include <exception>
+ #include <new>
+ 
+--- hk_classes-0.8.3/hk_xbaseclasses/Makefile.in~	2006-12-17 15:27:52.000000000 +0100
++++ hk_classes-0.8.3/hk_xbaseclasses/Makefile.in	2008-07-31 11:08:48.000000000 +0200
+@@ -233,7 +233,7 @@
+ AM_CPPFLAGS = 
+ AM_CXXFLAGS = -Wall -W -Wconversion -Wshadow -Wcast-qual -Wwrite-strings -I@XMLINCLUDE@ @BITARCHITECTURE@
+ libhk_xbasedriver_la_LDFLAGS = -version-info 0:0:0 -L@XBASELIBDIR@
+-libhk_xbasedriver_la_LIBADD = -lxbsql ../hk_classes/libhk_classes.la
++libhk_xbasedriver_la_LIBADD = -lxbase -lxbsql ../hk_classes/libhk_classes.la
+ lib_LTLIBRARIES = libhk_xbasedriver.la
+ noinst_HEADERS = hk_xbaseconnection.h	 hk_xbaseactionquery.h hk_xbaseconnection.h \
+ 		 hk_xbasedatabase.h hk_xbasedatasource.h hk_xbasecolumn.h \
+--- hk_classes-0.8.3/hk_xbaseclasses/Makefile.am~	2006-10-02 19:54:20.000000000 +0200
++++ hk_classes-0.8.3/hk_xbaseclasses/Makefile.am	2008-07-31 11:08:24.000000000 +0200
+@@ -6,7 +6,7 @@
+ AM_CXXFLAGS=  -Wall -W -Wconversion -Wshadow -Wcast-qual -Wwrite-strings -I@XMLINCLUDE@ @BITARCHITECTURE@
+ 
+ libhk_xbasedriver_la_LDFLAGS = -version-info 0:0:0 -L@XBASELIBDIR@
+-libhk_xbasedriver_la_LIBADD = -lxbsql ../hk_classes/libhk_classes.la
++libhk_xbasedriver_la_LIBADD = -lxbase -lxbsql ../hk_classes/libhk_classes.la
+ 
+ lib_LTLIBRARIES = 	libhk_xbasedriver.la
+