Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Mounir Lamouri (volkmar)" <volkmar@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-voip/gnugk/files: gnugk-2.2.7-configure.patch gnugk-2.2.7-firebird-2.1.patch
Date: Wed, 08 Apr 2009 17:18:50
Message-Id: E1LrbQG-0000V0-L7@stork.gentoo.org
1 volkmar 09/04/08 17:18:48
2
3 Added: gnugk-2.2.7-configure.patch
4 gnugk-2.2.7-firebird-2.1.patch
5 Log:
6 adding missing patches and fix parallel build
7 (Portage version: 2.1.6.7/cvs/Linux ppc)
8
9 Revision Changes Path
10 1.1 net-voip/gnugk/files/gnugk-2.2.7-configure.patch
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-voip/gnugk/files/gnugk-2.2.7-configure.patch?rev=1.1&view=markup
13 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
14
15 Index: gnugk-2.2.7-configure.patch
16 ===================================================================
17 --- configure.old 2009-02-10 17:14:47.000000000 -0500
18 +++ configure 2009-02-10 17:14:18.000000000 -0500
19 @@ -3979,11 +3979,6 @@
20 fi
21
22
23 -if test "x$pgsql" != "xno" -o "x$mysql" != "xno"; then
24 - SOURCES="$SOURCES sqlauth.cxx sqlacct.cxx gksql.cxx"
25 - HEADERS="$HEADERS sqlacct.h gksql.h"
26 -fi
27 -
28 # Check whether --enable-firebird or --disable-firebird was given.
29 if test "${enable_firebird+set}" = set; then
30 enableval="$enable_firebird"
31 @@ -4242,6 +4237,11 @@
32 fi
33
34
35 +if test "x$pgsql" != "xno" -o "x$mysql" != "xno" -o "x$firebird" != "xno"; then
36 + SOURCES="$SOURCES sqlauth.cxx sqlacct.cxx gksql.cxx"
37 + HEADERS="$HEADERS sqlacct.h gksql.h"
38 +fi
39 +
40
41 GNUGK_MAJOR_VERSION=`cat version.h | grep "define GNUGK_MAJOR_VERSION" | cut -f4 -d' '`
42 GNUGK_MINOR_VERSION=`cat version.h | grep "define GNUGK_MINOR_VERSION" | cut -f4 -d' '`
43
44
45
46 1.1 net-voip/gnugk/files/gnugk-2.2.7-firebird-2.1.patch
47
48 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
49 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
50
51 Index: gnugk-2.2.7-firebird-2.1.patch
52 ===================================================================
53 --- gksql_firebird.cxx.old 2009-02-10 21:43:26.000000000 +0100
54 +++ gksql_firebird.cxx 2009-02-10 21:58:06.000000000 +0100
55 @@ -342,11 +342,11 @@
56 if (status[0] == 1 && status[1] != 0) {
57 m_numRows = m_sqlRow;
58 if (retval != 100) {
59 - long errcode = isc_sqlcode(status);
60 + ISC_STATUS errcode = isc_sqlcode(status);
61 char errormsg[512];
62 if (errcode == -999) {
63 errcode = status[1];
64 - long *pvector = status;
65 + ISC_STATUS *pvector = status;
66 errormsg[isc_interprete(errormsg, &pvector)] = 0;
67 } else {
68 strcpy(errormsg, "SQL:");
69 @@ -392,7 +392,7 @@
70 char errormsg[512];
71 if (errcode == -999) {
72 errcode = status[1];
73 - long *pvector = status;
74 + ISC_STATUS *pvector = status;
75 errormsg[isc_interprete(errormsg, &pvector)] = 0;
76 } else {
77 strcpy(errormsg, "SQL:");
78 @@ -472,7 +472,7 @@
79
80 isc_attach_database(status, 0, const_cast<char*>(dbname.c_str()), &conn, dpb_offset, &(dpb[0]));
81 if (status[0] == 1 && status[1] != 0) {
82 - long *pvector = status;
83 + ISC_STATUS *pvector = status;
84 char errormsg[512];
85 errormsg[isc_interprete(errormsg, &pvector)] = 0;
86 PTRACE(2, GetName() << "\tFirebird connection to " << m_username << '@' << dbname
87 @@ -505,7 +505,7 @@
88
89 isc_start_transaction(status, &tr, 1, &conn, 0, NULL);
90 if (status[0] == 1 && status[1] != 0) {
91 - long *pvector = status;
92 + ISC_STATUS *pvector = status;
93 char errormsg[512];
94 errormsg[isc_interprete(errormsg, &pvector)] = 0;
95 return new GkIBSQLResult(status[1], errormsg);
96 @@ -516,7 +516,7 @@
97 long errorcode = isc_sqlcode(status);
98 if (errorcode == -999) {
99 errorcode = status[1];
100 - long *pvector = status;
101 + ISC_STATUS *pvector = status;
102 errormsg[isc_interprete(errormsg, &pvector)] = 0;
103 } else {
104 strcpy(errormsg, "SQL:");
105 @@ -536,7 +536,7 @@
106 long errorcode = isc_sqlcode(status);
107 if (errorcode == -999) {
108 errorcode = status[1];
109 - long *pvector = status;
110 + ISC_STATUS *pvector = status;
111 errormsg[isc_interprete(errormsg, &pvector)] = 0;
112 } else {
113 strcpy(errormsg, "SQL:");
114 @@ -558,7 +558,7 @@
115 long errorcode = isc_sqlcode(status);
116 if (errorcode == -999) {
117 errorcode = status[1];
118 - long *pvector = status;
119 + ISC_STATUS *pvector = status;
120 errormsg[isc_interprete(errormsg, &pvector)] = 0;
121 } else {
122 strcpy(errormsg, "SQL:");
123 @@ -575,7 +575,7 @@
124 long errorcode = isc_sqlcode(status);
125 if (errorcode == -999) {
126 errorcode = status[1];
127 - long *pvector = status;
128 + ISC_STATUS *pvector = status;
129 errormsg[isc_interprete(errormsg, &pvector)] = 0;
130 } else {
131 strcpy(errormsg, "SQL:");
Report Message
Find on MARC Find on Google Groups