rpms/PyKDE/devel PyKDE-3.16.3.patch,1.1,1.2
Rex Dieter
rdieter at fedoraproject.org
Fri Jun 12 13:04:48 UTC 2009
Author: rdieter
Update of /cvs/pkgs/rpms/PyKDE/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11147
Modified Files:
PyKDE-3.16.3.patch
Log Message:
respin patch
PyKDE-3.16.3.patch:
Index: PyKDE-3.16.3.patch
===================================================================
RCS file: /cvs/pkgs/rpms/PyKDE/devel/PyKDE-3.16.3.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- PyKDE-3.16.3.patch 11 Jun 2009 22:04:41 -0000 1.1
+++ PyKDE-3.16.3.patch 12 Jun 2009 13:04:48 -0000 1.2
@@ -168,7 +168,7 @@ diff -ruN PyKDE-3.16.2/sip/kabc/phonenum
{
diff -ruN PyKDE-3.16.2/sip/kdecore/bytearray.sip PyKDE-3.16.3/sip/kdecore/bytearray.sip
--- PyKDE-3.16.2/sip/kdecore/bytearray.sip 2008-11-13 17:38:05.000000000 +0000
-+++ PyKDE-3.16.3/sip/kdecore/bytearray.sip 2009-06-10 22:30:28.000000000 +0100
++++ PyKDE-3.16.3/sip/kdecore/bytearray.sip 2009-06-12 13:35:43.000000000 +0100
@@ -60,56 +60,64 @@
void dcop_add (QDataStream&, SIP_PYDICT, QCString);
@@ -478,12 +478,14 @@ diff -ruN PyKDE-3.16.2/sip/kdecore/bytea
}
%End
-@@ -605,8 +609,8 @@
+@@ -604,9 +608,9 @@
+ QCString acpp = it.key ();
DCOPRef bcpp = it.data ();
PyObject *ainst;
- PyObject *binst;
+- PyObject *binst;
- if (((ainst = sipBuildResult (NULL, "N", new QCString (acpp), sipClass_QCString)) == NULL)
- || ((binst = sipBuildResult (NULL, "N", new DCOPRef (bcpp), sipClass_DCOPRef)) == NULL)
++ PyObject *binst = NULL;
+ if (((ainst = sipConvertFromNewType(new QCString(acpp), sipType_QCString, NULL)) == NULL)
+ || ((binst = sipConvertFromNewType(new DCOPRef(bcpp), sipType_DCOPRef, NULL)) == NULL)
|| (PyDict_SetItem (dict, ainst, binst) < 0))
@@ -516,12 +518,14 @@ diff -ruN PyKDE-3.16.2/sip/kdecore/bytea
cppmap->insert (*acpp, *bcpp);
}
-@@ -687,8 +692,8 @@
+@@ -686,9 +691,9 @@
+ QString acpp = it.key ();
DCOPRef bcpp = it.data ();
PyObject *ainst;
- PyObject *binst;
+- PyObject *binst;
- if (((ainst = sipBuildResult (NULL, "N", new QString (acpp), sipClass_QString)) == NULL)
- || ((binst = sipBuildResult (NULL, "N", new DCOPRef (bcpp), sipClass_DCOPRef)) == NULL)
++ PyObject *binst = NULL;
+ if (((ainst = sipConvertFromNewType(new QString(acpp), sipType_QString, sipTransferObj)) == NULL)
+ || ((binst = sipConvertFromNewType(new DCOPRef(bcpp), sipType_DCOPRef, sipTransferObj)) == NULL)
|| (PyDict_SetItem (dict, ainst, binst) < 0))
@@ -713,9 +717,21 @@ diff -ruN PyKDE-3.16.2/sip/kdecore/kcomp
*sipCppPtr = kbmap;
return 1;
+diff -ruN PyKDE-3.16.2/sip/kdecore/kconfigbase.sip PyKDE-3.16.3/sip/kdecore/kconfigbase.sip
+--- PyKDE-3.16.2/sip/kdecore/kconfigbase.sip 2008-03-04 20:47:14.000000000 +0000
++++ PyKDE-3.16.3/sip/kdecore/kconfigbase.sip 2009-06-12 13:32:05.000000000 +0100
+@@ -308,8 +308,6 @@
+ Py_INCREF (Py_None);
+ return Py_None;
+
+- PyObject *LongLong;
+-
+ return PyLong_FromUnsignedLongLong (*(LONG_LONG *)sipCpp);
+ %End
+
diff -ruN PyKDE-3.16.2/sip/kdecore/kconfigdata.sip PyKDE-3.16.3/sip/kdecore/kconfigdata.sip
--- PyKDE-3.16.2/sip/kdecore/kconfigdata.sip 2008-11-13 18:44:31.000000000 +0000
-+++ PyKDE-3.16.3/sip/kdecore/kconfigdata.sip 2009-06-10 17:51:06.000000000 +0100
++++ PyKDE-3.16.3/sip/kdecore/kconfigdata.sip 2009-06-12 13:31:34.000000000 +0100
@@ -74,7 +74,7 @@
//returns (QMap<KEntryKey,KEntry)
@@ -725,12 +741,14 @@ diff -ruN PyKDE-3.16.2/sip/kdecore/kconf
if (isErr)
sipRes = NULL;
-@@ -117,8 +117,8 @@
+@@ -116,9 +116,9 @@
+ KEntryKey acpp = it.key ();
KEntry bcpp = it.data ();
PyObject *ainst;
- PyObject *binst;
+- PyObject *binst;
- if (((ainst = sipBuildResult (NULL, "N", new KEntryKey (acpp), sipClass_KEntryKey)) == NULL)
- || ((binst = sipBuildResult (NULL, "N", new KEntry (bcpp), sipClass_KEntry)) == NULL)
++ PyObject *binst = NULL;
+ if (((ainst = sipConvertFromNewType(new KEntryKey(acpp), sipType_KEntryKey, NULL)) == NULL)
+ || ((binst = sipConvertFromNewType(new KEntry(bcpp), sipType_KEntry, NULL)) == NULL)
|| (PyDict_SetItem (dict, ainst, binst) < 0))
@@ -749,13 +767,15 @@ diff -ruN PyKDE-3.16.2/sip/kdecore/kconf
{
diff -ruN PyKDE-3.16.2/sip/kdecore/kconfig.sip PyKDE-3.16.3/sip/kdecore/kconfig.sip
--- PyKDE-3.16.2/sip/kdecore/kconfig.sip 2008-03-04 20:47:14.000000000 +0000
-+++ PyKDE-3.16.3/sip/kdecore/kconfig.sip 2009-06-10 22:34:55.000000000 +0100
-@@ -133,8 +133,8 @@
++++ PyKDE-3.16.3/sip/kdecore/kconfig.sip 2009-06-12 13:34:57.000000000 +0100
+@@ -132,9 +132,9 @@
+ QString acpp = it.key ();
QString bcpp = it.data ();
PyObject *ainst;
- PyObject *binst;
+- PyObject *binst;
- if (((ainst = sipBuildResult (NULL, "N", new QString (acpp), sipClass_QString)) == NULL)
- || ((binst = sipBuildResult (NULL, "N", new QString (bcpp), sipClass_QString)) == NULL)
++ PyObject *binst = NULL;
+ if (((ainst = sipConvertFromNewType(new QString(acpp), sipType_QString, sipTransferObj)) == NULL)
+ || ((binst = sipConvertFromNewType(new QString(bcpp), sipType_QString, sipTransferObj)) == NULL)
|| (PyDict_SetItem (dict, ainst, binst) < 0))
@@ -1030,7 +1050,7 @@ diff -ruN PyKDE-3.16.2/sip/kdecore/kmoun
diff -ruN PyKDE-3.16.2/sip/kdecore/ktimezones.sip PyKDE-3.16.3/sip/kdecore/ktimezones.sip
--- PyKDE-3.16.2/sip/kdecore/ktimezones.sip 2008-03-04 20:47:14.000000000 +0000
-+++ PyKDE-3.16.3/sip/kdecore/ktimezones.sip 2009-06-10 22:39:03.000000000 +0100
++++ PyKDE-3.16.3/sip/kdecore/ktimezones.sip 2009-06-12 13:26:33.000000000 +0100
@@ -162,7 +162,7 @@
return PyInstance_Check(sipPy);
@@ -1040,14 +1060,16 @@ diff -ruN PyKDE-3.16.2/sip/kdecore/ktime
if (iserr)
{
-@@ -212,8 +212,8 @@
+@@ -211,9 +211,9 @@
+ QString acpp = it.key ();
KTimezone *bcpp = it.data ();
PyObject *ainst;
- PyObject *binst;
+- PyObject *binst;
- if (((ainst = sipBuildResult (NULL, "N", new QString (acpp), sipClass_QString)) == NULL)
- || ((binst = sipBuildResult (NULL, "N", (KTimezone *) bcpp, sipClass_KTimezone)) == NULL)
++ PyObject *binst = NULL;
+ if (((ainst = sipConvertFromNewType(new QString(acpp), sipType_QString, sipTransferObj)) == NULL)
-+ || ((binst = sipConvertFromType((KTimezone *)bcpp, sipType_KTimezone, sipTransferObj)) == NULL)
++ || ((binst = sipConvertFromType(bcpp, sipType_KTimezone, sipTransferObj)) == NULL)
|| (PyDict_SetItem (dict, ainst, binst) < 0))
{
Py_XDECREF (ainst);
@@ -1087,6 +1109,18 @@ diff -ruN PyKDE-3.16.2/sip/kdecore/ktime
}
*sipCppPtr = cppmap;
+diff -ruN PyKDE-3.16.2/sip/kdecore/kwinmodule.sip PyKDE-3.16.3/sip/kdecore/kwinmodule.sip
+--- PyKDE-3.16.2/sip/kdecore/kwinmodule.sip 2008-11-13 22:38:37.000000000 +0000
++++ PyKDE-3.16.3/sip/kdecore/kwinmodule.sip 2009-06-12 13:34:31.000000000 +0100
+@@ -138,7 +138,7 @@
+ for (int i = 0; i < PyList_Size (sipPy); i++)
+ {
+ elem = PyList_GET_ITEM (sipPy, i);
+- cpp = (WId) PyInt_AS_LONG (&elem);
++ cpp = (WId) PyInt_AS_LONG (elem);
+ if (iserr)
+ {
+ *sipIsErr = 1;
diff -ruN PyKDE-3.16.2/sip/kdeprint/kmjobmanager.sip PyKDE-3.16.3/sip/kdeprint/kmjobmanager.sip
--- PyKDE-3.16.2/sip/kdeprint/kmjobmanager.sip 2008-03-04 20:47:14.000000000 +0000
+++ PyKDE-3.16.3/sip/kdeprint/kmjobmanager.sip 2009-06-10 18:10:04.000000000 +0100
@@ -1680,7 +1714,7 @@ diff -ruN PyKDE-3.16.2/sip/kio/kmimetype
diff -ruN PyKDE-3.16.2/sip/kio/kprotocolinfo.sip PyKDE-3.16.3/sip/kio/kprotocolinfo.sip
--- PyKDE-3.16.2/sip/kio/kprotocolinfo.sip 2008-03-04 20:47:14.000000000 +0000
-+++ PyKDE-3.16.3/sip/kio/kprotocolinfo.sip 2009-06-10 21:10:40.000000000 +0100
++++ PyKDE-3.16.3/sip/kio/kprotocolinfo.sip 2009-06-12 13:43:51.000000000 +0100
@@ -198,10 +198,10 @@
// Convert a Python instance to a Ptr on the heap.
@@ -1699,7 +1733,7 @@ diff -ruN PyKDE-3.16.2/sip/kio/kprotocol
for( it = cpplist->begin(); it != cpplist->end(); ++it )
{
- if (((inst = sipBuildResult (NULL, "N", new KProtocolInfo::ExtraField (*it), sipClass_KProtocolInfo_ExtraField)) == NULL)
-+ if (((inst = sipConvertToNewType(new KProtocolInfo::ExtraField(*it), sipType_KProtocolInfo_ExtraField, NULL)) == NULL)
++ if (((inst = sipConvertFromNewType(new KProtocolInfo::ExtraField(*it), sipType_KProtocolInfo_ExtraField, sipTransferObj)) == NULL)
|| PyList_Append (pylist, inst) < 0)
{
Py_DECREF (pylist);
More information about the fedora-extras-commits
mailing list