[qgis] 06/06: Add patches from release-2_8 branch.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Fri Feb 27 00:30:59 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository qgis.
commit b8ad451cac3a2f5dedf9624c04ef58198ea94c6e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Feb 27 01:29:56 2015 +0100
Add patches from release-2_8 branch.
---
debian/changelog | 1 +
...-ada01603cb7b10786436aa0ed2361743b52ce48f.patch | 41 ++++++++++++++++++++++
...correctly-handle-tiny-polygons-smaller-th.patch | 27 ++++++++++++++
debian/patches/series | 2 ++
4 files changed, 71 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index d63857c..135cb1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ qgis (2.8.1-1) UNRELEASED; urgency=medium
* New upstream release.
* Update grass dependencies to prevent building with unsupported GRASS 7.
* Refresh patches.
+ * Add patches from release-2_8 branch.
-- Bas Couwenberg <sebastic at debian.org> Fri, 27 Feb 2015 01:00:18 +0100
diff --git a/debian/patches/0001-backport-ada01603cb7b10786436aa0ed2361743b52ce48f.patch b/debian/patches/0001-backport-ada01603cb7b10786436aa0ed2361743b52ce48f.patch
new file mode 100644
index 0000000..927d00b
--- /dev/null
+++ b/debian/patches/0001-backport-ada01603cb7b10786436aa0ed2361743b52ce48f.patch
@@ -0,0 +1,41 @@
+From e4c21259efcfddb23f280454d89f7f715e40d1ff Mon Sep 17 00:00:00 2001
+From: Tom Kralidis <tomkralidis at gmail.com>
+Date: Thu, 26 Feb 2015 17:39:37 -0500
+Subject: backport ada01603cb7b10786436aa0ed2361743b52ce48f
+ safeguard cases where the CSW record output is erroneous
+Origin: https://github.com/qgis/QGIS/commit/e4c21259efcfddb23f280454d89f7f715e40d1ff
+
+---
+ python/plugins/MetaSearch/dialogs/maindialog.py | 14 +++++++++++++-
+ 1 file changed, 13 insertions(+), 1 deletion(-)
+
+--- a/python/plugins/MetaSearch/dialogs/maindialog.py
++++ b/python/plugins/MetaSearch/dialogs/maindialog.py
+@@ -518,7 +518,13 @@ class MetaSearchDialog(QDialog, BASE_CLA
+ return
+
+ identifier = get_item_data(item, 'identifier')
+- record = self.catalog.records[identifier]
++ try:
++ record = self.catalog.records[identifier]
++ except KeyError, err:
++ QMessageBox.warning(self,
++ self.tr('Record parsing error'),
++ 'Unable to locate record identifier')
++ return
+
+ # if the record has a bbox, show a footprint on the map
+ if record.bbox is not None:
+@@ -734,6 +740,12 @@ class MetaSearchDialog(QDialog, BASE_CLA
+ QMessageBox.warning(self, self.tr('GetRecords error'),
+ self.tr('Error getting response: %s') % err)
+ return
++ except KeyError, err:
++ QMessageBox.warning(self,
++ self.tr('Record parsing error'),
++ 'Unable to locate record identifier')
++ QApplication.restoreOverrideCursor()
++ return
+
+ QApplication.restoreOverrideCursor()
+
diff --git a/debian/patches/0001-processing-correctly-handle-tiny-polygons-smaller-th.patch b/debian/patches/0001-processing-correctly-handle-tiny-polygons-smaller-th.patch
new file mode 100644
index 0000000..22efe6b
--- /dev/null
+++ b/debian/patches/0001-processing-correctly-handle-tiny-polygons-smaller-th.patch
@@ -0,0 +1,27 @@
+From 7997c3535fc8a9cf371274796c1775066a1d9cc8 Mon Sep 17 00:00:00 2001
+From: Alexander Bruy <alexander.bruy at gmail.com>
+Date: Thu, 26 Feb 2015 21:06:59 +0200
+Subject: [processing] correctly handle tiny polygons smaller than raster cell
+ size in Hypsometric curves algorithm (fix #12278)
+Origin: https://github.com/qgis/QGIS/commit/7997c3535fc8a9cf371274796c1775066a1d9cc8
+Bug: http://hub.qgis.org/issues/12278
+
+---
+ python/plugins/processing/algs/qgis/HypsometricCurves.py | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/python/plugins/processing/algs/qgis/HypsometricCurves.py
++++ b/python/plugins/processing/algs/qgis/HypsometricCurves.py
+@@ -132,6 +132,12 @@ class HypsometricCurves(GeoAlgorithm):
+ srcOffset = (startColumn, startRow, width, height)
+ srcArray = rasterBand.ReadAsArray(*srcOffset)
+
++ if srcOffset[2] == 0 or srcOffset[3] == 0:
++ progress.setInfo(
++ self.tr('Feature %d does is smaller than raster '
++ 'cell size' % f.id()))
++ continue
++
+ newGeoTransform = (
+ geoTransform[0] + srcOffset[0] * geoTransform[1],
+ geoTransform[1],
diff --git a/debian/patches/series b/debian/patches/series
index c827506..fc39b77 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,5 @@ allows-to-typo.patch
python-env.patch
disable-doxygen.patch
developersmap-use-debian-package.patch
+0001-processing-correctly-handle-tiny-polygons-smaller-th.patch
+0001-backport-ada01603cb7b10786436aa0ed2361743b52ce48f.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.git
More information about the Pkg-grass-devel
mailing list