sci-geosciences/qgis: Drop old

Package-Manager: Portage-2.3.6, Repoman-2.3.1

4 files changed, 0 insertions, 184 deletions

diff --git a/sci-geosciences/qgis/files/qgis-2.18.9-broken-psycopg2-encoding.patch b/sci-geosciences/qgis/files/qgis-2.18.9-broken-psycopg2-encoding.patch
deleted file mode 100644
index b6eb1d17159d..000000000000
--- a/sci-geosciences/qgis/files/qgis-2.18.9-broken-psycopg2-encoding.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 2c8e03de391ac8a878d56e0a491c6a70b7a4c589 Mon Sep 17 00:00:00 2001
-From: Borys Jurgiel <info@borysjurgiel.pl>
-Date: Sat, 3 Jun 2017 16:54:54 +0200
-Subject: [PATCH] [PROCESSING] [regression] One more fix for broken encoding of
- psycopg2 error messages
-
----
- python/plugins/processing/tools/postgis.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/python/plugins/processing/tools/postgis.py b/python/plugins/processing/tools/postgis.py
-index 69fab99b7f4..96c88f95f63 100644
---- a/python/plugins/processing/tools/postgis.py
-+++ b/python/plugins/processing/tools/postgis.py
-@@ -205,7 +205,7 @@ def __init__(self, host=None, port=None, dbname=None, user=None,
-                 break
-             except psycopg2.OperationalError as e:
-                 if i == 3:
--                    raise DbError(unicode(e))
-+                    raise DbError(unicode(e.pgerror, e.cursor.connection.encoding, 'replace'))
- 
-                 err = unicode(e)
-                 user = self.uri.username()
-@@ -821,7 +821,7 @@ def _exec_sql(self, cursor, sql):
-         try:
-             cursor.execute(sql)
-         except psycopg2.Error as e:
--            raise DbError(unicode(e), e.cursor.query)
-+            raise DbError(unicode(e.pgerror, e.cursor.connection.encoding, 'replace'), e.cursor.query)
- 
-     def _exec_sql_and_commit(self, sql):
-         """Tries to execute and commit some action, on error it rolls
diff --git a/sci-geosciences/qgis/files/qgis-2.18.9-dbmanager-plugin-exceptions.patch b/sci-geosciences/qgis/files/qgis-2.18.9-dbmanager-plugin-exceptions.patch
deleted file mode 100644
index 0b780c22ca6f..000000000000
--- a/sci-geosciences/qgis/files/qgis-2.18.9-dbmanager-plugin-exceptions.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From dae921c51f85f2dde2bab9b18a0d7c7c31bc700b Mon Sep 17 00:00:00 2001
-From: Luigi Pirelli <luipir@gmail.com>
-Date: Thu, 11 May 2017 17:40:32 +0200
-Subject: [PATCH] [DB Manager] previewing layers in Virtual layers section
- remove them from the Layers panel: fixies #16476 plus more vlayer db_manager
- plugin fixes to reduce (but can't avoid) exceptions due to C++/SIP object
- removes
-
----
- python/plugins/db_manager/db_plugins/vlayers/connector.py | 10 ++++++++++
- python/plugins/db_manager/layer_preview.py                | 11 +++++++----
- 2 files changed, 17 insertions(+), 4 deletions(-)
-
-diff --git a/python/plugins/db_manager/db_plugins/vlayers/connector.py b/python/plugins/db_manager/db_plugins/vlayers/connector.py
-index e64f2ec57b6..4c8cb4dca1b 100644
---- a/python/plugins/db_manager/db_plugins/vlayers/connector.py
-+++ b/python/plugins/db_manager/db_plugins/vlayers/connector.py
-@@ -96,6 +96,10 @@ def getLayer(self, l):
-         lid = self.layers.get(l)
-         if lid is None:
-             return lid
-+        # the instance can refer to a layer in map previe and not in qgis general canvas
-+        if lid not in QgsMapLayerRegistry.instance().mapLayers().keys():
-+            self.layers.pop(l)
-+            return None
-         return QgsMapLayerRegistry.instance().mapLayer(lid)
- 
- 
-@@ -246,12 +250,16 @@ def getRasterTables(self, schema=None):
-     def getTableRowCount(self, table):
-         t = table[1]
-         l = VLayerRegistry.instance().getLayer(t)
-+        if not l or not l.isValid():
-+            return None
-         return l.featureCount()
- 
-     def getTableFields(self, table):
-         """ return list of columns in table """
-         t = table[1]
-         l = VLayerRegistry.instance().getLayer(t)
-+        if not l or not l.isValid():
-+            return []
-         # id, name, type, nonnull, default, pk
-         n = l.dataProvider().fields().size()
-         f = [(i, f.name(), f.typeName(), False, None, False)
-@@ -277,6 +285,8 @@ def getTableExtent(self, table, geom):
-             l = QgsMapLayerRegistry.instance().mapLayer(t)
-         else:
-             l = VLayerRegistry.instance().getLayer(t)
-+        if not l or not l.isValid():
-+            return None
-         e = l.extent()
-         r = (e.xMinimum(), e.yMinimum(), e.xMaximum(), e.yMaximum())
-         return r
-diff --git a/python/plugins/db_manager/layer_preview.py b/python/plugins/db_manager/layer_preview.py
-index 1f7cec65526..27bba0a8f13 100644
---- a/python/plugins/db_manager/layer_preview.py
-+++ b/python/plugins/db_manager/layer_preview.py
-@@ -25,7 +25,7 @@
- from qgis.PyQt.QtWidgets import QApplication
- 
- from qgis.gui import QgsMapCanvas, QgsMapCanvasLayer, QgsMessageBar
--from qgis.core import QgsVectorLayer, QgsMapLayerRegistry
-+from qgis.core import QgsVectorLayer, QgsMapLayerRegistry, QgsProject
- 
- from .db_plugins.plugin import Table
- 
-@@ -113,15 +113,18 @@ def _loadTablePreview(self, table, limit=False):
-             else:
-                 vl = table.toMapLayer()
- 
--            if not vl.isValid():
-+            if vl and not vl.isValid():
-                 vl.deleteLater()
-                 vl = None
- 
-         # remove old layer (if any) and set new
-         if self.currentLayer:
--            QgsMapLayerRegistry.instance().removeMapLayers([self.currentLayer.id()])
-+            # but not remove it if in layer list panel
-+            # fix https://issues.qgis.org/issues/16476
-+            if not QgsProject.instance().layerTreeRoot().findLayer(self.currentLayer.id()):
-+                QgsMapLayerRegistry.instance().removeMapLayers([self.currentLayer.id()])
- 
--        if vl:
-+        if vl and vl.isValid():
-             self.setLayerSet([QgsMapCanvasLayer(vl)])
-             QgsMapLayerRegistry.instance().addMapLayers([vl], False)
-             self.zoomToFullExtent()
diff --git a/sci-geosciences/qgis/files/qgis-2.18.9-fix-plugin-config-settings.patch b/sci-geosciences/qgis/files/qgis-2.18.9-fix-plugin-config-settings.patch
deleted file mode 100644
index cbf03f146ca9..000000000000
--- a/sci-geosciences/qgis/files/qgis-2.18.9-fix-plugin-config-settings.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 008f38574e78f0557aae890f508cf5e148545d15 Mon Sep 17 00:00:00 2001
-From: "Juergen E. Fischer" <jef@norbit.de>
-Date: Wed, 31 May 2017 13:50:03 +0200
-Subject: [PATCH] processing: only reset existing menu 'settings' (followup
- e78fc620)
-
----
- python/plugins/processing/gui/ConfigDialog.py | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/python/plugins/processing/gui/ConfigDialog.py b/python/plugins/processing/gui/ConfigDialog.py
-index 85d8641fb48..d2776b7dca0 100644
---- a/python/plugins/processing/gui/ConfigDialog.py
-+++ b/python/plugins/processing/gui/ConfigDialog.py
-@@ -256,6 +256,8 @@ def resetMenusToDefaults(self):
-         for provider in providers:
-             for alg in provider.algs:
-                 d = defaultMenuEntries.get(alg.commandLineName(), "")
-+                if "MENU_" + alg.commandLineName() not in ProcessingConfig.settings:
-+                    continue
-                 setting = ProcessingConfig.settings["MENU_" + alg.commandLineName()]
-                 item = self.items[setting]
-                 item.setData(d, Qt.EditRole)
diff --git a/sci-geosciences/qgis/files/qgis-2.18.9-uncaught-exception.patch b/sci-geosciences/qgis/files/qgis-2.18.9-uncaught-exception.patch
deleted file mode 100644
index 4785385458b1..000000000000
--- a/sci-geosciences/qgis/files/qgis-2.18.9-uncaught-exception.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From ed03e99ee582cb4abd1ae08cf333da8c0975a4c8 Mon Sep 17 00:00:00 2001
-From: Luigi Pirelli <luipir@gmail.com>
-Date: Tue, 9 May 2017 13:39:23 +0200
-Subject: [PATCH] catch uncatched exception when item has lost reference.
- fixies #15868
-
----
- python/plugins/db_manager/layer_preview.py | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/python/plugins/db_manager/layer_preview.py b/python/plugins/db_manager/layer_preview.py
-index 27bba0a8f13..9947b1ef4d8 100644
---- a/python/plugins/db_manager/layer_preview.py
-+++ b/python/plugins/db_manager/layer_preview.py
-@@ -25,7 +25,7 @@
- from qgis.PyQt.QtWidgets import QApplication
- 
- from qgis.gui import QgsMapCanvas, QgsMapCanvasLayer, QgsMessageBar
--from qgis.core import QgsVectorLayer, QgsMapLayerRegistry, QgsProject
-+from qgis.core import QgsVectorLayer, QgsMapLayerRegistry, QgsProject, QgsMessageLog
- 
- from .db_plugins.plugin import Table
- 
-@@ -78,11 +78,13 @@ def setDirty(self, val=True):
-     def _clear(self):
-         """ remove any layers from preview canvas """
-         if self.item is not None:
--            ## skip exception on RuntimeError fixes #6892
-             try:
-                 self.item.aboutToChange.disconnect(self.setDirty)
--            except RuntimeError:
--                pass
-+            ## skip exception on RuntimeError fixes #6892
-+            ## skip TypeError and generic Exceptions fixes #15868
-+            ## generally due the remove of self.item object or C++ referenced object
-+            except Exception as ex:
-+                QgsMessageLog.logMessage(unicode(ex))
- 
-         self.item = None
-         self.dirty = False