[gentoo-commits] gentoo-x86 commit in net-voip/gnugk/files: gnugk-2.2.7-configure.patch gnugk-2.2.7-firebird-2.1.patch

[gentoo-commits] gentoo-x86 commit in net-voip/gnugk/files: gnugk-2.2.7-configure.patch gnugk-2.2.7-firebird-2.1.patch

[Mounir Lamouri (volkmar)]

volkmar     09/04/08 17:18:48

  Added:                gnugk-2.2.7-configure.patch
                        gnugk-2.2.7-firebird-2.1.patch
  Log:
  adding missing patches and fix parallel build
  (Portage version: 2.1.6.7/cvs/Linux ppc)

Revision  Changes    Path
1.1                  net-voip/gnugk/files/gnugk-2.2.7-configure.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-voip/gnugk/files/gnugk-2.2.7-configure.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-voip/gnugk/files/gnugk-2.2.7-configure.patch?rev=1.1&content-type=text/plain

Index: gnugk-2.2.7-configure.patch
===================================================================
--- configure.old	2009-02-10 17:14:47.000000000 -0500
+++ configure	2009-02-10 17:14:18.000000000 -0500
@@ -3979,11 +3979,6 @@
 fi
 
 
-if test "x$pgsql" != "xno" -o "x$mysql" != "xno"; then
-	SOURCES="$SOURCES sqlauth.cxx sqlacct.cxx gksql.cxx"
-	HEADERS="$HEADERS sqlacct.h gksql.h"
-fi
-
 # Check whether --enable-firebird or --disable-firebird was given.
 if test "${enable_firebird+set}" = set; then
   enableval="$enable_firebird"
@@ -4242,6 +4237,11 @@
 fi
 
 
+if test "x$pgsql" != "xno" -o "x$mysql" != "xno" -o "x$firebird" != "xno"; then
+	SOURCES="$SOURCES sqlauth.cxx sqlacct.cxx gksql.cxx"
+	HEADERS="$HEADERS sqlacct.h gksql.h"
+fi
+
 
 GNUGK_MAJOR_VERSION=`cat version.h | grep "define GNUGK_MAJOR_VERSION" | cut -f4 -d' '`
 GNUGK_MINOR_VERSION=`cat version.h | grep "define GNUGK_MINOR_VERSION" | cut -f4 -d' '`



1.1                  net-voip/gnugk/files/gnugk-2.2.7-firebird-2.1.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-voip/gnugk/files/gnugk-2.2.7-firebird-2.1.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-voip/gnugk/files/gnugk-2.2.7-firebird-2.1.patch?rev=1.1&content-type=text/plain

Index: gnugk-2.2.7-firebird-2.1.patch
===================================================================
--- gksql_firebird.cxx.old	2009-02-10 21:43:26.000000000 +0100
+++ gksql_firebird.cxx	2009-02-10 21:58:06.000000000 +0100
@@ -342,11 +342,11 @@
 	if (status[0] == 1 && status[1] != 0) {
 		m_numRows = m_sqlRow;
 		if (retval != 100) {
-			long errcode = isc_sqlcode(status);
+			ISC_STATUS errcode = isc_sqlcode(status);
 			char errormsg[512];
 			if (errcode == -999) {
 				errcode = status[1];
-				long *pvector = status;
+				ISC_STATUS *pvector = status;
 				errormsg[isc_interprete(errormsg, &pvector)] = 0;
 			} else {
 				strcpy(errormsg, "SQL:");
@@ -392,7 +392,7 @@
 			char errormsg[512];
 			if (errcode == -999) {
 				errcode = status[1];
-				long *pvector = status;
+				ISC_STATUS *pvector = status;
 				errormsg[isc_interprete(errormsg, &pvector)] = 0;
 			} else {
 				strcpy(errormsg, "SQL:");
@@ -472,7 +472,7 @@
 	
 	isc_attach_database(status, 0, const_cast<char*>(dbname.c_str()), &conn, dpb_offset, &(dpb[0]));
 	if (status[0] == 1 && status[1] != 0) {
-		long *pvector = status;
+		ISC_STATUS *pvector = status;
 		char errormsg[512];
 		errormsg[isc_interprete(errormsg, &pvector)] = 0;
 		PTRACE(2, GetName() << "\tFirebird connection to " << m_username << '@' << dbname 
@@ -505,7 +505,7 @@
 	
 	isc_start_transaction(status, &tr, 1, &conn, 0, NULL);
 	if (status[0] == 1 && status[1] != 0) {
-		long *pvector = status;
+		ISC_STATUS *pvector = status;
 		char errormsg[512];
 		errormsg[isc_interprete(errormsg, &pvector)] = 0;
 		return new GkIBSQLResult(status[1], errormsg);
@@ -516,7 +516,7 @@
 		long errorcode = isc_sqlcode(status);
 		if (errorcode == -999) {
 			errorcode = status[1];
-			long *pvector = status;
+			ISC_STATUS *pvector = status;
 			errormsg[isc_interprete(errormsg, &pvector)] = 0;
 		} else {
 			strcpy(errormsg, "SQL:");
@@ -536,7 +536,7 @@
 		long errorcode = isc_sqlcode(status);
 		if (errorcode == -999) {
 			errorcode = status[1];
-			long *pvector = status;
+			ISC_STATUS *pvector = status;
 			errormsg[isc_interprete(errormsg, &pvector)] = 0;
 		} else {
 			strcpy(errormsg, "SQL:");
@@ -558,7 +558,7 @@
 			long errorcode = isc_sqlcode(status);
 			if (errorcode == -999) {
 				errorcode = status[1];
-				long *pvector = status;
+				ISC_STATUS *pvector = status;
 				errormsg[isc_interprete(errormsg, &pvector)] = 0;
 			} else {
 				strcpy(errormsg, "SQL:");
@@ -575,7 +575,7 @@
 		long errorcode = isc_sqlcode(status);
 		if (errorcode == -999) {
 			errorcode = status[1];
-			long *pvector = status;
+			ISC_STATUS *pvector = status;
 			errormsg[isc_interprete(errormsg, &pvector)] = 0;
 		} else {
 			strcpy(errormsg, "SQL:");