rev 15182 - in branches/kde4.2/packages/kdebindings/debian: . patches
Sune Vuorela
pusling-guest at alioth.debian.org
Fri Jul 10 09:34:57 UTC 2009
Author: pusling-guest
Date: 2009-07-10 09:34:56 +0000 (Fri, 10 Jul 2009)
New Revision: 15182
Added:
branches/kde4.2/packages/kdebindings/debian/patches/kdebindings_4.2_with_sip_4.8_fix.patch
Modified:
branches/kde4.2/packages/kdebindings/debian/changelog
branches/kde4.2/packages/kdebindings/debian/control
branches/kde4.2/packages/kdebindings/debian/patches/series
branches/kde4.2/packages/kdebindings/debian/rules
Log:
* Add patch to build and work with newer sip and pyqt. Thanks to the Pardus people
and to Simon Edwards. (Closes: #532574, #533624, #53350)
* Make python dependencies ridicously strict.
Modified: branches/kde4.2/packages/kdebindings/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/changelog 2009-07-10 08:28:28 UTC (rev 15181)
+++ branches/kde4.2/packages/kdebindings/debian/changelog 2009-07-10 09:34:56 UTC (rev 15182)
@@ -1,6 +1,9 @@
-kdebindings (4:4.2.4-2) UNRELEASED; urgency=low
+kdebindings (4:4.2.4-2) unstable; urgency=low
* Fix sections
+ * Add patch to build and work with newer sip and pyqt. Thanks to the Pardus people
+ and to Simon Edwards. (Closes: #532574, #533624, #53350)
+ * Make python dependencies ridicously strict.
-- Sune Vuorela <debian at pusling.com> Wed, 03 Jun 2009 09:51:55 +0200
Modified: branches/kde4.2/packages/kdebindings/debian/control
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/control 2009-07-10 08:28:28 UTC (rev 15181)
+++ branches/kde4.2/packages/kdebindings/debian/control 2009-07-10 09:34:56 UTC (rev 15182)
@@ -215,8 +215,9 @@
Package: python-kde4
Section: python
Architecture: any
-Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends},
- python-qt4 (>= 4.4.4), python-sip4 (>= 4.7.8)
+Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends},
+ python-qt4 (>= ${python-qt4:Version}), python-qt4 (<< ${python-qt4:Version}+~),
+ python-sip4 (>= ${python-sip4:Version}), python-sip4 (<< ${python-sip4:Version}+~)
Description: Python bindings for the KDE 4 libraries
This package contains PyKDE, the Python bindings for the KDE 4
libraries, that allow you to write KDE programs using Python instead of
@@ -249,6 +250,7 @@
XB-Python-Version: ${python:Versions}
Depends: ${python:Depends}, python-qt4 (>= 4.4.4)
Recommends: python-kde4
+Breaks: python-kde4 (<< ${source:Version})
Description: UIC compiler and SIP files for PyKDE
This package contains pykdeuic4, a wrapper around PyQt's own UIC (user
interface compiler). It is needed to generate code from Qt Designer's
Added: branches/kde4.2/packages/kdebindings/debian/patches/kdebindings_4.2_with_sip_4.8_fix.patch
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/patches/kdebindings_4.2_with_sip_4.8_fix.patch (rev 0)
+++ branches/kde4.2/packages/kdebindings/debian/patches/kdebindings_4.2_with_sip_4.8_fix.patch 2009-07-10 09:34:56 UTC (rev 15182)
@@ -0,0 +1,111 @@
+Index: kdebindings/python/pykde4/sip/kio/global.sip
+===================================================================
+--- kdebindings/python/pykde4/sip/kio/global.sip (revision 990181)
++++ kdebindings/python/pykde4/sip/kio/global.sip (working copy)
+@@ -243,8 +243,8 @@
+ {
+ int iserr = 0;
+
+- acpp = (QString *)sipForceConvertTo_QString (aelem, &iserr);
+- bcpp = (QString *)sipForceConvertTo_QString (belem, &iserr);
++ acpp = (QString *)sipForceConvertToInstance(aelem, sipClass_QString, NULL, 0, NULL, &iserr);
++ bcpp = (QString *)sipForceConvertToInstance(belem, sipClass_QString, NULL, 0, NULL, &iserr);
+
+ if (iserr)
+ {
+Index: kdebindings/python/pykde4/sip/kio/kacl.sip
+===================================================================
+--- kdebindings/python/pykde4/sip/kio/kacl.sip (revision 990181)
++++ kdebindings/python/pykde4/sip/kio/kacl.sip (working copy)
+@@ -144,8 +144,7 @@
+ {
+ PyObject *elem = PyList_GET_ITEM (sipPy, i);
+ PyObject *pyp1 = PyTuple_GET_ITEM (elem, 0);
+- p1 = *(QString *)sipForceConvertTo_QString (pyp1, &iserr);
+-
++ p1 = *(QString *)sipForceConvertToInstance(pyp1, sipClass_QString, NULL, 0, NULL, &iserr);
+ if (iserr)
+ {
+ *sipIsErr = 1;
+Index: kdebindings/python/pykde4/sip/phonon/backendcapabilities.sip
+===================================================================
+--- kdebindings/python/pykde4/sip/phonon/backendcapabilities.sip (revision 990181)
++++ kdebindings/python/pykde4/sip/phonon/backendcapabilities.sip (working copy)
+@@ -26,7 +26,7 @@
+ {
+ namespace BackendCapabilities
+ {
+-class Notifier : QObject /NoDefaultCtors,NoQMetaObject/
++class Notifier : QObject /NoDefaultCtors,PyQt4NoQMetaObject/
+ {
+
+ signals:
+Index: kdebindings/python/pykde4/sip/kparts/factory.sip
+===================================================================
+--- kdebindings/python/pykde4/sip/kparts/factory.sip (revision 990181)
++++ kdebindings/python/pykde4/sip/kparts/factory.sip (working copy)
+@@ -37,7 +37,7 @@
+
+ protected:
+ virtual KParts::Part* createPartObject (QWidget* parentWidget = 0, QObject* parent /Transfer/ = 0, const char* classname = "KParts::Part", const QStringList& args = QStringList()) = 0;
+- virtual QObject* createObject (QObject* parent /Transfer/ = 0, const char* classname = "QObject", const QStringList& args = QStringList());
++//ig virtual QObject* createObject (QObject* parent /Transfer/ = 0, const char* classname = "QObject", const QStringList& args = QStringList());
+ }; // Factory
+
+ }; // KParts
+Index: kdebindings/python/pykde4/sip/akonadi/messagethreadingattribute.sip
+===================================================================
+--- kdebindings/python/pykde4/sip/akonadi/messagethreadingattribute.sip (revision 990181)
++++ kdebindings/python/pykde4/sip/akonadi/messagethreadingattribute.sip (working copy)
+@@ -30,7 +30,7 @@
+
+ public:
+ MessageThreadingAttribute ();
+- MessageThreadingAttribute (const Akonadi::MessageThreadingAttribute& other);
++//ig MessageThreadingAttribute (const Akonadi::MessageThreadingAttribute& other);
+ QList<Akonadi::Entity::Id> perfectParents () const;
+ void setPerfectParents (const QList<Akonadi::Entity::Id>& parents);
+ QList<Akonadi::Entity::Id> unperfectParents () const;
+Index: kdebindings/python/pykde4/sip/dnssd/servicebase.sip
+===================================================================
+--- kdebindings/python/pykde4/sip/dnssd/servicebase.sip (revision 990181)
++++ kdebindings/python/pykde4/sip/dnssd/servicebase.sip (working copy)
+@@ -27,7 +27,7 @@
+ %End
+
+ public:
+- typedef KSharedPtr<DNSSD::ServiceBase> Ptr;
++// typedef KSharedPtr<DNSSD::ServiceBase> Ptr;
+
+ explicit ServiceBase (const QString& name = QString(), const QString& type = QString(), const QString& domain = QString(), const QString& host = QString(), unsigned short port = 0);
+ QString serviceName () const;
+Index: kdebindings/python/pykde4/sip/kdecore/typedefs.sip
+===================================================================
+--- kdebindings/python/pykde4/sip/kdecore/typedefs.sip (revision 990181)
++++ kdebindings/python/pykde4/sip/kdecore/typedefs.sip (working copy)
+@@ -244,7 +244,7 @@
+ return PyInstance_Check(sipPy);
+
+ int iserr = 0;
+- TYPE *cpp = (TYPE *)sipForceConvertTo_TYPE (sipPy, &iserr);
++ TYPE *cpp = (TYPE *)sipForceConvertToInstance(sipPy, sipClass_TYPE, NULL, 0, NULL, &iserr);
+
+ if (iserr)
+ {
+Index: kdebindings/python/pykde4/sip/kdecore/kptydevice.sip
+===================================================================
+--- kdebindings/python/pykde4/sip/kdecore/kptydevice.sip (revision 990181)
++++ kdebindings/python/pykde4/sip/kdecore/kptydevice.sip (working copy)
+@@ -46,9 +46,9 @@
+ void readEof ();
+
+ protected:
+- virtual qint64 readData (char*, qint64);
+- virtual qint64 readLineData (char*, qint64);
+- virtual qint64 writeData (const char*, qint64);
++//ig virtual qint64 readData (char*, qint64);
++//ig virtual qint64 readLineData (char*, qint64);
++//ig virtual qint64 writeData (const char*, qint64);
+
+ }; // class KPtyDevice
+
Modified: branches/kde4.2/packages/kdebindings/debian/patches/series
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/patches/series 2009-07-10 08:28:28 UTC (rev 15181)
+++ branches/kde4.2/packages/kdebindings/debian/patches/series 2009-07-10 09:34:56 UTC (rev 15182)
@@ -1,3 +1,4 @@
+kdebindings_4.2_with_sip_4.8_fix.patch
01_python_modules_dont_link_against_libpython.diff
02_include_default_settings_in_python_cmakelist.diff
03_csharp_dont_use_qyotoshared_directly.diff
Modified: branches/kde4.2/packages/kdebindings/debian/rules
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/rules 2009-07-10 08:28:28 UTC (rev 15181)
+++ branches/kde4.2/packages/kdebindings/debian/rules 2009-07-10 09:34:56 UTC (rev 15182)
@@ -176,6 +176,10 @@
binary-indep binary-arch: build install
# Building $@. DH_OPTIONS=$(DH_OPTIONS)
+ echo "python-qt4:Version="`dpkg -l python-qt4 | tail -1 | awk '{print $$3}'` >> debian/python-kde4.substvars
+ echo "python-sip4:Version="`dpkg -l python-sip4 | tail -1 | awk '{print $$3}'` >> debian/python-kde4.substvars
+ echo "python-qt4:Version="`dpkg -l python-qt4 | tail -1 | awk '{print $$3}'` >> debian/python-kde4-dev.substvars
+ echo "python-sip4:Version="`dpkg -l python-sip4 | tail -1 | awk '{print $$3}'` >> debian/python-kde4-dev.substvars
dh_install $(DH_NO_MONOPACKAGES)
dh_testdir
dh_testroot
More information about the pkg-kde-commits
mailing list