Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 99271 Details for
Bug 148277
dev-python/sip doesn't compile against Python 2.5
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
sip-4.2.1-python2.5.patch
sip-4.2.1-python2.5.patch (text/plain), 6.53 KB, created by
Peter Alexander
on 2006-10-10 03:57:46 UTC
(
hide
)
Description:
sip-4.2.1-python2.5.patch
Filename:
MIME Type:
Creator:
Peter Alexander
Created:
2006-10-10 03:57:46 UTC
Size:
6.53 KB
patch
obsolete
>diff -Nru sip-4.2.1.vanilla/sipgen/gencode.c sip-4.2.1/sipgen/gencode.c >--- sip-4.2.1.vanilla/sipgen/gencode.c 2005-03-06 05:30:23.000000000 -0500 >+++ sip-4.2.1/sipgen/gencode.c 2006-10-10 04:53:44.000000000 -0400 >@@ -3043,7 +3043,7 @@ > > if (isNumberSlot(md) || isInplaceNumberSlot(md)) > prcode(fp, >-" if (!PyType_IsSubtype(sipSelf -> ob_type,&sipClass_%C -> super.type))\n" >+" if (!PyType_IsSubtype(sipSelf -> ob_type,&sipClass_%C -> super.ht_type))\n" > " {\n" > " Py_INCREF(Py_NotImplemented);\n" > " return Py_NotImplemented;\n" >diff -Nru sip-4.2.1.vanilla/siplib/objmap.c sip-4.2.1/siplib/objmap.c >--- sip-4.2.1.vanilla/siplib/objmap.c 2005-03-06 05:30:26.000000000 -0500 >+++ sip-4.2.1/siplib/objmap.c 2006-10-10 05:06:21.000000000 -0400 >@@ -114,8 +114,8 @@ > * of it, or vice versa, then we assume it is the same C++ > * object. > */ >- if (PyObject_TypeCheck(w,&type -> super.type) || >- PyType_IsSubtype(&type -> super.type,w -> ob_type)) >+ if (PyObject_TypeCheck(w,&type -> super.ht_type) || >+ PyType_IsSubtype(&type -> super.ht_type,w -> ob_type)) > return w; > } > >diff -Nru sip-4.2.1.vanilla/siplib/qtlib.cpp sip-4.2.1/siplib/qtlib.cpp >--- sip-4.2.1.vanilla/siplib/qtlib.cpp 2005-03-06 05:30:26.000000000 -0500 >+++ sip-4.2.1/siplib/qtlib.cpp 2006-10-10 04:51:10.000000000 -0400 >@@ -1235,7 +1235,7 @@ > char *meth; > > // Get the method name. >- meth = ((PyCFunctionObject *)rxObj) -> m_ml -> ml_name; >+ meth = (char*)((PyCFunctionObject *)rxObj) -> m_ml -> ml_name; > > if ((sp -> name = (char *)sip_api_malloc(strlen(meth) + 2)) == NULL) > return -1; >diff -Nru sip-4.2.1.vanilla/siplib/siplib.c sip-4.2.1/siplib/siplib.c >--- sip-4.2.1.vanilla/siplib/siplib.c 2005-03-06 05:30:26.000000000 -0500 >+++ sip-4.2.1/siplib/siplib.c 2006-10-10 06:41:05.000000000 -0400 >@@ -303,7 +303,7 @@ > if (PyType_Ready(&sipWrapperType_Type) < 0) > Py_FatalError("sip: Failed to initialise sip.wrappertype type"); > >- if (PyType_Ready(&sipWrapper_Type.super.type) < 0) >+ if (PyType_Ready(&sipWrapper_Type.super.ht_type) < 0) > Py_FatalError("sip: Failed to initialise sip.wrapper type"); > > if (PyType_Ready(&sipVoidPtr_Type) < 0) >@@ -671,7 +671,7 @@ > sipWrapperType *wt; > > while ((wt = *mw++) != NULL) >- if (addInstances(wt -> super.type.tp_dict,&wt -> type -> td_instances) < 0) >+ if (addInstances(wt -> super.ht_type.tp_dict,&wt -> type -> td_instances) < 0) > return -1; > } > >@@ -1568,7 +1568,7 @@ > type = va_arg(va,sipWrapperType *); > va_arg(va,void **); > >- if (arg != Py_None && !PyObject_TypeCheck(arg,&type -> super.type)) >+ if (arg != Py_None && !PyObject_TypeCheck(arg,&type -> super.ht_type)) > valid = PARSE_TYPE; > > /* Handle the sub-format. */ >@@ -1662,7 +1662,7 @@ > #if defined(SIP_QT_SUPPORT) > /* Sub-class of QObject. */ > >- if (PyObject_TypeCheck(arg,&sipQObjectClass -> super.type)) >+ if (PyObject_TypeCheck(arg,&sipQObjectClass -> super.ht_type)) > *va_arg(va,PyObject **) = arg; > else > valid = PARSE_TYPE; >@@ -2405,7 +2405,7 @@ > > /* Get the dictionary into which the type will be placed. */ > if (type -> td_scope >= 0) >- dict = client -> em_types[type -> td_scope] -> super.type.tp_dict; >+ dict = client -> em_types[type -> td_scope] -> super.ht_type.tp_dict; > else > dict = mod_dict; > >@@ -2474,7 +2474,7 @@ > > /* Get the dictionary into which the type will be placed. */ > if (ed -> e_scope >= 0) >- dict = client -> em_types[ed -> e_scope] -> super.type.tp_dict; >+ dict = client -> em_types[ed -> e_scope] -> super.ht_type.tp_dict; > else > dict = mod_dict; > >@@ -2597,7 +2597,7 @@ > > self = PyTuple_GET_ITEM(args,argnr); > >- if (!PyObject_TypeCheck(self,&type -> super.type)) >+ if (!PyObject_TypeCheck(self,&type -> super.ht_type)) > return PARSE_UNBOUND; > > *selfp = (sipWrapper *)self; >@@ -2700,7 +2700,7 @@ > if ((attr = createEnumMember(in, enm)) == NULL) > return NULL; > >- if (PyDict_SetItem(in -> super.type.tp_dict,nameobj,attr) < 0) >+ if (PyDict_SetItem(in -> super.ht_type.tp_dict,nameobj,attr) < 0) > { > Py_DECREF(attr); > return NULL; >@@ -3329,7 +3329,7 @@ > { > /* If this is a wrapped type then get the type dictionary. */ > if (sipWrapperType_Check(dict)) >- dict = ((sipWrapperType *)dict) -> super.type.tp_dict; >+ dict = ((sipWrapperType *)dict) -> super.ht_type.tp_dict; > > return addSingleClassInstance(dict,name,cppPtr,wt,SIP_SIMPLE); > } >@@ -3620,7 +3620,7 @@ > * convertor might be able to convert the target type > * to something more specific. > */ >- if (PyType_IsSubtype(&type -> super.type,&scc -> scc_basetype -> super.type)) >+ if (PyType_IsSubtype(&type -> super.ht_type,&scc -> scc_basetype -> super.ht_type)) > { > sipWrapperType *subtype; > >@@ -4077,7 +4077,7 @@ > * super-type. > */ > if (self -> type == NULL) >- self -> type = ((sipWrapperType *)self -> super.type.tp_base) -> type; >+ self -> type = ((sipWrapperType *)self -> super.ht_type.tp_base) -> type; > > return 0; > } >@@ -4107,7 +4107,7 @@ > PyObject *dict, *tmpdict, *proxy; > PyMethodDef *pmd; > >- dict = wt -> super.type.tp_dict; >+ dict = wt -> super.ht_type.tp_dict; > > /* The base type doesn't have any type information. */ > if ((td = wt -> type) == NULL) >@@ -4304,7 +4304,7 @@ > } > > /* Call the standard super-type new. */ >- return PyBaseObject_Type.tp_new(&wt -> super.type,args,kwds); >+ return PyBaseObject_Type.tp_new(&wt -> super.ht_type,args,kwds); > } > > >@@ -4744,8 +4744,8 @@ > switch (slots++ -> psd_type) > { > case str_slot: >- if (sp -> type.tp_str == NULL) >- sp -> type.tp_str = (reprfunc)f; >+ if (sp -> ht_type.tp_str == NULL) >+ sp -> ht_type.tp_str = (reprfunc)f; > break; > > case int_slot: >@@ -4891,8 +4891,8 @@ > break; > > case call_slot: >- if (sp -> type.tp_call == NULL) >- sp -> type.tp_call = sipWrapper_call; >+ if (sp -> ht_type.tp_call == NULL) >+ sp -> ht_type.tp_call = sipWrapper_call; > break; > > case getitem_slot: >@@ -4916,13 +4916,13 @@ > case ne_slot: > case gt_slot: > case ge_slot: >- if (sp -> type.tp_richcompare == NULL) >- sp -> type.tp_richcompare = sipWrapper_richcompare; >+ if (sp -> ht_type.tp_richcompare == NULL) >+ sp -> ht_type.tp_richcompare = sipWrapper_richcompare; > break; > > case cmp_slot: >- if (sp -> type.tp_compare == NULL) >- sp -> type.tp_compare = (cmpfunc)f; >+ if (sp -> ht_type.tp_compare == NULL) >+ sp -> ht_type.tp_compare = (cmpfunc)f; > break; > > case nonzero_slot: >@@ -4936,8 +4936,8 @@ > break; > > case repr_slot: >- if (sp -> type.tp_repr == NULL) >- sp -> type.tp_repr = (reprfunc)f; >+ if (sp -> ht_type.tp_repr == NULL) >+ sp -> ht_type.tp_repr = (reprfunc)f; > break; > } > }
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 148277
:
97529
|
97537
| 99271 |
100999
|
101002