diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2010-04-26 22:50:43 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2010-04-26 22:50:43 +0000 |
| commit | 84aa9c90d56b569e90c764fd8a76689d15c18f4e (patch) | |
| tree | 87b93a7c571bc8b48a75110da316883b83156a65 /sci-geosciences/qgis/files | |
| parent | Version bump. Remove older. (diff) | |
| download | gentoo-2-84aa9c90d56b569e90c764fd8a76689d15c18f4e.tar.gz gentoo-2-84aa9c90d56b569e90c764fd8a76689d15c18f4e.tar.bz2 gentoo-2-84aa9c90d56b569e90c764fd8a76689d15c18f4e.zip | |
Update to use python correctly. Drop old. Per bug #316215.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sci-geosciences/qgis/files')
| -rw-r--r-- | sci-geosciences/qgis/files/qgis-1.3.0-sip.patch | 103 |
1 files changed, 0 insertions, 103 deletions
diff --git a/sci-geosciences/qgis/files/qgis-1.3.0-sip.patch b/sci-geosciences/qgis/files/qgis-1.3.0-sip.patch deleted file mode 100644 index 620b0d0e2c60..000000000000 --- a/sci-geosciences/qgis/files/qgis-1.3.0-sip.patch +++ /dev/null @@ -1,103 +0,0 @@ ---- python/core/conversions.sip.orig 2009-11-21 19:58:32.000000000 +0000 -+++ python/core/conversions.sip 2009-11-21 20:08:49.000000000 +0000 -@@ -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 |