SOURCES: python-PyKDE-sip.patch (NEW) - added patch against sip 4.7
blekot
blekot at pld-linux.org
Mon Oct 8 19:36:49 CEST 2007
Author: blekot Date: Mon Oct 8 17:36:49 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- added patch against sip 4.7
---- Files affected:
SOURCES:
python-PyKDE-sip.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/python-PyKDE-sip.patch
diff -u /dev/null SOURCES/python-PyKDE-sip.patch:1.1
--- /dev/null Mon Oct 8 19:36:49 2007
+++ SOURCES/python-PyKDE-sip.patch Mon Oct 8 19:36:44 2007
@@ -0,0 +1,1258 @@
+diff -ru PyKDE-3.16.0.orig/configure.py PyKDE-3.16.0/configure.py
+--- PyKDE-3.16.0.orig/configure.py 2006-09-22 09:05:49.000000000 +0100
++++ PyKDE-3.16.0/configure.py 2007-06-23 09:55:29.000000000 +0100
+@@ -54,8 +54,7 @@
+ kde_version_extra = None
+ kde_max_version = 0x030503
+
+-sip_min_v3_version = 0x040400
+-sip_min_v4_version = 0x040400
++sip_min_v4_version = 0x040501
+ qt_min_version = 0x030200
+ pyqt_min_version = 0x031000
+
+@@ -176,12 +175,8 @@
+ if sipcfg.sip_version_str[:8] != "snapshot":
+ minv = None
+
+- if sipcfg.sip_version >= 0x040000:
+- if sipcfg.sip_version < sip_min_v4_version:
+- minv = sip_min_v4_version
+- else:
+- if sipcfg.sip_version < sip_min_v3_version:
+- minv = sip_min_v3_version
++ if sipcfg.sip_version < sip_min_v4_version:
++ minv = sip_min_v4_version
+
+ if minv:
+ sipcfg.error("This version of PyKDE requires SIP v%s or later" % sipcfg.version_to_string(minv))
+diff -ru PyKDE-3.16.0.orig/postproc PyKDE-3.16.0/postproc
+--- PyKDE-3.16.0.orig/postproc 2006-05-25 02:28:45.000000000 +0100
++++ PyKDE-3.16.0/postproc 2007-06-23 09:55:29.000000000 +0100
+@@ -508,9 +508,9 @@
+ sys.exit (-1)
+
+ elif operation == "fixQVariant":
+- if not fixQVariant ():
++ """if not fixQVariant ():
+ print "operation error -- fixQVariant"
+- sys.exit (-1)
++ sys.exit (-1)"""
+
+ elif operation == "fixSignal":
+ if not fixSignal (filelist):
+diff -ru PyKDE-3.16.0.orig/pykdeconfig.py PyKDE-3.16.0/pykdeconfig.py
+--- PyKDE-3.16.0.orig/pykdeconfig.py 2006-09-22 09:04:46.000000000 +0100
++++ PyKDE-3.16.0/pykdeconfig.py 2007-06-25 12:04:57.000000000 +0100
+@@ -28,18 +28,18 @@
+ # These are installation specific values created when PyQt was configured.
+ _pkg_config = {
+ 'dist_name': '',
+- 'kde_version': 0x030402,
+- 'kde_version_extra': 'kde342',
+- 'kde_version_sfx': '-kde342.diff',
+- 'kde_version_str': '3.4.2',
+- 'kdebasedir': '/opt/kde3',
+- 'kdeincdir': '/opt/kde3/include',
+- 'kdelibdir': '/opt/kde3/lib64',
++ 'kde_version': 0x030503,
++ 'kde_version_extra': 'kde353',
++ 'kde_version_sfx': '-kde353.diff',
++ 'kde_version_str': '3.5.3',
++ 'kdebasedir': '/usr/kde/3.5',
++ 'kdeincdir': '/usr/kde/3.5/include',
++ 'kdelibdir': '/usr/kde/3.5/lib',
+ 'libdir': 'lib',
+- 'pykde_kde_sip_flags': '-t ALL -x Qt_STYLE_WINDOWSXP -x Qt_STYLE_INTERLACE -x Qt_STYLE_WINDOWSXP -x VendorID -t WS_X11 -t Qt_3_3_0 -t KDE_3_4_2',
+- 'pykde_mod_dir': '/usr/lib/python2.4/site-packages',
++ 'pykde_kde_sip_flags': '-t ALL -x Qt_STYLE_WINDOWSXP -x Qt_STYLE_INTERLACE -x Qt_STYLE_WINDOWSXP -x VendorID -t WS_X11 -t Qt_3_3_6 -t KDE_3_5_3',
++ 'pykde_mod_dir': '/home/phil/usr/lib/python2.5/site-packages',
+ 'pykde_modules': 'dcop kdecore kdefx kdeui kio kresources kabc kutils kfile kparts khtml kspell kdeprint kmdi',
+- 'pykde_sip_dir': '/usr/share/sip',
++ 'pykde_sip_dir': '/home/phil/usr/share/sip',
+ 'pykde_version': 0x031000,
+ 'pykde_version_str': '3.16.0'
+ }
+diff -ru PyKDE-3.16.0.orig/sip/kabc/addressbook.sip PyKDE-3.16.0/sip/kabc/addressbook.sip
+--- PyKDE-3.16.0.orig/sip/kabc/addressbook.sip 2006-09-22 04:11:14.000000000 +0100
++++ PyKDE-3.16.0/sip/kabc/addressbook.sip 2007-06-23 09:55:29.000000000 +0100
+@@ -162,7 +162,6 @@
+ {
+ %TypeHeaderCode
+ #include <qptrlist.h>
+-#include <sipkabcKABCResource.h>
+ %End
+
+ %ConvertFromTypeCode
+diff -ru PyKDE-3.16.0.orig/sip/kabc/addressee.sip PyKDE-3.16.0/sip/kabc/addressee.sip
+--- PyKDE-3.16.0.orig/sip/kabc/addressee.sip 2006-05-25 02:27:36.000000000 +0100
++++ PyKDE-3.16.0/sip/kabc/addressee.sip 2007-06-23 09:55:29.000000000 +0100
+@@ -337,7 +337,6 @@
+ {
+ %TypeHeaderCode
+ #include <qvaluelist.h>
+-#include <sipkabcKABCAddressee.h>
+ //typedef QValueList<KABC::Addressee> List;
+ %End
+
+@@ -405,7 +404,6 @@
+ {
+ %TypeHeaderCode
+ #include <qvaluelist.h>
+-#include <sipkabcKABCAddress.h>
+ //typedef QValueList<KABC::Address> List;
+ %End
+
+diff -ru PyKDE-3.16.0.orig/sip/kabc/distributionlist.sip PyKDE-3.16.0/sip/kabc/distributionlist.sip
+--- PyKDE-3.16.0.orig/sip/kabc/distributionlist.sip 2006-09-22 04:11:14.000000000 +0100
++++ PyKDE-3.16.0/sip/kabc/distributionlist.sip 2007-06-23 09:55:29.000000000 +0100
+@@ -110,9 +110,7 @@
+ //converts a Python list of KABC::DistributionList::Entry
+ {
+ %TypeHeaderCode
+-#include <qvaluelist.h>
+-#include <sipkabcKABCDistributionListEntry.h>
+-//typedef QValueList<KABC::DistributionList::Entry> List;
++#include <distributionlist.h>
+ %End
+
+ %ConvertFromTypeCode
+diff -ru PyKDE-3.16.0.orig/sip/kabc/field.sip PyKDE-3.16.0/sip/kabc/field.sip
+--- PyKDE-3.16.0.orig/sip/kabc/field.sip 2006-09-22 04:11:14.000000000 +0100
++++ PyKDE-3.16.0/sip/kabc/field.sip 2007-06-25 12:03:32.000000000 +0100
+@@ -94,9 +94,7 @@
+ //converts a Python list of KABC::Field
+ {
+ %TypeHeaderCode
+-#include <qvaluelist.h>
+-#include <sipkabcKABCField.h>
+-//typedef QValueList<KABC::Field *> List;
++#include <field.h>
+ %End
+
+ %ConvertFromTypeCode
+diff -ru PyKDE-3.16.0.orig/sip/kabc/kabcmod.sip PyKDE-3.16.0/sip/kabc/kabcmod.sip
+--- PyKDE-3.16.0.orig/sip/kabc/kabcmod.sip 2006-09-22 09:02:55.000000000 +0100
++++ PyKDE-3.16.0/sip/kabc/kabcmod.sip 2007-06-25 12:04:03.000000000 +0100
+@@ -64,6 +64,7 @@
+ %Include ldapconfigwidget.sip
+ %Include ldapurl.sip
+ %Include ldif.sip
++%Include ldifconverter.sip
+ %Include lock.sip
+ %Include locknull.sip
+ %Include picture.sip
+diff -ru PyKDE-3.16.0.orig/sip/kabc/key.sip PyKDE-3.16.0/sip/kabc/key.sip
+--- PyKDE-3.16.0.orig/sip/kabc/key.sip 2006-09-22 04:11:14.000000000 +0100
++++ PyKDE-3.16.0/sip/kabc/key.sip 2007-06-23 09:55:29.000000000 +0100
+@@ -78,7 +78,6 @@
+ {
+ %TypeHeaderCode
+ #include <qvaluelist.h>
+-#include <sipkabcKABCKey.h>
+ //typedef QValueList<KABC::Key> List;
+ %End
+
+diff -ru PyKDE-3.16.0.orig/sip/kabc/ldapclient.sip PyKDE-3.16.0/sip/kabc/ldapclient.sip
+--- PyKDE-3.16.0.orig/sip/kabc/ldapclient.sip 2006-09-22 04:11:14.000000000 +0100
++++ PyKDE-3.16.0/sip/kabc/ldapclient.sip 2007-06-25 11:50:39.000000000 +0100
+@@ -177,9 +177,7 @@
+ //converts a Python list of KABC::LdapREsult
+ {
+ %TypeHeaderCode
+-#include <qvaluelist.h>
+-#include <sipkabcKABCLdapResult.h>
+-//typedef QValueList<KABC::LdapResult> List;
++#include <ldapclient.h>
+ %End
+
+ %ConvertFromTypeCode
+diff -ru PyKDE-3.16.0.orig/sip/kabc/phonenumber.sip PyKDE-3.16.0/sip/kabc/phonenumber.sip
+--- PyKDE-3.16.0.orig/sip/kabc/phonenumber.sip 2006-09-22 04:11:14.000000000 +0100
++++ PyKDE-3.16.0/sip/kabc/phonenumber.sip 2007-06-23 09:55:29.000000000 +0100
+@@ -125,7 +125,6 @@
+ {
+ %TypeHeaderCode
+ #include <qvaluelist.h>
+-#include <sipkabcKABCPhoneNumber.h>
+ //typedef QValueList<KABC::PhoneNumber> List;
+ %End
+
+diff -ru PyKDE-3.16.0.orig/sip/kdecore/bytearray.sip PyKDE-3.16.0/sip/kdecore/bytearray.sip
+--- PyKDE-3.16.0.orig/sip/kdecore/bytearray.sip 2006-09-22 06:53:14.000000000 +0100
++++ PyKDE-3.16.0/sip/kdecore/bytearray.sip 2007-06-23 09:55:29.000000000 +0100
+@@ -23,7 +23,6 @@
+
+ %ModuleHeaderCode
+ #include <qvariant.h>
+-#include <sipdcopQValueList.h>
+ %End
+
+
+@@ -579,8 +578,6 @@
+ {
+ %TypeHeaderCode
+ #include <qmap.h>
+-#include <sipdcopDCOPRef.h>
+-#include <sipqtQCString.h>
+ //typedef QMap<QCString,DCOPRef> DCOPRefMap;
+ %End
+
+@@ -633,7 +630,7 @@
+ QMap<QCString,DCOPRef> *cppmap = new QMap<QCString,DCOPRef>;
+
+ PyObject *aelem, *belem;
+- int pos = 0;
++ SIP_SSIZE_T pos = 0;
+ QCString *acpp;
+ DCOPRef *bcpp;
+
+@@ -663,8 +660,6 @@
+ {
+ %TypeHeaderCode
+ #include <qmap.h>
+-#include <sipdcopDCOPRef.h>
+-#include <sipqtQString.h>
+ //typedef QMap<QString,DCOPRef> DCOPRefMap;
+ %End
+
+@@ -717,7 +712,7 @@
+ QMap<QString,DCOPRef> *cppmap = new QMap<QString,DCOPRef>;
+
+ PyObject *aelem, *belem;
+- int pos = 0;
++ SIP_SSIZE_T pos = 0;
+ QString *acpp;
+ DCOPRef *bcpp;
+
+diff -ru PyKDE-3.16.0.orig/sip/kdecore/kaccel.sip PyKDE-3.16.0/sip/kdecore/kaccel.sip
+--- PyKDE-3.16.0.orig/sip/kdecore/kaccel.sip 2006-09-22 04:11:16.000000000 +0100
++++ PyKDE-3.16.0/sip/kdecore/kaccel.sip 2007-06-23 09:55:29.000000000 +0100
+@@ -161,7 +161,6 @@
+ //converts a Python dict of int:QString
+ {
+ %TypeHeaderCode
+-#include <sipqtQString.h>
+ #include <kaccel.h>
+ %End
+
+@@ -209,7 +208,7 @@
+ QMap<int,QString> *map = new QMap<int,QString>;
+
+ PyObject *key, *value;
+- int pos = 0;
++ SIP_SSIZE_T pos = 0;
+ int iKey;
+ QString *sData;
+
+diff -ru PyKDE-3.16.0.orig/sip/kdecore/kcompletion.sip PyKDE-3.16.0/sip/kdecore/kcompletion.sip
+--- PyKDE-3.16.0.orig/sip/kdecore/kcompletion.sip 2006-09-22 04:11:16.000000000 +0100
++++ PyKDE-3.16.0/sip/kdecore/kcompletion.sip 2007-06-23 09:55:29.000000000 +0100
+@@ -152,7 +152,6 @@
+ {
+ %TypeHeaderCode
+ #include <kcompletion.h>
+-#include <sipkdecoreKShortcut.h>
+ %End
+ %ConvertFromTypeCode
+
+@@ -201,7 +200,7 @@
+ QMap<KCompletionBase::KeyBindingType,KShortcut> *kbmap = new QMap<KCompletionBase::KeyBindingType,KShortcut>;
+
+ PyObject *key, *value;
+- int pos = 0;
++ SIP_SSIZE_T pos = 0;
+ KShortcut *cValue;
+ int iserr;
+
+diff -ru PyKDE-3.16.0.orig/sip/kdecore/kconfig.sip PyKDE-3.16.0/sip/kdecore/kconfig.sip
+--- PyKDE-3.16.0.orig/sip/kdecore/kconfig.sip 2006-09-22 04:11:16.000000000 +0100
++++ PyKDE-3.16.0/sip/kdecore/kconfig.sip 2007-06-23 09:55:29.000000000 +0100
+@@ -158,7 +158,7 @@
+ QMap<QString,QString> *cppmap = new QMap<QString,QString>;
+
+ PyObject *aelem, *belem;
+- int pos = 0;
++ SIP_SSIZE_T pos = 0;
+ QString *acpp;
+ QString *bcpp;
+
+@@ -193,7 +193,6 @@
+ %TypeHeaderCode
+ #include <ksharedptr.h>
+ #include <kconfig.h>
+-#include <sipkdecoreKSharedConfig.h>
+ %End
+
+ %ConvertFromTypeCode
+diff -ru PyKDE-3.16.0.orig/sip/kdecore/kconfigbase.sip PyKDE-3.16.0/sip/kdecore/kconfigbase.sip
+--- PyKDE-3.16.0.orig/sip/kdecore/kconfigbase.sip 2006-09-22 04:11:16.000000000 +0100
++++ PyKDE-3.16.0/sip/kdecore/kconfigbase.sip 2007-06-24 11:28:00.000000000 +0100
+@@ -24,11 +24,15 @@
+ // 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+
++%ModuleHeaderCode
++typedef long long longlong;
++typedef unsigned long long ulonglong;
++%End
++
++
+ class KConfigBase : QObject
+ {
+ %TypeHeaderCode
+-typedef long long longlong;
+-typedef unsigned long long ulonglong;
+ #include <kconfigbase.h>
+ %End
+
+@@ -257,7 +261,6 @@
+ //converts a Python long
+ {
+ %TypeHeaderCode
+-#include <sipkdecoreKConfigBase.h> // typdef for longlong
+ #if PY_MAJOR_VERSION >= 2 && PY_MINOR_VERSION >= 3
+ #define LONG_LONG PY_LONG_LONG
+ #endif
+@@ -296,7 +299,6 @@
+ //converts a Python long
+ {
+ %TypeHeaderCode
+-#include <sipkdecoreKConfigBase.h> // typdef for ulonglong
+ #if PY_MAJOR_VERSION >= 2 && PY_MINOR_VERSION >= 3
+ #define LONG_LONG PY_LONG_LONG
+ #endif
+diff -ru PyKDE-3.16.0.orig/sip/kdecore/kconfigdata.sip PyKDE-3.16.0/sip/kdecore/kconfigdata.sip
+--- PyKDE-3.16.0.orig/sip/kdecore/kconfigdata.sip 2006-09-22 04:11:16.000000000 +0100
++++ PyKDE-3.16.0/sip/kdecore/kconfigdata.sip 2007-06-23 09:55:29.000000000 +0100
+@@ -92,9 +92,6 @@
+ %TypeHeaderCode
+ #include <qmap.h>
+ #include <kconfigdata.h>
+-#include <sipkdecoreKEntryMap.h>
+-#include <sipkdecoreKEntry.h>
+-#include <sipkdecoreKEntryKey.h>
+ %End
+
+ %ConvertFromTypeCode
+@@ -146,7 +143,7 @@
+ KEntryMap *cppmap = new KEntryMap;
+
+ PyObject *aelem, *belem;
+- int pos = 0;
++ SIP_SSIZE_T pos = 0;
+ KEntryKey *acpp;
+ KEntry *bcpp;
+
+diff -ru PyKDE-3.16.0.orig/sip/kdecore/kconfigskeleton.sip PyKDE-3.16.0/sip/kdecore/kconfigskeleton.sip
+--- PyKDE-3.16.0.orig/sip/kdecore/kconfigskeleton.sip 2006-09-22 04:11:16.000000000 +0100
++++ PyKDE-3.16.0/sip/kdecore/kconfigskeleton.sip 2007-06-23 09:55:29.000000000 +0100
+@@ -122,8 +122,6 @@
+ class KConfigSkeleton
+ {
+ %TypeHeaderCode
+-#include <sipkdecorelonglong.h>
+-#include <sipkdecoreulonglong.h>
+ #include <kconfigskeleton.h>
+ typedef QValueList<int> IntList;
+ %End
+@@ -1083,7 +1081,6 @@
+ {
+ %TypeHeaderCode
+ #include <kconfigskeleton.h>
+-#include <sipkdecoreKConfigSkeletonItemEnumChoice.h>
+ %End
+
+ %ConvertFromTypeCode
+diff -ru PyKDE-3.16.0.orig/sip/kdecore/kdecoremod.sip PyKDE-3.16.0/sip/kdecore/kdecoremod.sip
+--- PyKDE-3.16.0.orig/sip/kdecore/kdecoremod.sip 2006-09-22 09:02:05.000000000 +0100
++++ PyKDE-3.16.0/sip/kdecore/kdecoremod.sip 2007-06-25 12:03:40.000000000 +0100
+@@ -110,4 +110,5 @@
+ %Include kmountpoint.sip
+ %Include kpty.sip
+ %Include kshell.sip
++%Include ktimezones.sip
+ %Include kurldrag.sip
+diff -ru PyKDE-3.16.0.orig/sip/kdecore/kiconloader.sip PyKDE-3.16.0/sip/kdecore/kiconloader.sip
+--- PyKDE-3.16.0.orig/sip/kdecore/kiconloader.sip 2006-09-22 04:11:16.000000000 +0100
++++ PyKDE-3.16.0/sip/kdecore/kiconloader.sip 2007-06-23 09:55:29.000000000 +0100
+@@ -74,6 +74,11 @@
+
+ }; // class KIconLoader
+
++
++%ModuleCode
++#include <kiconloader.h>
++%End
++
+ QPixmap DesktopIcon (const QString&, int = 0, int = KIcon ::DefaultState , KInstance* = KGlobal ::instance ());
+ QPixmap DesktopIcon (const QString&, KInstance*);
+ QIconSet DesktopIconSet (const QString&, int = 0, KInstance* = KGlobal ::instance ());
+diff -ru PyKDE-3.16.0.orig/sip/kdecore/klocale.sip PyKDE-3.16.0/sip/kdecore/klocale.sip
+--- PyKDE-3.16.0.orig/sip/kdecore/klocale.sip 2006-09-22 04:11:16.000000000 +0100
++++ PyKDE-3.16.0/sip/kdecore/klocale.sip 2007-06-23 09:55:29.000000000 +0100
+@@ -233,6 +233,11 @@
+
+ }; // class KLocale
+
++
++%ModuleCode
++#include <klocale.h>
++%End
++
+ QString i18n (const char*);
+ QString i18n (const char*, const char*);
+ QString i18n (const char*, const char*, ulong);
+diff -ru PyKDE-3.16.0.orig/sip/kdecore/klockfile.sip PyKDE-3.16.0/sip/kdecore/klockfile.sip
+--- PyKDE-3.16.0.orig/sip/kdecore/klockfile.sip 2006-09-22 04:11:16.000000000 +0100
++++ PyKDE-3.16.0/sip/kdecore/klockfile.sip 2007-06-23 09:55:29.000000000 +0100
+@@ -72,7 +72,6 @@
+ %TypeHeaderCode
+ #include <ksharedptr.h>
+ #include <klockfile.h>
+-#include <../kdecore/sipkdecoreKLockFile.h>
+ %End
+
+ %ConvertFromTypeCode
+diff -ru PyKDE-3.16.0.orig/sip/kdecore/kmacroexpander.sip PyKDE-3.16.0/sip/kdecore/kmacroexpander.sip
+--- PyKDE-3.16.0.orig/sip/kdecore/kmacroexpander.sip 2006-09-22 04:11:16.000000000 +0100
++++ PyKDE-3.16.0/sip/kdecore/kmacroexpander.sip 2007-06-23 09:55:29.000000000 +0100
+@@ -119,8 +119,8 @@
+ //converts a Python dict of QChar:QString
+ {
+ %TypeHeaderCode
+-#include <sipqtQString.h>
+-#include <sipqtQChar.h>
++#include <qmap.h>
++#include <qstring.h>
+ %End
+
+ %ConvertFromTypeCode
+@@ -169,7 +169,7 @@
+ QMap<QChar,QString> *map = new QMap<QChar,QString>;
+
+ PyObject *key, *value;
+- int pos = 0;
++ SIP_SSIZE_T pos = 0;
+ QChar *cKey;
+ QString *sData;
+
+@@ -201,8 +201,9 @@
+ //converts a Python dict of QString:QStringList
+ {
+ %TypeHeaderCode
+-#include <sipqtQString.h>
+-#include <sipqtQStringList.h>
++#include <qmap.h>
++#include <qstring.h>
++#include <qstringlist.h>
+ %End
+
+ %ConvertFromTypeCode
+@@ -251,7 +252,7 @@
+ QMap<QString, QStringList> *map = new QMap<QString, QStringList>;
+
+ PyObject *key, *value;
+- int pos = 0;
++ SIP_SSIZE_T pos = 0;
+ QString *sKey;
+ QStringList *slData;
+
+@@ -283,8 +284,9 @@
+ //converts a Python dict of QChar:QStringList
+ {
+ %TypeHeaderCode
+-#include <sipqtQStringList.h>
+-#include <sipqtQChar.h>
++#include <qmap.h>
++#include <qstringlist.h>
++#include <qstring.h>
+ %End
+
+ %ConvertFromTypeCode
+@@ -334,7 +336,7 @@
+ QMap<QChar,QStringList> *map = new QMap<QChar,QStringList>;
+
+ PyObject *key, *value;
+- int pos = 0;
++ SIP_SSIZE_T pos = 0;
+ QChar *cKey;
+ QStringList *slData;
+
+diff -ru PyKDE-3.16.0.orig/sip/kdecore/kmountpoint.sip PyKDE-3.16.0/sip/kdecore/kmountpoint.sip
+--- PyKDE-3.16.0.orig/sip/kdecore/kmountpoint.sip 2006-09-22 04:11:16.000000000 +0100
++++ PyKDE-3.16.0/sip/kdecore/kmountpoint.sip 2007-06-23 09:55:29.000000000 +0100
+@@ -73,7 +73,6 @@
+ %TypeHeaderCode
+ #include <ksharedptr.h>
+ #include <kmountpoint.h>
+-#include <sipkdecoreKMountPoint.h>
+ %End
+
+ %ConvertFromTypeCode
+@@ -117,8 +116,6 @@
+ %TypeHeaderCode
+ #include <qvaluelist.h>
+ #include <kmountpoint.h>
+-#include <sipkdecoreKMountPoint.h>
+-#include <sipkdecoreKMountPointPtr.h>
+ %End
+
+ %ConvertFromTypeCode
+diff -ru PyKDE-3.16.0.orig/sip/kdecore/kstddirs.sip PyKDE-3.16.0/sip/kdecore/kstddirs.sip
+--- PyKDE-3.16.0.orig/sip/kdecore/kstddirs.sip 2006-05-25 02:27:49.000000000 +0100
++++ PyKDE-3.16.0/sip/kdecore/kstddirs.sip 2007-06-23 09:55:29.000000000 +0100
+@@ -60,5 +60,10 @@
+
+ }; // class KStandardDirs
+
++
++%ModuleCode
++#include <kstddirs.h>
++%End
++
+ QString locate (const char*, const QString&, const KInstance* = KGlobal::instance());
+ QString locateLocal (const char*, const QString&, const KInstance* = KGlobal::instance());
+diff -ru PyKDE-3.16.0.orig/sip/kdecore/ktimezones.sip PyKDE-3.16.0/sip/kdecore/ktimezones.sip
+--- PyKDE-3.16.0.orig/sip/kdecore/ktimezones.sip 2006-09-22 04:11:16.000000000 +0100
++++ PyKDE-3.16.0/sip/kdecore/ktimezones.sip 2007-06-23 09:55:29.000000000 +0100
+@@ -140,7 +140,6 @@
+ %TypeHeaderCode
+ #include <ksharedptr.h>
+ #include <ktimezones.h>
+-#include <sipkdecoreKTimezoneSource.h>
+ %End
+
+ %ConvertFromTypeCode
+@@ -187,8 +186,6 @@
+ #include <qmap.h>
+ #include <qstring.h>
+ #include <ktimezones.h>
+-#include <sipqtQString.h>
+-#include <sipkdecoreKTimezone.h>
+ %End
+
+ %ConvertFromTypeCode
+@@ -240,7 +237,7 @@
+ QMap<QString, KTimezone*> *cppmap = new QMap<QString, KTimezone*>;
+
+ PyObject *aelem, *belem;
+- int pos = 0;
++ SIP_SSIZE_T pos = 0;
+ QString *acpp;
+ KTimezone *bcpp;
+
+diff -ru PyKDE-3.16.0.orig/sip/kdecore/kurl.sip PyKDE-3.16.0/sip/kdecore/kurl.sip
+--- PyKDE-3.16.0.orig/sip/kdecore/kurl.sip 2006-09-22 04:11:16.000000000 +0100
++++ PyKDE-3.16.0/sip/kdecore/kurl.sip 2007-06-23 09:55:29.000000000 +0100
+@@ -248,7 +248,8 @@
+ %MethodCode
+ //takes range | (a Python slice) | urlList | (KURL.List)
+
+- int len, start, stop, step, slicelength;
++ int len;
++ SIP_SSIZE_T start, stop, step, slicelength;
+
+ len = sipCpp -> count();
+
+@@ -291,7 +292,8 @@
+ void __delitem__ (SIP_PYSLICE);
+ %MethodCode
+ //takes range | (a Python slice)
+- int len, start, stop, step, slicelength;
++ int len;
++ SIP_SSIZE_T start, stop, step, slicelength;
+
+ len = sipCpp -> count();
+ if (sipConvertFromSliceObject(a0,len,&start,&stop,&step,&slicelength) < 0)
+@@ -322,7 +324,8 @@
+ %MethodCode
+ //returns (KURL.List)
+ //takes range | (a Python slice)
+- int len, start, stop, step, slicelength;
++ int len;
++ SIP_SSIZE_T start, stop, step, slicelength;
+
+ len = sipCpp -> count();
+
+diff -ru PyKDE-3.16.0.orig/sip/kdefx/kdrawutil.sip PyKDE-3.16.0/sip/kdefx/kdrawutil.sip
+--- PyKDE-3.16.0.orig/sip/kdefx/kdrawutil.sip 2006-09-22 04:11:14.000000000 +0100
++++ PyKDE-3.16.0/sip/kdefx/kdrawutil.sip 2007-06-23 09:55:29.000000000 +0100
+@@ -25,8 +25,6 @@
+
+ %ModuleHeaderCode
+ #include <kdrawutil.h>
+-#include <sipqtQRegion.h>
+-#include <sipqtQBrush.h>
+ %End
+
+ void kDrawNextButton (QPainter*, const QRect&, const QColorGroup&, bool = 0, const QBrush* = 0);
+diff -ru PyKDE-3.16.0.orig/sip/kdeprint/kmjobmanager.sip PyKDE-3.16.0/sip/kdeprint/kmjobmanager.sip
+--- PyKDE-3.16.0.orig/sip/kdeprint/kmjobmanager.sip 2006-09-22 04:11:13.000000000 +0100
<<Diff was trimmed, longer than 597 lines>>
More information about the pld-cvs-commit
mailing list