| 1 |
sbriesen 08/09/13 22:39:02 |
| 2 |
|
| 3 |
Added: capisuite-0.4.5-python25.patch |
| 4 |
capisuite-0.4.5-gcc43.patch |
| 5 |
Removed: capisuite |
| 6 |
Log: |
| 7 |
added gcc 4.3 + python 2.5 patches, minor ebuild cleanup. Solving bugs #221557, #226589, #232734 and #236777. |
| 8 |
(Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 i686) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 net-dialup/capisuite/files/capisuite-0.4.5-python25.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/capisuite/files/capisuite-0.4.5-python25.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/capisuite/files/capisuite-0.4.5-python25.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: capisuite-0.4.5-python25.patch |
| 17 |
=================================================================== |
| 18 |
--- src/application/pythonscript.cpp.orig 2004-11-28 14:35:24.000000000 +0100 |
| 19 |
+++ src/application/pythonscript.cpp 2008-08-03 17:12:45.000000000 +0200 |
| 20 |
@@ -99,14 +99,14 @@ |
| 21 |
if ( !(py_traceback=cStringIO->cgetvalue(catch_stderr)) ) |
| 22 |
throw ApplicationError("unable to get traceback","PythonScript::run()"); |
| 23 |
|
| 24 |
- int length; |
| 25 |
+ Py_ssize_t length; |
| 26 |
char *traceback; |
| 27 |
if (PyString_AsStringAndSize(py_traceback, &traceback, &length)) |
| 28 |
throw ApplicationError("unable to convert traceback to char*","PythonScript::run()"); |
| 29 |
|
| 30 |
error << prefix() << "A python error occured. See traceback below." << endl; |
| 31 |
error << prefix(false) << "Python traceback: "; |
| 32 |
- for (int i=0;i<length-1;i++) { |
| 33 |
+ for (Py_ssize_t i=0;i<length-1;i++) { |
| 34 |
error << traceback[i]; |
| 35 |
if (traceback[i]=='\n') |
| 36 |
error << prefix(false) << "Traceback: "; |
| 37 |
--- src/application/idlescript.cpp.orig 2004-11-28 14:35:24.000000000 +0100 |
| 38 |
+++ src/application/idlescript.cpp 2008-08-03 17:13:55.000000000 +0200 |
| 39 |
@@ -28,6 +28,7 @@ |
| 40 |
IdleScript *instance=static_cast<IdleScript*>(arg); |
| 41 |
instance->run(); |
| 42 |
pthread_cleanup_pop(1); // run the cleanup_handler and then deregister it |
| 43 |
+ return NULL; |
| 44 |
} |
| 45 |
|
| 46 |
void idlescript_cleanup_handler(void* arg) |
| 47 |
--- src/application/incomingscript.cpp.orig 2004-11-28 14:35:24.000000000 +0100 |
| 48 |
+++ src/application/incomingscript.cpp 2008-08-03 17:14:36.000000000 +0200 |
| 49 |
@@ -31,6 +31,7 @@ |
| 50 |
IncomingScript *instance=static_cast<IncomingScript*>(arg); |
| 51 |
instance->run(); |
| 52 |
pthread_cleanup_pop(1); // run the cleanup_handler and then deregister it |
| 53 |
+ return NULL; |
| 54 |
} |
| 55 |
|
| 56 |
void incomingscript_cleanup_handler(void* arg) |
| 57 |
--- src/backend/capi.cpp.orig 2008-08-03 17:10:41.000000000 +0200 |
| 58 |
+++ src/backend/capi.cpp 2008-08-03 17:21:37.000000000 +0200 |
| 59 |
@@ -30,6 +30,7 @@ |
| 60 |
|
| 61 |
Capi *instance=static_cast<Capi*>(arg); |
| 62 |
instance->run(); |
| 63 |
+ return NULL; |
| 64 |
} |
| 65 |
|
| 66 |
Capi::Capi (ostream& debug, unsigned short debug_level, ostream &error, unsigned short DDILength, unsigned short DDIBaseLength, vector<string> DDIStopNumbers, unsigned maxLogicalConnection, unsigned maxBDataBlocks,unsigned maxBDataLen) throw (CapiError, CapiMsgError) |
| 67 |
|
| 68 |
|
| 69 |
|
| 70 |
1.1 net-dialup/capisuite/files/capisuite-0.4.5-gcc43.patch |
| 71 |
|
| 72 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/capisuite/files/capisuite-0.4.5-gcc43.patch?rev=1.1&view=markup |
| 73 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/capisuite/files/capisuite-0.4.5-gcc43.patch?rev=1.1&content-type=text/plain |
| 74 |
|
| 75 |
Index: capisuite-0.4.5-gcc43.patch |
| 76 |
=================================================================== |
| 77 |
--- src/backend/connection.cpp.orig 2008-09-05 08:53:19.000000000 +0200 |
| 78 |
+++ src/backend/connection.cpp 2008-09-05 08:54:08.000000000 +0200 |
| 79 |
@@ -20,6 +20,7 @@ |
| 80 |
#include <pthread.h> |
| 81 |
#include <errno.h> // for errno |
| 82 |
#include <iconv.h> // for iconv(), iconv_open(), iconv_close() |
| 83 |
+#include <cstring> |
| 84 |
#include "capi.h" |
| 85 |
#include "callinterface.h" |
| 86 |
#include "connection.h" |
| 87 |
|
| 88 |
--- src/backend/capi.cpp.orig 2008-09-05 09:01:18.000000000 +0200 |
| 89 |
+++ src/backend/capi.cpp 2008-09-05 09:01:38.000000000 +0200 |
| 90 |
@@ -16,6 +16,7 @@ |
| 91 |
|
| 92 |
#include <iostream> |
| 93 |
#include <sstream> |
| 94 |
+#include <cstdlib> |
| 95 |
#include "connection.h" |
| 96 |
#include "applicationinterface.h" |
| 97 |
#include "capi.h" |
Archives