diff --git a/.cvsignore b/.cvsignore index 8b1f355..282cd36 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -clog -PyKDE-3.16.0.tar.gz +PyKDE-3.16.1.tar.bz2 diff --git a/PyKDE-3.16.0-konsolepart.patch b/PyKDE-3.16.0-konsolepart.patch deleted file mode 100644 index d94db1b..0000000 --- a/PyKDE-3.16.0-konsolepart.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- PyKDE-3.16.0/configure.py.DESTDIR 2006-09-22 03:05:49.000000000 -0500 -+++ PyKDE-3.16.0/configure.py 2006-09-26 14:18:18.000000000 -0500 -@@ -768,8 +768,8 @@ - f.close () - target = os.path.join (opt_kdelibdir, "kde3", "libkonsolepart.so") - symlink = os.path.join (opt_kdelibdir, "libkonsolepart.so") -- buff = buff.replace ("install:\n", "install:\n\tln -sf %s %s\n" % (target, symlink)) -- buff = buff.replace ("\nclean", "\tldconfig\n\nclean") -+ buff = buff.replace ("install:\n", "install:\n\tln -sf %s $(DESTDIR)%s\n" % (target, symlink)) -+ buff = buff.replace ("\nclean", "\tldconfig ||:\n\nclean") - f = open ("Makefile.new", "w") - f.write (buff) - f.close () diff --git a/PyKDE-3.16.0-python25.patch b/PyKDE-3.16.0-python25.patch deleted file mode 100644 index 0bac325..0000000 --- a/PyKDE-3.16.0-python25.patch +++ /dev/null @@ -1,223 +0,0 @@ -Nur in PyKDE-3.16.0.py25: dcop. -diff -ru PyKDE-3.16.0/sip/kdecore/bytearray.sip PyKDE-3.16.0.py25/sip/kdecore/bytearray.sip ---- PyKDE-3.16.0/sip/kdecore/bytearray.sip 2006-09-22 07:53:14.000000000 +0200 -+++ PyKDE-3.16.0.py25/sip/kdecore/bytearray.sip 2006-12-23 15:42:13.000000000 +0100 -@@ -633,7 +633,7 @@ - QMap *cppmap = new QMap; - - PyObject *aelem, *belem; -- int pos = 0; -+ SIP_SSIZE_T pos = 0; - QCString *acpp; - DCOPRef *bcpp; - -@@ -717,7 +717,7 @@ - QMap *cppmap = new QMap; - - PyObject *aelem, *belem; -- int pos = 0; -+ SIP_SSIZE_T pos = 0; - QString *acpp; - DCOPRef *bcpp; - -diff -ru PyKDE-3.16.0/sip/kdecore/kaccel.sip PyKDE-3.16.0.py25/sip/kdecore/kaccel.sip ---- PyKDE-3.16.0/sip/kdecore/kaccel.sip 2006-09-22 05:11:16.000000000 +0200 -+++ PyKDE-3.16.0.py25/sip/kdecore/kaccel.sip 2006-12-23 15:42:22.000000000 +0100 -@@ -209,7 +209,7 @@ - QMap *map = new QMap; - - PyObject *key, *value; -- int pos = 0; -+ SIP_SSIZE_T pos = 0; - int iKey; - QString *sData; - -diff -ru PyKDE-3.16.0/sip/kdecore/kcompletion.sip PyKDE-3.16.0.py25/sip/kdecore/kcompletion.sip ---- PyKDE-3.16.0/sip/kdecore/kcompletion.sip 2006-09-22 05:11:16.000000000 +0200 -+++ PyKDE-3.16.0.py25/sip/kdecore/kcompletion.sip 2006-12-23 15:42:31.000000000 +0100 -@@ -201,7 +201,7 @@ - QMap *kbmap = new QMap; - - PyObject *key, *value; -- int pos = 0; -+ SIP_SSIZE_T pos = 0; - KShortcut *cValue; - int iserr; - -diff -ru PyKDE-3.16.0/sip/kdecore/kconfigdata.sip PyKDE-3.16.0.py25/sip/kdecore/kconfigdata.sip ---- PyKDE-3.16.0/sip/kdecore/kconfigdata.sip 2006-09-22 05:11:16.000000000 +0200 -+++ PyKDE-3.16.0.py25/sip/kdecore/kconfigdata.sip 2006-12-23 15:42:39.000000000 +0100 -@@ -146,7 +146,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/sip/kdecore/kconfig.sip PyKDE-3.16.0.py25/sip/kdecore/kconfig.sip ---- PyKDE-3.16.0/sip/kdecore/kconfig.sip 2006-09-22 05:11:16.000000000 +0200 -+++ PyKDE-3.16.0.py25/sip/kdecore/kconfig.sip 2006-12-23 15:42:45.000000000 +0100 -@@ -158,7 +158,7 @@ - QMap *cppmap = new QMap; - - PyObject *aelem, *belem; -- int pos = 0; -+ SIP_SSIZE_T pos = 0; - QString *acpp; - QString *bcpp; - -diff -ru PyKDE-3.16.0/sip/kdecore/kmacroexpander.sip PyKDE-3.16.0.py25/sip/kdecore/kmacroexpander.sip ---- PyKDE-3.16.0/sip/kdecore/kmacroexpander.sip 2006-09-22 05:11:16.000000000 +0200 -+++ PyKDE-3.16.0.py25/sip/kdecore/kmacroexpander.sip 2006-12-23 15:42:57.000000000 +0100 -@@ -169,7 +169,7 @@ - QMap *map = new QMap; - - PyObject *key, *value; -- int pos = 0; -+ SIP_SSIZE_T pos = 0; - QChar *cKey; - QString *sData; - -@@ -251,7 +251,7 @@ - QMap *map = new QMap; - - PyObject *key, *value; -- int pos = 0; -+ SIP_SSIZE_T pos = 0; - QString *sKey; - QStringList *slData; - -@@ -334,7 +334,7 @@ - QMap *map = new QMap; - - PyObject *key, *value; -- int pos = 0; -+ SIP_SSIZE_T pos = 0; - QChar *cKey; - QStringList *slData; - -diff -ru PyKDE-3.16.0/sip/kdecore/ktimezones.sip PyKDE-3.16.0.py25/sip/kdecore/ktimezones.sip ---- PyKDE-3.16.0/sip/kdecore/ktimezones.sip 2006-09-22 05:11:16.000000000 +0200 -+++ PyKDE-3.16.0.py25/sip/kdecore/ktimezones.sip 2006-12-23 15:43:04.000000000 +0100 -@@ -240,7 +240,7 @@ - QMap *cppmap = new QMap; - - PyObject *aelem, *belem; -- int pos = 0; -+ SIP_SSIZE_T pos = 0; - QString *acpp; - KTimezone *bcpp; - -diff -ru PyKDE-3.16.0/sip/kdecore/kurl.sip PyKDE-3.16.0.py25/sip/kdecore/kurl.sip ---- PyKDE-3.16.0/sip/kdecore/kurl.sip 2006-09-22 05:11:16.000000000 +0200 -+++ PyKDE-3.16.0.py25/sip/kdecore/kurl.sip 2006-12-23 15:43:18.000000000 +0100 -@@ -248,7 +248,7 @@ - %MethodCode - //takes range | (a Python slice) | urlList | (KURL.List) - -- int len, start, stop, step, slicelength; -+ SIP_SSIZE_T len, start, stop, step, slicelength; - - len = sipCpp -> count(); - -@@ -291,7 +291,7 @@ - void __delitem__ (SIP_PYSLICE); - %MethodCode - //takes range | (a Python slice) -- int len, start, stop, step, slicelength; -+ SIP_SSIZE_T len, start, stop, step, slicelength; - - len = sipCpp -> count(); - if (sipConvertFromSliceObject(a0,len,&start,&stop,&step,&slicelength) < 0) -@@ -322,7 +322,7 @@ - %MethodCode - //returns (KURL.List) - //takes range | (a Python slice) -- int len, start, stop, step, slicelength; -+ SIP_SSIZE_T len, start, stop, step, slicelength; - - len = sipCpp -> count(); - -diff -ru PyKDE-3.16.0/sip/kdeui/kkeydialog.sip PyKDE-3.16.0.py25/sip/kdeui/kkeydialog.sip ---- PyKDE-3.16.0/sip/kdeui/kkeydialog.sip 2006-09-22 05:11:15.000000000 +0200 -+++ PyKDE-3.16.0.py25/sip/kdeui/kkeydialog.sip 2006-12-23 15:43:23.000000000 +0100 -@@ -231,7 +231,7 @@ - QDict* qdict = new QDict; - - PyObject *key, *value; -- int pos = 0; -+ SIP_SSIZE_T pos = 0; - QString *a0; - int a1; - -diff -ru PyKDE-3.16.0/sip/kio/authinfo.sip PyKDE-3.16.0.py25/sip/kio/authinfo.sip ---- PyKDE-3.16.0/sip/kio/authinfo.sip 2006-09-22 05:11:14.000000000 +0200 -+++ PyKDE-3.16.0.py25/sip/kio/authinfo.sip 2006-12-23 15:43:28.000000000 +0100 -@@ -176,7 +176,7 @@ - QMap *map = new QMap; - - PyObject *key, *value; -- int pos = 0; -+ SIP_SSIZE_T pos = 0; - QString *sKey; - QStringList *sData; - -diff -ru PyKDE-3.16.0/sip/kio/global.sip PyKDE-3.16.0.py25/sip/kio/global.sip ---- PyKDE-3.16.0/sip/kio/global.sip 2006-09-22 05:11:14.000000000 +0200 -+++ PyKDE-3.16.0.py25/sip/kio/global.sip 2006-12-23 15:43:33.000000000 +0100 -@@ -702,7 +702,7 @@ - QMap *cppmap = new QMap; - - PyObject *aelem, *belem; -- int pos = 0; -+ SIP_SSIZE_T pos = 0; - QString *acpp; - QString *bcpp; - -diff -ru PyKDE-3.16.0/sip/kio/kservicetype.sip PyKDE-3.16.0.py25/sip/kio/kservicetype.sip ---- PyKDE-3.16.0/sip/kio/kservicetype.sip 2006-09-22 05:11:14.000000000 +0200 -+++ PyKDE-3.16.0.py25/sip/kio/kservicetype.sip 2006-12-23 15:43:44.000000000 +0100 -@@ -183,7 +183,7 @@ - QMap *cppmap = new QMap; - - PyObject *aelem, *belem; -- int pos = 0; -+ SIP_SSIZE_T pos = 0; - QString *acpp; - QVariant::Type bcpp; - -diff -ru PyKDE-3.16.0/sip/kmdi/kmdichildfrm.sip PyKDE-3.16.0.py25/sip/kmdi/kmdichildfrm.sip ---- PyKDE-3.16.0/sip/kmdi/kmdichildfrm.sip 2006-09-22 05:11:14.000000000 +0200 -+++ PyKDE-3.16.0.py25/sip/kmdi/kmdichildfrm.sip 2006-12-23 15:39:49.000000000 +0100 -@@ -245,7 +245,7 @@ - QDict* qdict = new QDict; - - PyObject *key, *value; -- int pos = 0; -+ SIP_SSIZE_T pos = 0; - QString *a0; - QWidget::FocusPolicy a1; - -diff -ru PyKDE-3.16.0/sip/kparts/browserextension.sip PyKDE-3.16.0.py25/sip/kparts/browserextension.sip ---- PyKDE-3.16.0/sip/kparts/browserextension.sip 2006-09-22 05:11:15.000000000 +0200 -+++ PyKDE-3.16.0.py25/sip/kparts/browserextension.sip 2006-12-23 15:33:51.000000000 +0100 -@@ -419,7 +419,7 @@ - QMap *cppmap = new QMap; - - PyObject *aelem, *belem; -- int pos = 0; -+ SIP_SSIZE_T pos = 0; - QCString *acpp; - QCString *bcpp; - -@@ -503,7 +503,7 @@ - QMap *cppmap = new QMap; - - PyObject *aelem, *belem; -- int pos = 0; -+ SIP_SSIZE_T pos = 0; - QCString *acpp; - int bcpp; - diff --git a/PyKDE-3.16.0-sip-4.7.patch b/PyKDE-3.16.0-sip-4.7.patch deleted file mode 100644 index 69f4daa..0000000 --- a/PyKDE-3.16.0-sip-4.7.patch +++ /dev/null @@ -1,1258 +0,0 @@ -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 --#include - %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 --#include - //typedef QValueList List; - %End - -@@ -405,7 +404,6 @@ - { - %TypeHeaderCode - #include --#include - //typedef QValueList 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 --#include --//typedef QValueList List; -+#include - %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 --#include --//typedef QValueList List; -+#include - %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 --#include - //typedef QValueList 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 --#include --//typedef QValueList List; -+#include - %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 --#include - //typedef QValueList 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 --#include - %End - - -@@ -579,8 +578,6 @@ - { - %TypeHeaderCode - #include --#include --#include - //typedef QMap DCOPRefMap; - %End - -@@ -633,7 +630,7 @@ - QMap *cppmap = new QMap; - - PyObject *aelem, *belem; -- int pos = 0; -+ SIP_SSIZE_T pos = 0; - QCString *acpp; - DCOPRef *bcpp; - -@@ -663,8 +660,6 @@ - { - %TypeHeaderCode - #include --#include --#include - //typedef QMap DCOPRefMap; - %End - -@@ -717,7 +712,7 @@ - QMap *cppmap = new QMap; - - 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 - #include - %End - -@@ -209,7 +208,7 @@ - QMap *map = new QMap; - - 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 --#include - %End - %ConvertFromTypeCode - -@@ -201,7 +200,7 @@ - QMap *kbmap = new QMap; - - 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 *cppmap = new QMap; - - PyObject *aelem, *belem; -- int pos = 0; -+ SIP_SSIZE_T pos = 0; - QString *acpp; - QString *bcpp; - -@@ -193,7 +193,6 @@ - %TypeHeaderCode - #include - #include --#include - %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 - %End - -@@ -257,7 +261,6 @@ - //converts a Python long - { - %TypeHeaderCode --#include // 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 // 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 - #include --#include --#include --#include - %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 --#include - #include - typedef QValueList IntList; - %End -@@ -1083,7 +1081,6 @@ - { - %TypeHeaderCode - #include --#include - %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 -+%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 -+%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 - #include --#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 --#include -+#include -+#include - %End - - %ConvertFromTypeCode -@@ -169,7 +169,7 @@ - QMap *map = new QMap; - - 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 --#include -+#include -+#include -+#include - %End - - %ConvertFromTypeCode -@@ -251,7 +252,7 @@ - QMap *map = new QMap; - - 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 --#include -+#include -+#include -+#include - %End - - %ConvertFromTypeCode -@@ -334,7 +336,7 @@ - QMap *map = new QMap; - - 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 - #include --#include - %End - - %ConvertFromTypeCode -@@ -117,8 +116,6 @@ - %TypeHeaderCode - #include - #include --#include --#include - %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 -+%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 - #include --#include - %End - - %ConvertFromTypeCode -@@ -187,8 +186,6 @@ - #include - #include - #include --#include --#include - %End - - %ConvertFromTypeCode -@@ -240,7 +237,7 @@ - QMap *cppmap = new QMap; - - 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 --#include --#include - %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 -+++ PyKDE-3.16.0/sip/kdeprint/kmjobmanager.sip 2007-06-23 09:55:29.000000000 +0100 -@@ -128,7 +128,6 @@ - %TypeHeaderCode - #include - #include --#include - typedef QPtrList KMJobList; - %End - -diff -ru PyKDE-3.16.0.orig/sip/kdeprint/kmmanager.sip PyKDE-3.16.0/sip/kdeprint/kmmanager.sip ---- PyKDE-3.16.0.orig/sip/kdeprint/kmmanager.sip 2006-09-22 04:11:13.000000000 +0100 -+++ PyKDE-3.16.0/sip/kdeprint/kmmanager.sip 2007-06-23 09:55:29.000000000 +0100 -@@ -149,7 +149,6 @@ - #include - #include - #include --#include - %End - - %ConvertFromTypeCode -diff -ru PyKDE-3.16.0.orig/sip/kdeprint/kprintdialog.sip PyKDE-3.16.0/sip/kdeprint/kprintdialog.sip ---- PyKDE-3.16.0.orig/sip/kdeprint/kprintdialog.sip 2006-09-22 04:11:13.000000000 +0100 -+++ PyKDE-3.16.0/sip/kdeprint/kprintdialog.sip 2007-06-23 09:55:30.000000000 +0100 -@@ -98,7 +98,6 @@ - %TypeHeaderCode - #include - #include --#include - %End - - %ConvertFromTypeCode -diff -ru PyKDE-3.16.0.orig/sip/kdeui/kaction.sip PyKDE-3.16.0/sip/kdeui/kaction.sip ---- PyKDE-3.16.0.orig/sip/kdeui/kaction.sip 2006-09-22 04:11:15.000000000 +0100 -+++ PyKDE-3.16.0/sip/kdeui/kaction.sip 2007-06-23 09:55:30.000000000 +0100 -@@ -694,7 +694,6 @@ - #include - #include - //typedef QValueList KActionPtrList; --#include - %End - - %ConvertFromTypeCode -diff -ru PyKDE-3.16.0.orig/sip/kdeui/kdeuimod.sip PyKDE-3.16.0/sip/kdeui/kdeuimod.sip ---- PyKDE-3.16.0.orig/sip/kdeui/kdeuimod.sip 2006-09-22 09:02:15.000000000 +0100 -+++ PyKDE-3.16.0/sip/kdeui/kdeuimod.sip 2007-06-25 12:03:44.000000000 +0100 -@@ -133,11 +133,13 @@ - %Include kpassivepopup.sip - %Include kpixmapregionselectordialog.sip - %Include kpixmapregionselectorwidget.sip -+%Include kscrollview.sip - %Include kshortcutdialog.sip - %Include ksplashscreen.sip - %Include ktabbar.sip - %Include ktabwidget.sip - %Include ktextedit.sip - %Include ktimewidget.sip -+%Include ktimezonewidget.sip - %Include ktoolbarlabelaction.sip - %Include kwindowinfo.sip -diff -ru PyKDE-3.16.0.orig/sip/kdeui/kkeydialog.sip PyKDE-3.16.0/sip/kdeui/kkeydialog.sip ---- PyKDE-3.16.0.orig/sip/kdeui/kkeydialog.sip 2006-09-22 04:11:15.000000000 +0100 -+++ PyKDE-3.16.0/sip/kdeui/kkeydialog.sip 2007-06-23 09:55:30.000000000 +0100 -@@ -181,8 +181,6 @@ - { - %TypeHeaderCode - #include --#include --#include - typedef QDict IntDict; - %End - -@@ -231,7 +229,7 @@ - QDict* qdict = new QDict; - - PyObject *key, *value; -- int pos = 0; -+ SIP_SSIZE_T pos = 0; - QString *a0; - int a1; - -diff -ru PyKDE-3.16.0.orig/sip/kdeui/klistview.sip PyKDE-3.16.0/sip/kdeui/klistview.sip ---- PyKDE-3.16.0.orig/sip/kdeui/klistview.sip 2006-09-22 04:11:15.000000000 +0100 -+++ PyKDE-3.16.0/sip/kdeui/klistview.sip 2007-06-23 09:55:30.000000000 +0100 -@@ -268,7 +268,6 @@ - %TypeHeaderCode - #include - #include --#include - typedef QPtrList ListViewItems; - %End - -diff -ru PyKDE-3.16.0.orig/sip/kdeui/kmainwindow.sip PyKDE-3.16.0/sip/kdeui/kmainwindow.sip ---- PyKDE-3.16.0.orig/sip/kdeui/kmainwindow.sip 2006-09-22 04:11:15.000000000 +0100 -+++ PyKDE-3.16.0/sip/kdeui/kmainwindow.sip 2007-06-23 09:55:30.000000000 +0100 -@@ -206,7 +206,6 @@ - %TypeHeaderCode - #include - #include --#include - %End - - %ConvertFromTypeCode -diff -ru PyKDE-3.16.0.orig/sip/kdeui/kstdguiitem.sip PyKDE-3.16.0/sip/kdeui/kstdguiitem.sip ---- PyKDE-3.16.0.orig/sip/kdeui/kstdguiitem.sip 2006-09-22 04:11:15.000000000 +0100 -+++ PyKDE-3.16.0/sip/kdeui/kstdguiitem.sip 2007-06-23 09:55:30.000000000 +0100 -@@ -292,7 +292,6 @@ - { - %TypeHeaderCode - #include --#include - %End - - %ConvertFromTypeCode -diff -ru PyKDE-3.16.0.orig/sip/kdeui/kxmlguifactory.sip PyKDE-3.16.0/sip/kdeui/kxmlguifactory.sip ---- PyKDE-3.16.0.orig/sip/kdeui/kxmlguifactory.sip 2006-09-22 04:11:15.000000000 +0100 -+++ PyKDE-3.16.0/sip/kdeui/kxmlguifactory.sip 2007-06-23 09:55:30.000000000 +0100 -@@ -89,7 +89,6 @@ - %TypeHeaderCode - #include - #include --#include - %End - - %ConvertFromTypeCode -@@ -161,7 +160,6 @@ - %TypeHeaderCode - #include - #include --#include - %End - - %ConvertFromTypeCode -@@ -232,7 +230,6 @@ - { - %TypeHeaderCode - #include --#include - %End - - %ConvertFromTypeCode -diff -ru PyKDE-3.16.0.orig/sip/kfile/kdirsize.sip PyKDE-3.16.0/sip/kfile/kdirsize.sip ---- PyKDE-3.16.0.orig/sip/kfile/kdirsize.sip 2006-09-22 04:11:14.000000000 +0100 -+++ PyKDE-3.16.0/sip/kfile/kdirsize.sip 2007-06-23 09:55:30.000000000 +0100 -@@ -27,7 +27,6 @@ - class KDirSize : KIO::Job - { - %TypeHeaderCode --#include - #include - %End - -diff -ru PyKDE-3.16.0.orig/sip/kfile/kfiletreebranch.sip PyKDE-3.16.0/sip/kfile/kfiletreebranch.sip ---- PyKDE-3.16.0.orig/sip/kfile/kfiletreebranch.sip 2006-09-22 04:11:14.000000000 +0100 -+++ PyKDE-3.16.0/sip/kfile/kfiletreebranch.sip 2007-06-23 09:55:30.000000000 +0100 -@@ -87,7 +87,6 @@ - %TypeHeaderCode - #include - typedef QPtrList KFileTreeViewItemList; --#include - %End - - %ConvertFromTypeCode -@@ -162,7 +161,6 @@ - { - %TypeHeaderCode - #include --#include - //typedef QPtrList KFileTreeBList; - %End - -diff -ru PyKDE-3.16.0.orig/sip/kfile/knotifydialog.sip PyKDE-3.16.0/sip/kfile/knotifydialog.sip ---- PyKDE-3.16.0.orig/sip/kfile/knotifydialog.sip 2006-09-22 04:11:14.000000000 +0100 -+++ PyKDE-3.16.0/sip/kfile/knotifydialog.sip 2007-06-23 09:55:30.000000000 +0100 -@@ -246,7 +246,6 @@ - %TypeHeaderCode - #include - #include --#include - %End - - %ConvertFromTypeCode -diff -ru PyKDE-3.16.0.orig/sip/khtml/dom2_events.sip PyKDE-3.16.0/sip/khtml/dom2_events.sip ---- PyKDE-3.16.0.orig/sip/khtml/dom2_events.sip 2006-09-22 04:11:13.000000000 +0100 -+++ PyKDE-3.16.0/sip/khtml/dom2_events.sip 2007-06-23 09:55:30.000000000 +0100 -@@ -86,7 +86,7 @@ - - public: - //force -- typedef longlong DOMTimeStamp; -+ typedef long long DOMTimeStamp; - //end - - }; // class Event -diff -ru PyKDE-3.16.0.orig/sip/khtml/khtml_settings.sip PyKDE-3.16.0/sip/khtml/khtml_settings.sip ---- PyKDE-3.16.0.orig/sip/khtml/khtml_settings.sip 2006-09-22 04:11:13.000000000 +0100 -+++ PyKDE-3.16.0/sip/khtml/khtml_settings.sip 2007-06-23 09:55:30.000000000 +0100 -@@ -214,9 +214,6 @@ - #include - #include - #include --#include --#include --#include - typedef QPair AssignPair; - %End - -diff -ru PyKDE-3.16.0.orig/sip/kio/authinfo.sip PyKDE-3.16.0/sip/kio/authinfo.sip ---- PyKDE-3.16.0.orig/sip/kio/authinfo.sip 2006-09-22 04:11:14.000000000 +0100 -+++ PyKDE-3.16.0/sip/kio/authinfo.sip 2007-06-23 09:55:30.000000000 +0100 -@@ -127,8 +127,6 @@ - { - //converts a Python dict of QString:QStringList - %TypeHeaderCode --#include --#include - #include - typedef QMap KStringListMap; - %End -@@ -176,7 +174,7 @@ - QMap *map = new QMap; - - PyObject *key, *value; -- int pos = 0; -+ SIP_SSIZE_T pos = 0; - QString *sKey; - QStringList *sData; - -diff -ru PyKDE-3.16.0.orig/sip/kio/chmodjob.sip PyKDE-3.16.0/sip/kio/chmodjob.sip ---- PyKDE-3.16.0.orig/sip/kio/chmodjob.sip 2006-09-22 04:11:14.000000000 +0100 -+++ PyKDE-3.16.0/sip/kio/chmodjob.sip 2007-06-23 09:55:30.000000000 +0100 -@@ -30,15 +30,6 @@ - { - %TypeHeaderCode - #include --namespace KIO --{ --class ChmodInfo --{ --public: -- KURL url; -- int permissions; --}; --}; - #include - %End - -diff -ru PyKDE-3.16.0.orig/sip/kio/global.sip PyKDE-3.16.0/sip/kio/global.sip ---- PyKDE-3.16.0.orig/sip/kio/global.sip 2006-09-22 04:11:14.000000000 +0100 -+++ PyKDE-3.16.0/sip/kio/global.sip 2007-06-23 09:55:30.000000000 +0100 -@@ -24,15 +24,13 @@ - // 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - %ModuleHeaderCode --#include --#include --#include -+#include - %End - - namespace KIO - { --typedef longlong fileoffset_t; --typedef ulonglong filesize_t; -+typedef long long fileoffset_t; -+typedef unsigned long long filesize_t; - QString convertSize (KIO::filesize_t); - - %If ( KDE_3_5_0 - ) -@@ -464,10 +462,6 @@ - sipRes = a0; - %End - --%ModuleHeaderCode --#include --%End -- - KIO::UDSEntryList testKIOUDSEntryList (KIO::UDSEntryList); - %MethodCode - //takes list | (KIO.UDSEntryList) -@@ -476,7 +470,6 @@ - %End - - %ModuleHeaderCode --#include - #include - %End - -@@ -509,8 +502,6 @@ - %TypeHeaderCode - #include - #include --#include --#include - %End - - %ConvertFromTypeCode -@@ -579,7 +570,6 @@ - %TypeHeaderCode - #include - #include --#include - %End - - %ConvertFromTypeCode -@@ -650,7 +640,6 @@ - %TypeHeaderCode - #include - #include --#include - %End - - %ConvertFromTypeCode -@@ -702,7 +691,7 @@ - QMap *cppmap = new QMap; - - PyObject *aelem, *belem; -- int pos = 0; -+ SIP_SSIZE_T pos = 0; - QString *acpp; - QString *bcpp; - -diff -ru PyKDE-3.16.0.orig/sip/kio/kacl.sip PyKDE-3.16.0/sip/kio/kacl.sip ---- PyKDE-3.16.0.orig/sip/kio/kacl.sip 2006-09-22 04:11:14.000000000 +0100 -+++ PyKDE-3.16.0/sip/kio/kacl.sip 2007-06-25 10:27:09.000000000 +0100 -@@ -94,8 +94,6 @@ - #include - #include - #include --#include --#include - %End - - %ConvertFromTypeCode -diff -ru PyKDE-3.16.0.orig/sip/kio/kdatatool.sip PyKDE-3.16.0/sip/kio/kdatatool.sip ---- PyKDE-3.16.0.orig/sip/kio/kdatatool.sip 2006-09-22 04:11:14.000000000 +0100 -+++ PyKDE-3.16.0/sip/kio/kdatatool.sip 2007-06-23 09:55:30.000000000 +0100 -@@ -100,7 +100,6 @@ - { - %TypeHeaderCode - #include --#include - %End - - %ConvertFromTypeCode -diff -ru PyKDE-3.16.0.orig/sip/kio/kdirlister.sip PyKDE-3.16.0/sip/kio/kdirlister.sip ---- PyKDE-3.16.0.orig/sip/kio/kdirlister.sip 2006-09-22 04:11:14.000000000 +0100 -+++ PyKDE-3.16.0/sip/kio/kdirlister.sip 2007-06-23 09:55:30.000000000 +0100 -@@ -129,7 +129,7 @@ - //converts a Python list of KFileItem - { - %TypeHeaderCode --#include -+#include - %End - - %ConvertFromTypeCode -@@ -200,7 +200,6 @@ - { - %TypeHeaderCode - #include --#include - %End - - %ConvertFromTypeCode -diff -ru PyKDE-3.16.0.orig/sip/kio/kiomod.sip PyKDE-3.16.0/sip/kio/kiomod.sip ---- PyKDE-3.16.0.orig/sip/kio/kiomod.sip 2006-09-22 09:02:30.000000000 +0100 -+++ PyKDE-3.16.0/sip/kio/kiomod.sip 2007-06-25 12:03:51.000000000 +0100 -@@ -96,6 +96,7 @@ - %Include thumbcreator.sip - %Include davjob.sip - %Include forwardingslavebase.sip -+%Include kacl.sip - %Include kar.sip - %Include kdcopservicestarter.sip - %Include kfileshare.sip -diff -ru PyKDE-3.16.0.orig/sip/kio/kmimetype.sip PyKDE-3.16.0/sip/kio/kmimetype.sip ---- PyKDE-3.16.0.orig/sip/kio/kmimetype.sip 2006-09-22 14:11:53.000000000 +0100 -+++ PyKDE-3.16.0/sip/kio/kmimetype.sip 2007-06-23 09:55:30.000000000 +0100 -@@ -244,7 +244,6 @@ - %TypeHeaderCode - #include - #include --#include - %End - - %ConvertFromTypeCode -@@ -287,8 +286,6 @@ - { - %TypeHeaderCode - #include --#include --#include - #include - %End - -@@ -357,7 +354,6 @@ - { - %TypeHeaderCode - #include --#include - %End - - %ConvertFromTypeCode -diff -ru PyKDE-3.16.0.orig/sip/kio/kprotocolinfo.sip PyKDE-3.16.0/sip/kio/kprotocolinfo.sip ---- PyKDE-3.16.0.orig/sip/kio/kprotocolinfo.sip 2006-09-22 04:11:14.000000000 +0100 -+++ PyKDE-3.16.0/sip/kio/kprotocolinfo.sip 2007-06-23 09:55:30.000000000 +0100 -@@ -179,7 +179,6 @@ - %TypeHeaderCode - #include - #include --#include - %End - - %ConvertFromTypeCode -diff -ru PyKDE-3.16.0.orig/sip/kio/kservice.sip PyKDE-3.16.0/sip/kio/kservice.sip ---- PyKDE-3.16.0.orig/sip/kio/kservice.sip 2006-09-22 04:11:14.000000000 +0100 -+++ PyKDE-3.16.0/sip/kio/kservice.sip 2007-06-23 09:55:30.000000000 +0100 -@@ -164,7 +164,6 @@ - %TypeHeaderCode - #include - #include --#include - //typedef KSharedPtr SvcPtr; - //typedef KService::Ptr SvcPtr; - %End -@@ -210,8 +209,6 @@ - %TypeHeaderCode - #include - #include --#include --#include - //typedef KSharedPtr Ptr; - //typedef QValueList SvcList; - //typedef KService::List SvcList; -diff -ru PyKDE-3.16.0.orig/sip/kio/kservicegroup.sip PyKDE-3.16.0/sip/kio/kservicegroup.sip ---- PyKDE-3.16.0.orig/sip/kio/kservicegroup.sip 2006-09-22 04:11:14.000000000 +0100 -+++ PyKDE-3.16.0/sip/kio/kservicegroup.sip 2007-06-23 09:55:30.000000000 +0100 -@@ -165,7 +165,6 @@ - %TypeHeaderCode - #include - #include --#include - %End - - %ConvertFromTypeCode -@@ -211,9 +210,6 @@ - #include - #include - #include --#include --#include --#include - #include - %End - -diff -ru PyKDE-3.16.0.orig/sip/kio/kservicetype.sip PyKDE-3.16.0/sip/kio/kservicetype.sip ---- PyKDE-3.16.0.orig/sip/kio/kservicetype.sip 2006-09-22 04:11:14.000000000 +0100 -+++ PyKDE-3.16.0/sip/kio/kservicetype.sip 2007-06-23 09:55:30.000000000 +0100 -@@ -88,7 +88,6 @@ - %TypeHeaderCode - #include - #include --#include - %End - - %ConvertFromTypeCode -@@ -132,7 +131,6 @@ - %TypeHeaderCode - #include - #include --#include - %End - - %ConvertFromTypeCode -@@ -183,7 +181,7 @@ - QMap *cppmap = new QMap; - - PyObject *aelem, *belem; -- int pos = 0; -+ SIP_SSIZE_T pos = 0; - QString *acpp; - QVariant::Type bcpp; - -@@ -216,8 +214,6 @@ - { - %TypeHeaderCode - #include --#include --#include - %End - - %ConvertFromTypeCode -diff -ru PyKDE-3.16.0.orig/sip/kio/ksycocaentry.sip PyKDE-3.16.0/sip/kio/ksycocaentry.sip ---- PyKDE-3.16.0.orig/sip/kio/ksycocaentry.sip 2006-09-22 04:11:14.000000000 +0100 -+++ PyKDE-3.16.0/sip/kio/ksycocaentry.sip 2007-06-23 09:55:30.000000000 +0100 -@@ -71,7 +71,6 @@ - %TypeHeaderCode - #include - #include --#include - %End - - %ConvertFromTypeCode -@@ -117,12 +116,7 @@ - #include - #include - #include --#include - #include --#include --#include --#include --#include - #include - %End - -diff -ru PyKDE-3.16.0.orig/sip/kio/ktrader.sip PyKDE-3.16.0/sip/kio/ktrader.sip ---- PyKDE-3.16.0.orig/sip/kio/ktrader.sip 2006-09-22 04:11:14.000000000 +0100 -+++ PyKDE-3.16.0/sip/kio/ktrader.sip 2007-06-23 09:55:30.000000000 +0100 -@@ -57,7 +57,6 @@ - { - %TypeHeaderCode - #include --#include - #include - %End - -diff -ru PyKDE-3.16.0.orig/sip/kio/kuserprofile.sip PyKDE-3.16.0/sip/kio/kuserprofile.sip ---- PyKDE-3.16.0.orig/sip/kio/kuserprofile.sip 2006-09-22 04:11:14.000000000 +0100 -+++ PyKDE-3.16.0/sip/kio/kuserprofile.sip 2007-06-23 09:55:30.000000000 +0100 -@@ -83,7 +83,6 @@ - #include - #include - #include --#include - %End - - %ConvertFromTypeCode -@@ -151,7 +150,6 @@ - %TypeHeaderCode - #include - #include --#include - //typedef QPtrList SvcTypeProfileList; - %End - -diff -ru PyKDE-3.16.0.orig/sip/kmdi/kmdichildfrm.sip PyKDE-3.16.0/sip/kmdi/kmdichildfrm.sip ---- PyKDE-3.16.0.orig/sip/kmdi/kmdichildfrm.sip 2006-09-22 04:11:14.000000000 +0100 -+++ PyKDE-3.16.0/sip/kmdi/kmdichildfrm.sip 2007-06-23 09:55:30.000000000 +0100 -@@ -196,8 +196,6 @@ - { - %TypeHeaderCode - #include --#include --#include - %End - - %ConvertFromTypeCode -@@ -245,7 +243,7 @@ - QDict* qdict = new QDict; - - PyObject *key, *value; -- int pos = 0; -+ SIP_SSIZE_T pos = 0; - QString *a0; - QWidget::FocusPolicy a1; - -diff -ru PyKDE-3.16.0.orig/sip/kparts/browserextension.sip PyKDE-3.16.0/sip/kparts/browserextension.sip ---- PyKDE-3.16.0.orig/sip/kparts/browserextension.sip 2006-09-22 04:11:15.000000000 +0100 -+++ PyKDE-3.16.0/sip/kparts/browserextension.sip 2007-06-23 09:55:30.000000000 +0100 -@@ -30,7 +30,6 @@ - { - %TypeHeaderCode - #include --#include - %End - - -@@ -419,7 +418,7 @@ - QMap *cppmap = new QMap; - - PyObject *aelem, *belem; -- int pos = 0; -+ SIP_SSIZE_T pos = 0; - QCString *acpp; - QCString *bcpp; - -@@ -503,7 +502,7 @@ - QMap *cppmap = new QMap; - - PyObject *aelem, *belem; -- int pos = 0; -+ SIP_SSIZE_T pos = 0; - QCString *acpp; - int bcpp; - -diff -ru PyKDE-3.16.0.orig/sip/kparts/kpartsmod.sip PyKDE-3.16.0/sip/kparts/kpartsmod.sip ---- PyKDE-3.16.0.orig/sip/kparts/kpartsmod.sip 2006-09-22 09:03:39.000000000 +0100 -+++ PyKDE-3.16.0/sip/kparts/kpartsmod.sip 2007-06-25 12:04:24.000000000 +0100 -@@ -48,4 +48,5 @@ - %Include part.sip - %Include partmanager.sip - %Include plugin.sip -+%Include konsole_part.sip - %Include statusbarextension.sip -diff -ru PyKDE-3.16.0.orig/sip/kparts/part.sip PyKDE-3.16.0/sip/kparts/part.sip ---- PyKDE-3.16.0.orig/sip/kparts/part.sip 2006-09-22 04:11:15.000000000 +0100 -+++ PyKDE-3.16.0/sip/kparts/part.sip 2007-06-23 09:55:30.000000000 +0100 -@@ -284,6 +284,8 @@ - - - %ModuleCode -+#include -+ - KParts::ReadOnlyPart *createReadOnlyPart (const QString& lib, QObject *parent, const QString& name, const char *className, - const QStringList &args) - { -diff -ru PyKDE-3.16.0.orig/sip/kresources/selectdialog.sip PyKDE-3.16.0/sip/kresources/selectdialog.sip ---- PyKDE-3.16.0.orig/sip/kresources/selectdialog.sip 2006-09-22 04:11:14.000000000 +0100 -+++ PyKDE-3.16.0/sip/kresources/selectdialog.sip 2007-06-23 09:55:30.000000000 +0100 -@@ -64,7 +64,6 @@ - %TypeHeaderCode - #include - #include --#include - %End - - %ConvertFromTypeCode -diff -ru PyKDE-3.16.0.orig/sip/kspell/ksconfig.sip PyKDE-3.16.0/sip/kspell/ksconfig.sip ---- PyKDE-3.16.0.orig/sip/kspell/ksconfig.sip 2006-09-22 04:11:14.000000000 +0100 -+++ PyKDE-3.16.0/sip/kspell/ksconfig.sip 2007-06-23 09:55:30.000000000 +0100 -@@ -102,6 +102,10 @@ - }; // class KSpellConfig - - -+%ModuleCode -+#include -+%End -+ - %If ( KDE_3_1_4 - ) - - enum Encoding -diff -ru PyKDE-3.16.0.orig/sip/kspell/kspelldlg.sip PyKDE-3.16.0/sip/kspell/kspelldlg.sip ---- PyKDE-3.16.0.orig/sip/kspell/kspelldlg.sip 2006-09-22 04:11:14.000000000 +0100 -+++ PyKDE-3.16.0/sip/kspell/kspelldlg.sip 2007-06-23 09:55:30.000000000 +0100 -@@ -89,6 +89,10 @@ - }; // class KSpellDlg - - -+%ModuleCode -+#include -+%End -+ - %If ( KDE_3_2_0 - ) - - enum KS_RESULT -diff -ru PyKDE-3.16.0.orig/sip/kutils/kplugininfo.sip PyKDE-3.16.0/sip/kutils/kplugininfo.sip ---- PyKDE-3.16.0.orig/sip/kutils/kplugininfo.sip 2006-09-22 04:11:15.000000000 +0100 -+++ PyKDE-3.16.0/sip/kutils/kplugininfo.sip 2007-06-23 09:55:30.000000000 +0100 -@@ -83,7 +83,6 @@ - %TypeHeaderCode - #include - #include --#include - %End - - %ConvertFromTypeCode diff --git a/PyKDE.spec b/PyKDE.spec index 2963f03..a336336 100644 --- a/PyKDE.spec +++ b/PyKDE.spec @@ -2,23 +2,19 @@ # Fedora review: # http://bugzilla.redhat.com/190367 -Summary: Python bindings for KDE +Summary: Python bindings for KDE3 Name: PyKDE -Version: 3.16.0 -Release: 12%{?dist} +Version: 3.16.1 +Release: 1%{?dist} License: GPLv2 URL: http://www.riverbankcomputing.co.uk/pykde/ -Source0: http://www.riverbankcomputing.com/Downloads/PyKDE3/PyKDE-%{version}.tar.gz +Source0: http://www.riverbankcomputing.com/Downloads/PyKDE3/PyKDE-%{version}.tar.bz2 Group: Development/Languages BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch1: PyKDE-3.16.0-konsolepart.patch # http://mats.imk.fraunhofer.de/pipermail/pykde/2006-November/014627.html Patch2: PyKDE-3.16.0-kmimetype.patch -# http://mats.imk.fraunhofer.de/pipermail/pykde/2006-December/015025.html -Patch3: PyKDE-3.16.0-python25.patch -Patch4: http://www.riverbankcomputing.com/Downloads/PyKDE3/PyKDE-3.16.0-sip-4.7.patch BuildRequires: python-devel >= 2.3 %global python_ver %(%{__python} -c "import sys ; print sys.version[:3]") @@ -33,14 +29,12 @@ Requires: PyQt #Requires: PyQt = %{pyqt_ver} #endif -BuildRequires: kdelibs3-devel kdebase3 -%global kdelibs_ver %((kde-config --version 2>/dev/null || echo KDE 3.5.8) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1) -Requires: kdelibs3 >= %{kdelibs_ver} -# for libkonsolepart.* -Requires: kdebase3 +BuildRequires: kdelibs3-devel +%global kdelibs3_ver %((kde-config --version 2>/dev/null || echo KDE 3.5.8) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1) +Requires: kdelibs3 >= %{kdelibs3_ver} %description -These are the Python bindings for KDE. +These are the Python bindings for KDE3. %package devel Summary: %{name} SIP files @@ -56,9 +50,7 @@ Sip files and documentation needed for developing with %{name} %prep %setup -q %{?snapshot:-n %{name}-snapshot%{snapshot}} -%patch1 -p1 -b .konsolepart %patch2 -p1 -b .kmimetype -%patch4 -p1 -b .sip-4.7 %build @@ -85,7 +77,6 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README THANKS %{_bindir}/* -%{_libdir}/libkonsolepart.* %{python_sitearch}/* %files devel @@ -95,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Mar 07 2008 Rex Dieter 3.16.1-1 +- PyKDE-3.16.1 + * Mon Feb 11 2008 Rex Dieter 3.16.0-12 - respin (gcc43) diff --git a/sources b/sources index 8f62d67..04c9651 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -92fa0f7d6063dc2aad97d5302975ca76 PyKDE-3.16.0.tar.gz +986e67ced4753cac5a4b7be8031ad64e PyKDE-3.16.1.tar.bz2