added python GDAL requirement to support GDAL Tool Plugin
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/qgis?expand=0&rev=128
This commit is contained in:
Otto Dassau
Git OBS Bridge
parent
a39cdd27f5
commit
9162f3852e
@ -23,6 +23,7 @@ Requires: python-qt4
|
||||
Requires: python-sip
|
||||
Requires: python-xml
|
||||
Requires: gpsbabel
|
||||
Requires: python-gdal
|
||||
BuildRequires: qwt-devel >= 5
|
||||
BuildRequires: libexpat-devel
|
||||
BuildRequires: python-devel
|
||||
|
||||
@ -1,202 +0,0 @@
|
||||
--- qgis-1.3.0/python/core/conversions.sip 2009-05-14 17:58:24.000000000 +0200
|
||||
+++ qgis_head/python/core/conversions.sip 2009-11-30 15:07:42.000000000 +0100
|
||||
@@ -3,6 +3,7 @@
|
||||
which are not wrapped by PyQt:
|
||||
- QVector< QVector<TYPE> >
|
||||
- QVector< QVector< QVector<TYPE> > >
|
||||
+- QList< QList<TYPE> >
|
||||
- QSet<int>
|
||||
- QSet<TYPE>
|
||||
- QMap<int, QMap<int, TYPE> >
|
||||
@@ -19,6 +20,7 @@
|
||||
#if (PY_VERSION_HEX < 0x02050000)
|
||||
typedef int Py_ssize_t;
|
||||
#endif
|
||||
+
|
||||
%End
|
||||
|
||||
|
||||
@@ -28,6 +30,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 +110,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
|
||||
@@ -175,10 +185,93 @@
|
||||
};
|
||||
|
||||
|
||||
+
|
||||
+template <TYPE>
|
||||
+%MappedType QList< QList<TYPE> >
|
||||
+{
|
||||
+%TypeHeaderCode
|
||||
+#include <QList>
|
||||
+%End
|
||||
+
|
||||
+%ConvertFromTypeCode
|
||||
+ // Create the list.
|
||||
+ PyObject *l;
|
||||
+
|
||||
+ if ((l = PyList_New(sipCpp->size())) == NULL)
|
||||
+ return NULL;
|
||||
+
|
||||
+ const sipMappedType* qlist_type = sipFindMappedType("QList<TYPE>");
|
||||
+
|
||||
+ // Set the list elements.
|
||||
+ for (int i = 0; i < sipCpp->size(); ++i)
|
||||
+ {
|
||||
+ QList<TYPE>* t = new QList<TYPE>(sipCpp->at(i));
|
||||
+ PyObject *tobj;
|
||||
+
|
||||
+ if ((tobj = sipConvertFromMappedType(t, qlist_type, sipTransferObj)) == NULL)
|
||||
+ {
|
||||
+ Py_DECREF(l);
|
||||
+ delete t;
|
||||
+ return NULL;
|
||||
+ }
|
||||
+ PyList_SET_ITEM(l, i, tobj);
|
||||
+ }
|
||||
+
|
||||
+ return l;
|
||||
+%End
|
||||
+
|
||||
+%ConvertToTypeCode
|
||||
+ const sipMappedType* qlist_type = sipFindMappedType("QList<TYPE>");
|
||||
+
|
||||
+ // Check the type if that is all that is required.
|
||||
+ if (sipIsErr == NULL)
|
||||
+ {
|
||||
+ if (!PyList_Check(sipPy))
|
||||
+ return 0;
|
||||
+
|
||||
+ for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
|
||||
+ if (!sipCanConvertToMappedType(PyList_GET_ITEM(sipPy, i), qlist_type, SIP_NOT_NONE))
|
||||
+ return 0;
|
||||
+
|
||||
+ return 1;
|
||||
+ }
|
||||
+
|
||||
+
|
||||
+ QList< QList<TYPE> > *ql = new QList< QList<TYPE> >;
|
||||
+
|
||||
+ for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
|
||||
+ {
|
||||
+ int state;
|
||||
+ //TYPE *t = reinterpret_cast<TYPE *>(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
|
||||
+ QList<TYPE> * t = reinterpret_cast< QList<TYPE> * >(sipConvertToMappedType(PyList_GET_ITEM(sipPy, i), qlist_type, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
|
||||
+
|
||||
+ if (*sipIsErr)
|
||||
+ {
|
||||
+ sipReleaseInstance(t, sipClass_TYPE, state);
|
||||
+ delete ql;
|
||||
+ return 0;
|
||||
+ }
|
||||
+ ql->append(*t);
|
||||
+ sipReleaseInstance(t, sipClass_TYPE, state);
|
||||
+ }
|
||||
+
|
||||
+ *sipCppPtr = ql;
|
||||
+ return sipGetState(sipTransferObj);
|
||||
+%End
|
||||
+
|
||||
+};
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
%MappedType QSet<int>
|
||||
{
|
||||
%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 +322,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 +398,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 +519,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 +623,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 +735,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 +857,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
|
||||
@ -1,94 +0,0 @@
|
||||
--- qgis-1.0.0/debian/rules 2008-12-28 16:54:12.000000000 +0100
|
||||
+++ qgis-1.0.0_new/debian/rules 2008-12-28 17:17:46.000000000 +0100
|
||||
@@ -18,7 +18,8 @@
|
||||
-D CMAKE_INSTALL_PREFIX=/usr \
|
||||
-D CMAKE_SKIP_RPATH=TRUE \
|
||||
-D BINDINGS_GLOBAL_INSTALL=TRUE \
|
||||
- -D PEDANTIC=TRUE
|
||||
+ -D PEDANTIC=TRUE \
|
||||
+ -D WITH_INTERNAL_SQLITE3=TRUE
|
||||
|
||||
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
|
||||
CFLAGS += -O0
|
||||
--- qgis-1.0.0/src/app/CMakeLists.txt 2008-12-28 16:54:17.000000000 +0100
|
||||
+++ qgis-1.0.0_new/src/app/CMakeLists.txt 2008-12-28 17:19:38.000000000 +0100
|
||||
@@ -188,11 +188,16 @@
|
||||
../plugins
|
||||
../python
|
||||
${PROJ_INCLUDE_DIR}
|
||||
- ${SQLITE3_INCLUDE_DIR}
|
||||
${GEOS_INCLUDE_DIR}
|
||||
${GDAL_INCLUDE_DIR}
|
||||
)
|
||||
|
||||
+IF(WITH_INTERNAL_SQLITE3)
|
||||
+ INCLUDE_DIRECTORIES(../core/sqlite3)
|
||||
+ELSE(WITH_INTERNAL_SQLITE3)
|
||||
+ INCLUDE_DIRECTORIES(${SQLITE3_INCLUDE_DIR})
|
||||
+ENDIF(WITH_INTERNAL_SQLITE3)
|
||||
+
|
||||
IF (POSTGRES_FOUND)
|
||||
INCLUDE_DIRECTORIES(${POSTGRES_INCLUDE_DIR})
|
||||
ENDIF (POSTGRES_FOUND)
|
||||
--- qgis-1.0.0/src/gui/CMakeLists.txt 2008-12-28 16:54:44.000000000 +0100
|
||||
+++ qgis-1.0.0_new/src/gui/CMakeLists.txt 2008-12-28 17:20:38.000000000 +0100
|
||||
@@ -85,10 +85,15 @@
|
||||
${QT_QTSVG_LIBRARY}
|
||||
${QT_QTNETWORK_LIBRARY}
|
||||
${QT_QTMAIN_LIBRARY}
|
||||
- ${SQLITE3_LIBRARIES}
|
||||
qgis_core
|
||||
)
|
||||
|
||||
+IF (WITH_INTERNAL_SQLITE3)
|
||||
+ TARGET_LINK_LIBRARIES(qgis_gui
|
||||
+ ${SQLITE3_LIBRARIES}
|
||||
+ )
|
||||
+ENDIF(WITH_INTERNAL_SQLITE3)
|
||||
+
|
||||
INSTALL(TARGETS qgis_gui
|
||||
RUNTIME DESTINATION ${QGIS_BIN_DIR}
|
||||
LIBRARY DESTINATION ${QGIS_LIB_DIR}
|
||||
--- qgis-1.0.0/src/helpviewer/CMakeLists.txt 2008-12-28 16:54:51.000000000 +0100
|
||||
+++ qgis-1.0.0_new/src/helpviewer/CMakeLists.txt 2008-12-28 17:23:23.000000000 +0100
|
||||
@@ -6,10 +6,15 @@
|
||||
main.cpp
|
||||
qgshelpserver.cpp
|
||||
qgshelpviewer.cpp
|
||||
- #../core/qgsapplication.cpp
|
||||
- #../core/qgslogger.cpp
|
||||
)
|
||||
|
||||
+IF(WITH_INTERNAL_SQLITE3)
|
||||
+ SET(HELP_SRCS
|
||||
+ ${HELP_SRCS}
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/../core/sqlite3/sqlite3.c
|
||||
+ )
|
||||
+ENDIF(WITH_INTERNAL_SQLITE3)
|
||||
+
|
||||
SET (HELP_UIS qgshelpviewerbase.ui)
|
||||
|
||||
SET (HELP_MOC_HDRS
|
||||
@@ -34,13 +39,20 @@
|
||||
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../core
|
||||
${CMAKE_CURRENT_BINARY_DIR}
|
||||
- ${SQLITE3_INCLUDE_DIR}
|
||||
)
|
||||
|
||||
+IF(WITH_INTERNAL_SQLITE3)
|
||||
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../core/sqlite3)
|
||||
+ENDIF(WITH_INTERNAL_SQLITE3)
|
||||
+
|
||||
TARGET_LINK_LIBRARIES(qgis_help
|
||||
- ${SQLITE3_LIBRARY}
|
||||
qgis_core
|
||||
)
|
||||
+
|
||||
+IF(NOT WITH_INTERNAL_SQLITE3)
|
||||
+ TARGET_LINK_LIBRARIES(qgis_help ${SQLITE3_LIBRARY})
|
||||
+ENDIF(NOT WITH_INTERNAL_SQLITE3)
|
||||
+
|
||||
IF (${QTVERSION} STRLESS "4.3.0")
|
||||
TARGET_LINK_LIBRARIES(qgis_help
|
||||
${QT_LIBRARIES}
|
||||
Loading…
Reference in New Issue
Block a user