source: orange/install-scripts/mac/fink/pyqwt-mac-py.patch @ 6529:b64a671476f8

Revision 6529:b64a671476f8, 2.8 KB checked in by Mitar <Mitar@…>, 4 years ago (diff)

Patched PyQwt for Qt3 for new PyQt version.

RevLine 
[6529]1diff -Naur PyQwt-4.2.3.orig/sip/qwt4qt3/QwtArrayQwtDoublePoint.sip PyQwt-4.2.3/sip/qwt4qt3/QwtArrayQwtDoublePoint.sip
2--- PyQwt-4.2.3.orig/sip/qwt4qt3/QwtArrayQwtDoublePoint.sip 2010-02-23 22:24:22.000000000 +0100
3+++ PyQwt-4.2.3/sip/qwt4qt3/QwtArrayQwtDoublePoint.sip  2010-02-23 22:28:22.000000000 +0100
4@@ -51,8 +51,8 @@
5     for (int i = 0; i < PyList_GET_SIZE(a0); ++i) {
6         QwtDoublePoint *item =
7             reinterpret_cast<QwtDoublePoint *>(
8-                sipForceConvertTo_QwtDoublePoint(
9-                    PyList_GET_ITEM(a0, i), &failed));
10+                sipForceConvertToType(PyList_GET_ITEM(a0, i), sipType_QwtDoublePoint, NULL, NULL, NULL, &failed));
11+
12                     
13         if (failed) {
14             return 0;
15diff -Naur PyQwt-4.2.3.orig/sip/qwt4qt3/QwtModule.sip PyQwt-4.2.3/sip/qwt4qt3/QwtModule.sip
16--- PyQwt-4.2.3.orig/sip/qwt4qt3/QwtModule.sip  2010-02-23 22:24:22.000000000 +0100
17+++ PyQwt-4.2.3/sip/qwt4qt3/QwtModule.sip   2010-02-23 22:25:05.000000000 +0100
18@@ -73,7 +73,6 @@
19 
20 // Converter code
21 %Include common/QwtMap.sip
22-%Include common/QwtMemArray.sip
23 %Include common/QwtValueStack.sip
24 %Include common/QwtValueList.sip
25 
26diff -Naur PyQwt-4.2.3.orig/sip/qwt4qt3/common/QwtMap.sip PyQwt-4.2.3/sip/qwt4qt3/common/QwtMap.sip
27--- PyQwt-4.2.3.orig/sip/qwt4qt3/common/QwtMap.sip  2010-02-23 22:24:22.000000000 +0100
28+++ PyQwt-4.2.3/sip/qwt4qt3/common/QwtMap.sip   2010-02-23 22:27:52.000000000 +0100
29@@ -77,7 +77,7 @@
30     while (PyDict_Next(sipPy, &i, &key, &val)) {
31         double cKey = PyFloat_AS_DOUBLE(key);
32         QString *cVal = reinterpret_cast<QString *>(
33-            sipForceConvertTo_QString(val, sipIsErr));
34+            sipForceConvertToType(val, sipType_QString, NULL, NULL, NULL, sipIsErr));
35 
36         if (*sipIsErr) {
37             delete map;
38diff -Naur PyQwt-4.2.3.orig/sip/qwt4qt3/qwt_plot.sip PyQwt-4.2.3/sip/qwt4qt3/qwt_plot.sip
39--- PyQwt-4.2.3.orig/sip/qwt4qt3/qwt_plot.sip   2010-02-23 22:24:22.000000000 +0100
40+++ PyQwt-4.2.3/sip/qwt4qt3/qwt_plot.sip    2010-02-23 22:29:01.000000000 +0100
41@@ -89,8 +89,6 @@
42     const QColor& canvasBackground() const;
43     void setCanvasLineWidth(int);
44     int canvasLineWidth() const;
45-    QwtPlotCurveIterator curveIterator() const;
46-    QwtPlotMarkerIterator markerIterator() const;
47     QwtDiMap canvasMap(int) const;
48     double invTransform(int, int) const;
49     int transform(int, double) const;
50diff -Naur PyQwt-4.2.3.orig/sip/qwt4qt3/qwt_slider.sip PyQwt-4.2.3/sip/qwt4qt3/qwt_slider.sip
51--- PyQwt-4.2.3.orig/sip/qwt4qt3/qwt_slider.sip 2010-02-23 22:24:22.000000000 +0100
52+++ PyQwt-4.2.3/sip/qwt4qt3/qwt_slider.sip  2010-02-23 22:26:06.000000000 +0100
53@@ -88,7 +88,7 @@
54 %If (HAS_QWT4)
55 %ConvertToSubClassCode
56     static struct class_graph {
57-        char *name;
58+        const char *name;
59         sipWrapperType **type;
60         int yes, no;
61     } graph[] = {
Note: See TracBrowser for help on using the repository browser.