4 files changed, 0 insertions, 212 deletions

diff --git a/graphics/qgis/files/patch-python__core__conversions.sip b/graphics/qgis/files/patch-python__core__conversions.sip
deleted file mode 100644
index 4eda9a2206a4..000000000000
--- a/graphics/qgis/files/patch-python__core__conversions.sip
+++ /dev/null
@@ -1,103 +0,0 @@
---- python/core/conversions.sip
-+++ python/core/conversions.sip
-@@ -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
diff --git a/graphics/qgis/files/patch-python__plugins__plugin_installer__qgsplugininstallerbase.ui b/graphics/qgis/files/patch-python__plugins__plugin_installer__qgsplugininstallerbase.ui
deleted file mode 100644
index 71ab745b07d4..000000000000
--- a/graphics/qgis/files/patch-python__plugins__plugin_installer__qgsplugininstallerbase.ui
+++ /dev/null
@@ -1,12 +0,0 @@
---- python/plugins/plugin_installer/qgsplugininstallerbase.ui
-+++ python/plugins/plugin_installer/qgsplugininstallerbase.ui
-@@ -14,8 +14,7 @@
-    <string>QGIS Python Plugin Installer</string>
-   </property>
-   <property name="windowIcon" >
--   <iconset resource="resources.qrc" >
--    <normaloff>:/plugins/installer/qgis-icon.png</normaloff>:/plugins/installer/qgis-icon.png</iconset>
-+   <iconset resource="resources.qrc" >:/plugins/installer/qgis-icon.png</iconset>
-   </property>
-   <property name="whatsThis" >
-    <string>QGIS Python Plugin Installer</string>
diff --git a/graphics/qgis/files/patch-src__provider_grass__qgsgrass.cpp b/graphics/qgis/files/patch-src__provider_grass__qgsgrass.cpp
deleted file mode 100644
index 1ebdba423cfe..000000000000
--- a/graphics/qgis/files/patch-src__provider_grass__qgsgrass.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
---- src/providers/grass/qgsgrass.cpp
-+++ src/providers/grass/qgsgrass.cpp
-@@ -335,10 +335,10 @@
- // #if defined(WIN32)
- //  G__setenv(( char * ) "GISDBASE", shortPath( gisdbase ).toLocal8Bit().data() );
- //#else
--  G__setenv(( char * ) "GISDBASE", gisdbase.toAscii().constData() );
-+  G__setenv( "GISDBASE", gisdbase.toAscii().data() );
- //#endif
--  G__setenv(( char * ) "LOCATION_NAME", location.toAscii().constData() );
--  G__setenv(( char * ) "MAPSET", ( char * ) "PERMANENT" ); // PERMANENT must always exist
-+  G__setenv( "LOCATION_NAME", location.toAscii().data() );
-+  G__setenv( "MAPSET", "PERMANENT" ); // PERMANENT must always exist
- 
-   // Add all available mapsets to search path
-   char **ms = G_available_mapsets();
-@@ -354,10 +354,10 @@
- // #if defined(WIN32)
- //  G__setenv(( char * ) "GISDBASE", shortPath( gisdbase ).toUtf8().data() );
- // #else
--  G__setenv(( char * ) "GISDBASE", gisdbase.toUtf8().data() );
-+  G__setenv( "GISDBASE", gisdbase.toUtf8().data() );
- // #endif
--  G__setenv(( char * ) "LOCATION_NAME", location.toUtf8().data() );
--  G__setenv(( char * ) "MAPSET", mapset.toUtf8().data() );
-+  G__setenv( "LOCATION_NAME", location.toUtf8().data() );
-+  G__setenv( "MAPSET", mapset.toUtf8().data() );
- 
-   // Add all available mapsets to search path
-   char **ms = G_available_mapsets();
-@@ -551,14 +551,14 @@
-   putenv( gisrcEnvChar );
- 
-   // Reinitialize GRASS
--  G__setenv(( char * ) "GISRC", gisrcEnv.toUtf8().data() );
-+  G__setenv( "GISRC", gisrcEnv.toUtf8().data() );
- #if defined(WIN32)
--  G__setenv(( char * ) "GISDBASE", shortPath( gisdbase ).toLocal8Bit().data() );
-+  G__setenv( "GISDBASE", shortPath( gisdbase ).toLocal8Bit().data() );
- #else
--  G__setenv(( char * ) "GISDBASE", gisdbase.toUtf8().data() );
-+  G__setenv( "GISDBASE", gisdbase.toUtf8().data() );
- #endif
--  G__setenv(( char * ) "LOCATION_NAME", location.toLocal8Bit().data() );
--  G__setenv(( char * ) "MAPSET", mapset.toLocal8Bit().data() );
-+  G__setenv( "LOCATION_NAME", location.toLocal8Bit().data() );
-+  G__setenv( "MAPSET", mapset.toLocal8Bit().data() );
-   defaultGisdbase = gisdbase;
-   defaultLocation = location;
-   defaultMapset = mapset;
-@@ -590,13 +590,13 @@
-     }
-     mMapsetLock = "";
- 
--    putenv(( char * ) "GISRC" );
-+    putenv( "GISRC" );
- 
-     // Reinitialize GRASS
--    G__setenv(( char * ) "GISRC", ( char * ) "" );
--    G__setenv(( char * ) "GISDBASE", ( char * ) "" );
--    G__setenv(( char * ) "LOCATION_NAME", ( char * ) "" );
--    G__setenv(( char * ) "MAPSET", ( char * ) "" );
-+    G__setenv( "GISRC", "" );
-+    G__setenv( "GISDBASE", "" );
-+    G__setenv( "LOCATION_NAME", "" );
-+    G__setenv( "MAPSET", "" );
-     defaultGisdbase = "";
-     defaultLocation = "";
-     defaultMapset = "";
-@@ -870,7 +870,7 @@
- {
-   QgsGrass::setLocation( gisbase, location );
- 
--  if ( G__get_window( window, ( char * ) "", ( char * ) "WIND", mapset.toUtf8().data() ) )
-+  if ( G__get_window( window, "", "WIND", mapset.toUtf8().data() ) )
-   {
-     return false;
-   }
-@@ -1003,7 +1003,7 @@
-   }
-   else if ( type == Region )
-   {
--    if ( G__get_window( window, ( char * ) "windows",
-+    if ( G__get_window( window, "windows",
-                         map.toUtf8().data(),
-                         mapset.toUtf8().data() ) != NULL )
-     {
diff --git a/graphics/qgis/files/patch-src__providers__grass__CMakeLists.txt b/graphics/qgis/files/patch-src__providers__grass__CMakeLists.txt
deleted file mode 100644
index cc96fbbf524f..000000000000
--- a/graphics/qgis/files/patch-src__providers__grass__CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/providers/grass/CMakeLists.txt
-+++ src/providers/grass/CMakeLists.txt
-@@ -18,7 +18,6 @@
-   ${GEOS_INCLUDE_DIR}
- )
- 
--
- ADD_LIBRARY (qgisgrass SHARED ${GRASS_LIB_SRCS})
- 
- SET_TARGET_PROPERTIES(qgisgrass PROPERTIES VERSION ${COMPLETE_VERSION} SOVERSION ${COMPLETE_VERSION})