Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a6579112f72fb94ade8f73c9dc360a2a4aabf33e
commit a6579112f72fb94ade8f73c9dc360a2a4aabf33e Author: crazy <[EMAIL PROTECTED]> Date: Tue Mar 25 16:08:23 2008 +0100 pykde-3.16.1-1-i686 * Version bump * source fix * removed some old patches are already upstream diff --git a/source/kde-extra/pykde/FrugalBuild b/source/kde-extra/pykde/FrugalBuild index 31cb24e..213a87d 100644 --- a/source/kde-extra/pykde/FrugalBuild +++ b/source/kde-extra/pykde/FrugalBuild @@ -3,8 +3,8 @@ pkgname=pykde _F_archive_name=PyKDE -pkgver=3.16.0 -pkgrel=3 +pkgver=3.16.1 +pkgrel=1 pkgdesc="A set of Python bindings for the KDE desktop environment." url="http://www.riverbankcomputing.co.uk/pykde/index.php"; depends=('kdelibs>=3.5.5' 'kdebase>=3.5.5' 'sip>=4.5.2' 'pyqt>=3.17' 'python>=2.5') @@ -12,12 +12,10 @@ options=('scriptlet' 'force') groups=('kde-extra') archs=('i686' 'x86_64') up2date="Flasttar http://www.riverbankcomputing.co.uk/pykde/download.php"; -source=(http://www.riverbankcomputing.com/Downloads/PyKDE3/$origname-$pkgver.tar.gz \ - add-extra_cxxflags_because_the_fine_code.patch workaround_fine_logic.patch PyKDE-3.16.0.py25.diff) -sha1sums=('d4b6969e254f05e05ec7d8f3095a712afaac8189' \ - '551833d7b4cb06c1547ef1d7ecb2869b19e11873' \ - '1114c287333bc94a99f1c1d0f63bdd246028caf9' \ - 'd7ef565aa9e17c552aef962aee18189b0b1933b8') +source=(http://www.riverbankcomputing.com/Downloads/PyKDE3/$_F_archive_name-$pkgver.tar.bz2 \ + add-extra_cxxflags_because_the_fine_code.patch) +sha1sums=('f3b206ae0795cd58567ce01919e66132a9351fdc' \ + '551833d7b4cb06c1547ef1d7ecb2869b19e11873') build() diff --git a/source/kde-extra/pykde/PyKDE-3.16.0.py25.diff b/source/kde-extra/pykde/PyKDE-3.16.0.py25.diff deleted file mode 100644 index 0bac325..0000000 --- a/source/kde-extra/pykde/PyKDE-3.16.0.py25.diff +++ /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<QCString,DCOPRef> *cppmap = new QMap<QCString,DCOPRef>; - - PyObject *aelem, *belem; -- int pos = 0; -+ SIP_SSIZE_T pos = 0; - QCString *acpp; - DCOPRef *bcpp; - -@@ -717,7 +717,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/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<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/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<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/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<QString,QString> *cppmap = new QMap<QString,QString>; - - 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<QChar,QString> *map = new QMap<QChar,QString>; - - PyObject *key, *value; -- int pos = 0; -+ SIP_SSIZE_T pos = 0; - QChar *cKey; - QString *sData; - -@@ -251,7 +251,7 @@ - QMap<QString, QStringList> *map = new QMap<QString, QStringList>; - - PyObject *key, *value; -- int pos = 0; -+ SIP_SSIZE_T pos = 0; - QString *sKey; - QStringList *slData; - -@@ -334,7 +334,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/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<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/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<int>* qdict = new QDict<int>; - - 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<QString, QStringList> *map = new QMap<QString, QStringList>; - - 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<QString,QString> *cppmap = new QMap<QString,QString>; - - 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<QString,QVariant::Type> *cppmap = new QMap<QString,QVariant::Type>; - - 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<QWidget::FocusPolicy>* qdict = new QDict<QWidget::FocusPolicy>; - - 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<QCString,QCString> *cppmap = new QMap<QCString,QCString>; - - PyObject *aelem, *belem; -- int pos = 0; -+ SIP_SSIZE_T pos = 0; - QCString *acpp; - QCString *bcpp; - -@@ -503,7 +503,7 @@ - QMap<QCString,int> *cppmap = new QMap<QCString,int>; - - PyObject *aelem, *belem; -- int pos = 0; -+ SIP_SSIZE_T pos = 0; - QCString *acpp; - int bcpp; - diff --git a/source/kde-extra/pykde/workaround_fine_logic.patch b/source/kde-extra/pykde/workaround_fine_logic.patch deleted file mode 100644 index 2919fd0..0000000 --- a/source/kde-extra/pykde/workaround_fine_logic.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Naur PyKDE-3.16.0/configure.py PyKDE-3.16.0-p/configure.py ---- PyKDE-3.16.0/configure.py 2006-09-22 10:05:49.000000000 +0200 -+++ PyKDE-3.16.0-p/configure.py 2006-09-26 01:41:32.630834118 +0200 -@@ -766,10 +766,11 @@ - f = open ("Makefile", "r") - buff = f.read () - 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") -+ ## F****G THINK FIRST ABOUT *WHAT* YOU ARE DOING HERE ## -+ #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") - f = open ("Makefile.new", "w") - f.write (buff) - f.close () _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
