summaryrefslogtreecommitdiffstats
path: root/extra/qgis/fix-compilation.patch
diff options
context:
space:
mode:
authorlesibel <lesibel@free.fr>2009-11-10 14:49:43 +0100
committerlesibel <lesibel@free.fr>2009-11-10 14:49:43 +0100
commitee4de92046628039dd091597bd75c174d510674c (patch)
treea1b7ce4bad032af3ffa5a400ff04fe5ad556997a /extra/qgis/fix-compilation.patch
parent2c6ca943baa9f5e59d0d0b4d0e66ffbc9ca4e6e1 (diff)
downloadnutyx-pakxe-ee4de92046628039dd091597bd75c174d510674c.tar.gz
nutyx-pakxe-ee4de92046628039dd091597bd75c174d510674c.tar.bz2
nutyx-pakxe-ee4de92046628039dd091597bd75c174d510674c.tar.xz
nutyx-pakxe-ee4de92046628039dd091597bd75c174d510674c.zip
Ajout de qgis#1.3.0-1
Diffstat (limited to 'extra/qgis/fix-compilation.patch')
-rw-r--r--extra/qgis/fix-compilation.patch104
1 files changed, 104 insertions, 0 deletions
diff --git a/extra/qgis/fix-compilation.patch b/extra/qgis/fix-compilation.patch
new file mode 100644
index 000000000..be295fd25
--- /dev/null
+++ b/extra/qgis/fix-compilation.patch
@@ -0,0 +1,104 @@
+diff -Nur qgis-1.3.0.old/python/core/conversions.sip qgis-1.3.0/python/core/conversions.sip
+--- qgis-1.3.0.old/python/core/conversions.sip 2009-05-14 18:58:24.000000000 +0300
++++ qgis-1.3.0/python/core/conversions.sip 2009-10-21 14:15:48.116292334 +0300
+@@ -28,6 +28,10 @@
+ {
+ %TypeHeaderCode
+ #include <QVector>
++#if (SIP_VERSION >= 0x040900)
++#define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString))
++#define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant))
++#endif
+ %End
+
+ %ConvertFromTypeCode
+@@ -104,6 +108,10 @@
+ {
+ %TypeHeaderCode
+ #include <QVector>
++#if (SIP_VERSION >= 0x040900)
++#define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString))
++#define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant))
++#endif
+ %End
+
+ %ConvertFromTypeCode
+@@ -179,6 +187,10 @@
+ {
+ %TypeHeaderCode
+ #include <QSet>
++#if (SIP_VERSION >= 0x040900)
++#define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString))
++#define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant))
++#endif
+ %End
+
+ %ConvertFromTypeCode
+@@ -229,6 +241,10 @@
+ {
+ %TypeHeaderCode
+ #include <QSet>
++#if (SIP_VERSION >= 0x040900)
++#define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString))
++#define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant))
++#endif
+ %End
+
+ %ConvertFromTypeCode
+@@ -301,6 +317,10 @@
+ {
+ %TypeHeaderCode
+ #include <QMap>
++#if (SIP_VERSION >= 0x040900)
++#define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString))
++#define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant))
++#endif
+ %End
+
+ %ConvertFromTypeCode
+@@ -418,6 +438,10 @@
+ {
+ %TypeHeaderCode
+ #include <QMap>
++#if (SIP_VERSION >= 0x040900)
++#define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString))
++#define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant))
++#endif
+ %End
+
+ %ConvertFromTypeCode
+@@ -518,7 +542,11 @@
+ %MappedType QMap<TYPE1, TYPE2*>
+ {
+ %TypeHeaderCode
+-#include <qmap.h>
++#include <QMap>
++#if (SIP_VERSION >= 0x040900)
++#define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString))
++#define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant))
++#endif
+ %End
+
+ %ConvertFromTypeCode
+@@ -626,6 +654,10 @@
+ {
+ %TypeHeaderCode
+ #include <QMultiMap>
++#if (SIP_VERSION >= 0x040900)
++#define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString))
++#define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant))
++#endif
+ %End
+
+ %ConvertFromTypeCode
+@@ -744,6 +776,10 @@
+ {
+ %TypeHeaderCode
+ #include <QMap>
++#if (SIP_VERSION >= 0x040900)
++#define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString))
++#define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant))
++#endif
+ %End
+
+ %ConvertFromTypeCode