Hi all,

Just upgraded from Debian Lenny to Squeeze just to find out that py_sems doesn't compile anymore, since python-sip4 has changed to 4.9-1, which is incompatible with the files generated by the 4.5.2 version in apps/py_sems/sip.

Here's a patch against trunk to make it work again. No idea if the patch also works with Lenny though, probably someone with a Lenny machine can check that?

Andreas
Index: apps/py_sems/sip/string.sip
===================================================================
--- apps/py_sems/sip/string.sip	(revision 1626)
+++ apps/py_sems/sip/string.sip	(working copy)
@@ -22,7 +22,7 @@
              *sipCppPtr = new std::string(PyString_AS_STRING(sipPy));
              return 0;
          }
-         *sipCppPtr = (std::string *)sipForceConvertTo_string(sipPy,sipIsErr);
+         *sipCppPtr = (std::string *)sipForceConvertToType(sipPy, sipType_string, NULL, SIP_NO_CONVERTORS, NULL, sipIsErr);
          return 1;
 %End
 };
Index: apps/py_sems/PySems.cpp
===================================================================
--- apps/py_sems/PySems.cpp	(revision 1626)
+++ apps/py_sems/PySems.cpp	(working copy)
@@ -32,12 +32,10 @@
 
 #include "PySemsDialog.h"
 #include "PySemsB2BDialog.h"
+#include "PySemsB2ABDialog.h"
 #include "PySemsUtils.h"
 
 #include "sip/sipAPIpy_sems_lib.h"
-#include "sip/sippy_sems_libPySemsDialog.h"
-#include "sip/sippy_sems_libPySemsB2BDialog.h"
-#include "sip/sippy_sems_libPySemsB2ABDialog.h"
 
 #include <unistd.h>
 #include <pthread.h>
@@ -268,21 +266,21 @@
   }; break;
   case PySemsScriptDesc::Dialog: {
     PySemsDialog* dlg = (PySemsDialog*)
-      sipForceConvertTo_PySemsDialog(dlg_inst,&err);
+      sipForceConvertToType(dlg_inst, sipType_PySemsDialog, NULL, SIP_NO_CONVERTORS, NULL, &err);
     sess = dlg;
     dlg_base = dlg;
   }; break;
 
   case PySemsScriptDesc::B2BDialog: {
     PySemsB2BDialog* b2b_dlg = (PySemsB2BDialog*)
-      sipForceConvertTo_PySemsB2BDialog(dlg_inst,&err);
+      sipForceConvertToType(dlg_inst, sipType_PySemsB2BDialog, NULL, SIP_NO_CONVERTORS, NULL, &err);
     sess = b2b_dlg;
     dlg_base = b2b_dlg;
   }; break;
 
   case PySemsScriptDesc::B2ABDialog: {
     PySemsB2ABDialog* b2ab_dlg = (PySemsB2ABDialog*)
-      sipForceConvertTo_PySemsB2ABDialog(dlg_inst,&err);      
+      sipForceConvertToType(dlg_inst, sipType_PySemsB2ABDialog, NULL, SIP_NO_CONVERTORS, NULL, &err);
     sess = b2ab_dlg;
     dlg_base = b2ab_dlg;
 
_______________________________________________
Semsdev mailing list
[email protected]
http://lists.iptel.org/mailman/listinfo/semsdev

Reply via email to