Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Wulf Krueger (philantrop)" <philantrop@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in kde-base/pykde/files: pykde-3.5.8-python-2.5-compat.diff
Date: Mon, 29 Oct 2007 07:39:06
Message-Id: E1ImPDA-0003To-MT@stork.gentoo.org
1 philantrop 07/10/29 07:39:00
2
3 Added: pykde-3.5.8-python-2.5-compat.diff
4 Log:
5 Added a patch for Python 2.5 compatibility and some other fixes.
6 (Portage version: 2.1.3.15)
7
8 Revision Changes Path
9 1.1 kde-base/pykde/files/pykde-3.5.8-python-2.5-compat.diff
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/pykde/files/pykde-3.5.8-python-2.5-compat.diff?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/pykde/files/pykde-3.5.8-python-2.5-compat.diff?rev=1.1&content-type=text/plain
13
14 Index: pykde-3.5.8-python-2.5-compat.diff
15 ===================================================================
16 Nur in PyKDE-3.16.0.py25: dcop.
17 diff -ru PyKDE-3.16.0/sip/kdecore/bytearray.sip PyKDE-3.16.0.py25/sip/kdecore/bytearray.sip
18 --- PyKDE-3.16.0/sip/kdecore/bytearray.sip 2006-09-22 07:53:14.000000000 +0200
19 +++ PyKDE-3.16.0.py25/sip/kdecore/bytearray.sip 2006-12-23 15:42:13.000000000 +0100
20 @@ -633,7 +633,7 @@
21 QMap<QCString,DCOPRef> *cppmap = new QMap<QCString,DCOPRef>;
22
23 PyObject *aelem, *belem;
24 - int pos = 0;
25 + SIP_SSIZE_T pos = 0;
26 QCString *acpp;
27 DCOPRef *bcpp;
28
29 @@ -717,7 +717,7 @@
30 QMap<QString,DCOPRef> *cppmap = new QMap<QString,DCOPRef>;
31
32 PyObject *aelem, *belem;
33 - int pos = 0;
34 + SIP_SSIZE_T pos = 0;
35 QString *acpp;
36 DCOPRef *bcpp;
37
38 diff -ru PyKDE-3.16.0/sip/kdecore/kaccel.sip PyKDE-3.16.0.py25/sip/kdecore/kaccel.sip
39 --- PyKDE-3.16.0/sip/kdecore/kaccel.sip 2006-09-22 05:11:16.000000000 +0200
40 +++ PyKDE-3.16.0.py25/sip/kdecore/kaccel.sip 2006-12-23 15:42:22.000000000 +0100
41 @@ -209,7 +209,7 @@
42 QMap<int,QString> *map = new QMap<int,QString>;
43
44 PyObject *key, *value;
45 - int pos = 0;
46 + SIP_SSIZE_T pos = 0;
47 int iKey;
48 QString *sData;
49
50 diff -ru PyKDE-3.16.0/sip/kdecore/kcompletion.sip PyKDE-3.16.0.py25/sip/kdecore/kcompletion.sip
51 --- PyKDE-3.16.0/sip/kdecore/kcompletion.sip 2006-09-22 05:11:16.000000000 +0200
52 +++ PyKDE-3.16.0.py25/sip/kdecore/kcompletion.sip 2006-12-23 15:42:31.000000000 +0100
53 @@ -201,7 +201,7 @@
54 QMap<KCompletionBase::KeyBindingType,KShortcut> *kbmap = new QMap<KCompletionBase::KeyBindingType,KShortcut>;
55
56 PyObject *key, *value;
57 - int pos = 0;
58 + SIP_SSIZE_T pos = 0;
59 KShortcut *cValue;
60 int iserr;
61
62 diff -ru PyKDE-3.16.0/sip/kdecore/kconfigdata.sip PyKDE-3.16.0.py25/sip/kdecore/kconfigdata.sip
63 --- PyKDE-3.16.0/sip/kdecore/kconfigdata.sip 2006-09-22 05:11:16.000000000 +0200
64 +++ PyKDE-3.16.0.py25/sip/kdecore/kconfigdata.sip 2006-12-23 15:42:39.000000000 +0100
65 @@ -146,7 +146,7 @@
66 KEntryMap *cppmap = new KEntryMap;
67
68 PyObject *aelem, *belem;
69 - int pos = 0;
70 + SIP_SSIZE_T pos = 0;
71 KEntryKey *acpp;
72 KEntry *bcpp;
73
74 diff -ru PyKDE-3.16.0/sip/kdecore/kconfig.sip PyKDE-3.16.0.py25/sip/kdecore/kconfig.sip
75 --- PyKDE-3.16.0/sip/kdecore/kconfig.sip 2006-09-22 05:11:16.000000000 +0200
76 +++ PyKDE-3.16.0.py25/sip/kdecore/kconfig.sip 2006-12-23 15:42:45.000000000 +0100
77 @@ -158,7 +158,7 @@
78 QMap<QString,QString> *cppmap = new QMap<QString,QString>;
79
80 PyObject *aelem, *belem;
81 - int pos = 0;
82 + SIP_SSIZE_T pos = 0;
83 QString *acpp;
84 QString *bcpp;
85
86 diff -ru PyKDE-3.16.0/sip/kdecore/kmacroexpander.sip PyKDE-3.16.0.py25/sip/kdecore/kmacroexpander.sip
87 --- PyKDE-3.16.0/sip/kdecore/kmacroexpander.sip 2006-09-22 05:11:16.000000000 +0200
88 +++ PyKDE-3.16.0.py25/sip/kdecore/kmacroexpander.sip 2006-12-23 15:42:57.000000000 +0100
89 @@ -169,7 +169,7 @@
90 QMap<QChar,QString> *map = new QMap<QChar,QString>;
91
92 PyObject *key, *value;
93 - int pos = 0;
94 + SIP_SSIZE_T pos = 0;
95 QChar *cKey;
96 QString *sData;
97
98 @@ -251,7 +251,7 @@
99 QMap<QString, QStringList> *map = new QMap<QString, QStringList>;
100
101 PyObject *key, *value;
102 - int pos = 0;
103 + SIP_SSIZE_T pos = 0;
104 QString *sKey;
105 QStringList *slData;
106
107 @@ -334,7 +334,7 @@
108 QMap<QChar,QStringList> *map = new QMap<QChar,QStringList>;
109
110 PyObject *key, *value;
111 - int pos = 0;
112 + SIP_SSIZE_T pos = 0;
113 QChar *cKey;
114 QStringList *slData;
115
116 diff -ru PyKDE-3.16.0/sip/kdecore/ktimezones.sip PyKDE-3.16.0.py25/sip/kdecore/ktimezones.sip
117 --- PyKDE-3.16.0/sip/kdecore/ktimezones.sip 2006-09-22 05:11:16.000000000 +0200
118 +++ PyKDE-3.16.0.py25/sip/kdecore/ktimezones.sip 2006-12-23 15:43:04.000000000 +0100
119 @@ -240,7 +240,7 @@
120 QMap<QString, KTimezone*> *cppmap = new QMap<QString, KTimezone*>;
121
122 PyObject *aelem, *belem;
123 - int pos = 0;
124 + SIP_SSIZE_T pos = 0;
125 QString *acpp;
126 KTimezone *bcpp;
127
128 diff -ru PyKDE-3.16.0/sip/kdecore/kurl.sip PyKDE-3.16.0.py25/sip/kdecore/kurl.sip
129 --- PyKDE-3.16.0/sip/kdecore/kurl.sip 2006-09-22 05:11:16.000000000 +0200
130 +++ PyKDE-3.16.0.py25/sip/kdecore/kurl.sip 2006-12-23 15:43:18.000000000 +0100
131 @@ -248,7 +248,7 @@
132 %MethodCode
133 //takes range | (a Python slice) | urlList | (KURL.List)
134
135 - int len, start, stop, step, slicelength;
136 + SIP_SSIZE_T len, start, stop, step, slicelength;
137
138 len = sipCpp -> count();
139
140 @@ -291,7 +291,7 @@
141 void __delitem__ (SIP_PYSLICE);
142 %MethodCode
143 //takes range | (a Python slice)
144 - int len, start, stop, step, slicelength;
145 + SIP_SSIZE_T len, start, stop, step, slicelength;
146
147 len = sipCpp -> count();
148 if (sipConvertFromSliceObject(a0,len,&start,&stop,&step,&slicelength) < 0)
149 @@ -322,7 +322,7 @@
150 %MethodCode
151 //returns (KURL.List)
152 //takes range | (a Python slice)
153 - int len, start, stop, step, slicelength;
154 + SIP_SSIZE_T len, start, stop, step, slicelength;
155
156 len = sipCpp -> count();
157
158 diff -ru PyKDE-3.16.0/sip/kdeui/kkeydialog.sip PyKDE-3.16.0.py25/sip/kdeui/kkeydialog.sip
159 --- PyKDE-3.16.0/sip/kdeui/kkeydialog.sip 2006-09-22 05:11:15.000000000 +0200
160 +++ PyKDE-3.16.0.py25/sip/kdeui/kkeydialog.sip 2006-12-23 15:43:23.000000000 +0100
161 @@ -231,7 +231,7 @@
162 QDict<int>* qdict = new QDict<int>;
163
164 PyObject *key, *value;
165 - int pos = 0;
166 + SIP_SSIZE_T pos = 0;
167 QString *a0;
168 int a1;
169
170 diff -ru PyKDE-3.16.0/sip/kio/authinfo.sip PyKDE-3.16.0.py25/sip/kio/authinfo.sip
171 --- PyKDE-3.16.0/sip/kio/authinfo.sip 2006-09-22 05:11:14.000000000 +0200
172 +++ PyKDE-3.16.0.py25/sip/kio/authinfo.sip 2006-12-23 15:43:28.000000000 +0100
173 @@ -176,7 +176,7 @@
174 QMap<QString, QStringList> *map = new QMap<QString, QStringList>;
175
176 PyObject *key, *value;
177 - int pos = 0;
178 + SIP_SSIZE_T pos = 0;
179 QString *sKey;
180 QStringList *sData;
181
182 diff -ru PyKDE-3.16.0/sip/kio/global.sip PyKDE-3.16.0.py25/sip/kio/global.sip
183 --- PyKDE-3.16.0/sip/kio/global.sip 2006-09-22 05:11:14.000000000 +0200
184 +++ PyKDE-3.16.0.py25/sip/kio/global.sip 2006-12-23 15:43:33.000000000 +0100
185 @@ -702,7 +702,7 @@
186 QMap<QString,QString> *cppmap = new QMap<QString,QString>;
187
188 PyObject *aelem, *belem;
189 - int pos = 0;
190 + SIP_SSIZE_T pos = 0;
191 QString *acpp;
192 QString *bcpp;
193
194 diff -ru PyKDE-3.16.0/sip/kio/kservicetype.sip PyKDE-3.16.0.py25/sip/kio/kservicetype.sip
195 --- PyKDE-3.16.0/sip/kio/kservicetype.sip 2006-09-22 05:11:14.000000000 +0200
196 +++ PyKDE-3.16.0.py25/sip/kio/kservicetype.sip 2006-12-23 15:43:44.000000000 +0100
197 @@ -183,7 +183,7 @@
198 QMap<QString,QVariant::Type> *cppmap = new QMap<QString,QVariant::Type>;
199
200 PyObject *aelem, *belem;
201 - int pos = 0;
202 + SIP_SSIZE_T pos = 0;
203 QString *acpp;
204 QVariant::Type bcpp;
205
206 diff -ru PyKDE-3.16.0/sip/kmdi/kmdichildfrm.sip PyKDE-3.16.0.py25/sip/kmdi/kmdichildfrm.sip
207 --- PyKDE-3.16.0/sip/kmdi/kmdichildfrm.sip 2006-09-22 05:11:14.000000000 +0200
208 +++ PyKDE-3.16.0.py25/sip/kmdi/kmdichildfrm.sip 2006-12-23 15:39:49.000000000 +0100
209 @@ -245,7 +245,7 @@
210 QDict<QWidget::FocusPolicy>* qdict = new QDict<QWidget::FocusPolicy>;
211
212 PyObject *key, *value;
213 - int pos = 0;
214 + SIP_SSIZE_T pos = 0;
215 QString *a0;
216 QWidget::FocusPolicy a1;
217
218 diff -ru PyKDE-3.16.0/sip/kparts/browserextension.sip PyKDE-3.16.0.py25/sip/kparts/browserextension.sip
219 --- PyKDE-3.16.0/sip/kparts/browserextension.sip 2006-09-22 05:11:15.000000000 +0200
220 +++ PyKDE-3.16.0.py25/sip/kparts/browserextension.sip 2006-12-23 15:33:51.000000000 +0100
221 @@ -419,7 +419,7 @@
222 QMap<QCString,QCString> *cppmap = new QMap<QCString,QCString>;
223
224 PyObject *aelem, *belem;
225 - int pos = 0;
226 + SIP_SSIZE_T pos = 0;
227 QCString *acpp;
228 QCString *bcpp;
229
230 @@ -503,7 +503,7 @@
231 QMap<QCString,int> *cppmap = new QMap<QCString,int>;
232
233 PyObject *aelem, *belem;
234 - int pos = 0;
235 + SIP_SSIZE_T pos = 0;
236 QCString *acpp;
237 int bcpp;
238
239
240
241
242 --
243 gentoo-commits@g.o mailing list
Report Message
Find on MARC Find on Google Groups