Python 2.5 compatibility.

(Portage version: 2.1.2_pre3-r6)

2 files changed, 227 insertions, 0 deletions

diff --git a/kde-base/pykde/files/digest-pykde-3.5.5-r1 b/kde-base/pykde/files/digest-pykde-3.5.5-r1
new file mode 100644
index 000000000000..d6542e599565
--- /dev/null
+++ b/kde-base/pykde/files/digest-pykde-3.5.5-r1
@@ -0,0 +1,3 @@
+MD5 e0da219943407a786c2ceea1605fadd1 kdebindings-3.5.5.tar.bz2 5419613
+RMD160 8515555111e2745f63b403d3255ff5521bf77875 kdebindings-3.5.5.tar.bz2 5419613
+SHA256 54751d3fe6635abf7bb8ef08ff240354e56dfaaa02cd16b1dd2a837706c4b274 kdebindings-3.5.5.tar.bz2 5419613
diff --git a/kde-base/pykde/files/pykde-3.5.5-python-2.5-compat.diff b/kde-base/pykde/files/pykde-3.5.5-python-2.5-compat.diff
new file mode 100644
index 000000000000..96c43bc33360
--- /dev/null
+++ b/kde-base/pykde/files/pykde-3.5.5-python-2.5-compat.diff
@@ -0,0 +1,224 @@
+--- sip/kio/authinfo.sip	2005/09/29 14:33:08	465369
++++ sip/kio/authinfo.sip	2006/10/11 22:54:45	594670
+@@ -176,7 +176,7 @@
+     QMap<QString, QStringList> *map = new QMap<QString, QStringList>;
+ 
+     PyObject *key, *value;
+-    int pos = 0;
++    ssize_t pos = 0;
+     QString *sKey;
+     QStringList *sData;
+ 
+--- sip/kparts/browserextension.sip	2005/09/29 14:33:08	465369
++++ sip/kparts/browserextension.sip	2006/10/11 22:54:45	594670
+@@ -404,7 +404,7 @@
+     QMap<QCString,QCString> *cppmap = new QMap<QCString,QCString>;
+ 
+     PyObject *aelem, *belem;
+-    int pos = 0;
++    ssize_t pos = 0;
+     QCString *acpp;
+     QCString *bcpp;
+ 
+@@ -487,7 +487,7 @@
+     QMap<QCString,int> *cppmap = new QMap<QCString,int>;
+ 
+     PyObject *aelem, *belem;
+-    int pos = 0;
++    ssize_t pos = 0;
+     QCString *acpp;
+     int bcpp;
+ 
+--- sip/kdecore/bytearray.sip	2005/09/29 14:33:08	465369
++++ sip/kdecore/bytearray.sip	2006/10/11 22:54:45	594670
+@@ -620,7 +620,7 @@
+     QMap<QCString,DCOPRef> *cppmap = new QMap<QCString,DCOPRef>;
+ 
+     PyObject *aelem, *belem;
+-    int pos = 0;
++    ssize_t pos = 0;
+     QCString *acpp;
+     DCOPRef *bcpp;
+ 
+@@ -705,7 +705,7 @@
+     QMap<QString,DCOPRef> *cppmap = new QMap<QString,DCOPRef>;
+ 
+     PyObject *aelem, *belem;
+-    int pos = 0;
++    ssize_t pos = 0;
+     QString *acpp;
+     DCOPRef *bcpp;
+ 
+--- sip/kio/global.sip	2005/09/29 14:33:08	465369
++++ sip/kio/global.sip	2006/10/11 22:54:45	594670
+@@ -675,7 +675,7 @@
+     QMap<QString,QString> *cppmap = new QMap<QString,QString>;
+ 
+     PyObject *aelem, *belem;
+-    int pos = 0;
++    ssize_t pos = 0;
+     QString *acpp;
+     QString *bcpp;
+ 
+--- sip/kdecore/kaccel.sip	2005/09/29 14:33:08	465369
++++ sip/kdecore/kaccel.sip	2006/10/11 22:54:45	594670
+@@ -209,7 +209,7 @@
+     QMap<int,QString> *map = new QMap<int,QString>;
+ 
+         PyObject *key, *value;
+-        int pos = 0;
++        ssize_t pos = 0;
+         int iKey;
+         QString *sData;
+ 
+--- sip/kdecore/kcompletion.sip	2005/09/29 14:33:08	465369
++++ sip/kdecore/kcompletion.sip	2006/10/11 22:54:45	594670
+@@ -201,7 +201,7 @@
+     QMap<KCompletionBase::KeyBindingType,KShortcut> *kbmap = new QMap<KCompletionBase::KeyBindingType,KShortcut>;
+ 
+     PyObject *key, *value;
+-        int pos = 0;
++        ssize_t pos = 0;
+         KShortcut *cValue;
+         int iserr;
+ 
+--- sip/kdecore/kconfig.sip	2005/09/29 14:33:08	465369
++++ sip/kdecore/kconfig.sip	2006/10/11 22:54:45	594670
+@@ -158,7 +158,7 @@
+     QMap<QString,QString> *cppmap = new QMap<QString,QString>;
+ 
+     PyObject *aelem, *belem;
+-    int pos = 0;
++    ssize_t  pos = 0;
+     QString *acpp;
+     QString *bcpp;
+ 
+--- sip/kdecore/kconfigdata.sip	2005/09/29 14:33:08	465369
++++ sip/kdecore/kconfigdata.sip	2006/10/11 22:54:45	594670
+@@ -141,7 +141,7 @@
+     QMap<KEntryKey,KEntry> *cppmap = new QMap<KEntryKey,KEntry>;
+ 
+     PyObject *aelem, *belem;
+-    int pos = 0;
++    ssize_t pos = 0;
+     KEntryKey *acpp;
+     KEntry *bcpp;
+ 
+--- sip/kdeui/kkeydialog.sip	2005/09/29 14:33:08	465369
++++ sip/kdeui/kkeydialog.sip	2006/10/11 22:54:45	594670
+@@ -231,7 +231,7 @@
+     QDict<int>* qdict = new QDict<int>;
+ 
+     PyObject *key, *value;
+-    int pos = 0;
++    ssize_t pos = 0;
+     QString *a0;
+     int a1;
+ 
+--- sip/kdecore/kmacroexpander.sip	2005/09/29 14:33:08	465369
++++ sip/kdecore/kmacroexpander.sip	2006/10/11 22:54:45	594670
+@@ -169,7 +169,7 @@
+     QMap<QChar,QString> *map = new QMap<QChar,QString>;
+ 
+     PyObject *key, *value;
+-    int pos = 0;
++    ssize_t pos = 0;
+     QChar *cKey;
+     QString *sData;
+ 
+@@ -255,7 +255,7 @@
+     QMap<QString, QStringList> *map = new QMap<QString, QStringList>;
+ 
+     PyObject *key, *value;
+-    int pos = 0;
++    ssize_t pos = 0;
+     QString *sKey;
+     QStringList *slData;
+ 
+@@ -343,7 +343,7 @@
+     QMap<QChar,QStringList> *map = new QMap<QChar,QStringList>;
+ 
+     PyObject *key, *value;
+-    int pos = 0;
++    ssize_t pos = 0;
+     QChar *cKey;
+     QStringList *slData;
+ 
+--- sip/kmdi/kmdichildfrm.sip	2005/09/29 14:33:08	465369
++++ sip/kmdi/kmdichildfrm.sip	2006/10/11 22:54:45	594670
+@@ -245,7 +245,7 @@
+     QDict<QWidget::FocusPolicy>* qdict = new QDict<QWidget::FocusPolicy>;
+ 
+     PyObject *key, *value;
+-    int pos = 0;
++    ssize_t pos = 0;
+     QString *a0;
+     QWidget::FocusPolicy a1;
+ 
+--- sip/kio/kservicetype.sip	2005/09/29 14:33:08	465369
++++ sip/kio/kservicetype.sip	2006/10/11 22:54:45	594670
+@@ -184,7 +184,7 @@
+     QMap<QString,QVariant::Type> *cppmap = new QMap<QString,QVariant::Type>;
+ 
+     PyObject *aelem, *belem;
+-    int pos = 0;
++    ssize_t pos = 0;
+     QString *acpp;
+     QVariant::Type bcpp;
+ 
+--- sip/kdecore/kurl.sip	2005/09/29 14:33:08	465369
++++ sip/kdecore/kurl.sip	2006/10/11 22:54:45	594670
+@@ -234,7 +234,7 @@
+         void                 __setitem__ (int, const KURL&);
+ %MethodCode
+ //takes index | (int) | value | (KURL)
+-    int len;
++    ssize_t len;
+ 
+     len = sipCpp -> count();
+ 
+@@ -248,7 +248,7 @@
+ %MethodCode
+ //takes range | (a Python slice) | urlList | (KURL.List)
+ 
+-    int len, start, stop, step, slicelength;
++    ssize_t len, start, stop, step, slicelength;
+ 
+     len = sipCpp -> count();
+ 
+@@ -278,7 +278,7 @@
+         void                 __delitem__ (int);
+ %MethodCode
+ //takes index | (int)
+-    int len;
++    ssize_t len;
+ 
+     len = sipCpp -> count();
+ 
+@@ -291,7 +291,7 @@
+         void                 __delitem__ (SIP_PYSLICE);
+ %MethodCode
+ //takes range | (a Python slice)
+-    int len, start, stop, step, slicelength;
++    ssize_t len, start, stop, step, slicelength;
+ 
+     len = sipCpp -> count();
+     if (sipConvertFromSliceObject(a0,len,&start,&stop,&step,&slicelength) < 0)
+@@ -308,7 +308,7 @@
+ %MethodCode
+ //returns (KURL)
+ //takes index | (int)
+-    int len;
++    ssize_t len;
+ 
+     len = sipCpp -> count();
+ 
+@@ -322,7 +322,7 @@
+ %MethodCode
+ //returns (KURL.List)
+ //takes range | (a Python slice)
+-    int len, start, stop, step, slicelength;
++    ssize_t len, start, stop, step, slicelength;
+ 
+     len = sipCpp -> count();
+