rpms/PyKDE/devel PyKDE-3.16.3.patch,1.2,1.3 PyKDE.spec,1.25,1.26

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/PyKDE/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8745

Modified Files:
	PyKDE-3.16.3.patch PyKDE.spec 
Log Message:
patch respin


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.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- PyKDE-3.16.3.patch	12 Jun 2009 13:04:48 -0000	1.2
+++ PyKDE-3.16.3.patch	12 Jun 2009 14:15:33 -0000	1.3
@@ -1374,11 +1374,35 @@ diff -ruN PyKDE-3.16.2/sip/kfile/knotify
  
          if (iserr)
          {
+diff -ruN PyKDE-3.16.2/sip/khtml/dom_string.sip PyKDE-3.16.3/sip/khtml/dom_string.sip
+--- PyKDE-3.16.2/sip/khtml/dom_string.sip	2006-09-22 04:11:13.000000000 +0100
++++ PyKDE-3.16.3/sip/khtml/dom_string.sip	2009-06-12 15:08:32.000000000 +0100
+@@ -44,11 +44,6 @@
+     DOM::DOMString       operator + (const DOM::DOMString&);
+     void                 insert (DOM::DOMString, uint);
+     const QChar&         operator [] (uint) const;
+-%MethodCode
+-//returns (QChar)
+-//takes index | uint
+-    sipRes = &((*sipCpp)[a0]);
+-%End
+ 
+     int                  find (const QChar, int = 0) const;
+     uint                 length () const;
 diff -ruN PyKDE-3.16.2/sip/khtml/khtml_settings.sip PyKDE-3.16.3/sip/khtml/khtml_settings.sip
 --- PyKDE-3.16.2/sip/khtml/khtml_settings.sip	2008-03-04 20:47:14.000000000 +0000
-+++ PyKDE-3.16.3/sip/khtml/khtml_settings.sip	2009-06-10 22:41:39.000000000 +0100
-@@ -235,8 +235,8 @@
++++ PyKDE-3.16.3/sip/khtml/khtml_settings.sip	2009-06-12 15:00:58.000000000 +0100
+@@ -227,16 +227,16 @@
+         return NULL;
+ 
+     QValueList<AssignPair> *cpplist = (QValueList<AssignPair> *)sipCpp;
+-    PyObject *inst;
+ 
+     // Get it.
+     QValueList<AssignPair>::Iterator it;
+     for( it = cpplist->begin(); it != cpplist->end(); ++it )
      {
++        PyObject *inst = NULL;
          QString s = (*it).first;
          QChar c  = (*it).second;
 -        PyObject *pys = sipBuildResult (NULL, "N", new QString (s), sipClass_QString);
@@ -2194,13 +2218,15 @@ diff -ruN PyKDE-3.16.2/sip/kmdi/kmdimain
          {
 diff -ruN PyKDE-3.16.2/sip/kparts/browserextension.sip PyKDE-3.16.3/sip/kparts/browserextension.sip
 --- PyKDE-3.16.2/sip/kparts/browserextension.sip	2008-03-04 20:47:14.000000000 +0000
-+++ PyKDE-3.16.3/sip/kparts/browserextension.sip	2009-06-10 21:42:21.000000000 +0100
-@@ -393,8 +393,8 @@
++++ PyKDE-3.16.3/sip/kparts/browserextension.sip	2009-06-12 14:59:48.000000000 +0100
+@@ -392,9 +392,9 @@
+         QCString acpp = it.key ();
          QCString 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 QCString (bcpp), sipClass_QCString)) == NULL)
++        PyObject *binst = NULL;
 +        if (((ainst = sipConvertFromNewType(new QCString (acpp), sipType_QCString, NULL)) == NULL)
 +            || ((binst = sipConvertFromNewType(new QCString (bcpp), sipType_QCString, NULL)) == NULL)
              || (PyDict_SetItem (dict, ainst, binst) < 0))
@@ -2225,11 +2251,13 @@ diff -ruN PyKDE-3.16.2/sip/kparts/browse
  
          if (iserr)
          {
-@@ -477,7 +476,7 @@
+@@ -476,8 +475,8 @@
+         QCString acpp = it.key ();
          int bcpp = it.data ();
          PyObject *ainst;
-         PyObject *binst;
+-        PyObject *binst;
 -        if (((ainst = sipBuildResult (NULL, "N", new QCString (acpp), sipClass_QCString)) == NULL)
++        PyObject *binst = NULL;
 +        if (((ainst = sipConvertFromNewType(new QCString (acpp), sipType_QCString, NULL)) == NULL)
              || ((binst = PyInt_FromLong (bcpp)) < 0)
              || (PyDict_SetItem (dict, ainst, binst) < 0))


Index: PyKDE.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PyKDE/devel/PyKDE.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- PyKDE.spec	11 Jun 2009 22:23:40 -0000	1.25
+++ PyKDE.spec	12 Jun 2009 14:15:33 -0000	1.26
@@ -79,7 +79,9 @@ unset QTDIR || : ; source /etc/profile.d
   -d %{python_sitearch} \
   -i
 
-make %{?_smp_mflags}
+# debuging
+make -k
+#make %{?_smp_mflags}
 
 
 %install