cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to qgis 3.2.3.

Browse Source 
Backport bits of https://github.com/qgis/QGIS/pull/7824 to fix a crash
upon ctrl-k.
This commit is contained in:
landry 2018-09-16 16:47:59 +00:00
parent 2dca1ab832
commit bfd67b9ab5
5 changed files with 48 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
geo/qgis/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.92 2018/08/22 13:43:30 landry Exp $
# $OpenBSD: Makefile,v 1.93 2018/09/16 16:47:59 landry Exp $
COMMENT = desktop geographical information system
DISTNAME = qgis-3.2.2
DISTNAME = qgis-3.2.3
EXTRACT_SUFX = .tar.bz2
CATEGORIES = geo x11

4
geo/qgis/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (qgis-3.2.2.tar.bz2) = gxkkRZwanynaz3xuo39AHcTaWyC6KeTUdBdIUsUagk0=
SIZE (qgis-3.2.2.tar.bz2) = 71947443
SHA256 (qgis-3.2.3.tar.bz2) = yRODGF+yDM3HwAmVWqGFXfHSci1DWb9/JBcnxWgO9yA=
SIZE (qgis-3.2.3.tar.bz2) = 71991789

19
geo/qgis/patches/patch-python_plugins_processing_gui_ConfigDialog_py Normal file
View File

@ -0,0 +1,19 @@
$OpenBSD: patch-python_plugins_processing_gui_ConfigDialog_py,v 1.1 2018/09/16 16:47:59 landry Exp $
https://github.com/qgis/QGIS/commit/808963bfaeb209dccc959e9b11edf3ec027887c2
Index: python/plugins/processing/gui/ConfigDialog.py
--- python/plugins/processing/gui/ConfigDialog.py.orig
+++ python/plugins/processing/gui/ConfigDialog.py
@@ -113,9 +113,9 @@ class ConfigDialog(BASE, WIDGET):
self.groupIcon = QIcon()
self.groupIcon.addPixmap(self.style().standardPixmap(
- QStyle.SP_DirClosedIcon), QIcon.Normal, QIcon.Off)
+ QStyle.SP_DirClosedIcon, None), QIcon.Normal, QIcon.Off)
self.groupIcon.addPixmap(self.style().standardPixmap(
- QStyle.SP_DirOpenIcon), QIcon.Normal, QIcon.On)
+ QStyle.SP_DirOpenIcon, None), QIcon.Normal, QIcon.On)
self.model = QStandardItemModel()
self.tree.setModel(self.model)

4
geo/qgis/patches/patch-src_app_qgisapp_cpp
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-src_app_qgisapp_cpp,v 1.26 2018/08/22 13:43:30 landry Exp $
$OpenBSD: patch-src_app_qgisapp_cpp,v 1.27 2018/09/16 16:47:59 landry Exp $
Index: src/app/qgisapp.cpp
--- src/app/qgisapp.cpp.orig
+++ src/app/qgisapp.cpp
@@ -9918,7 +9918,7 @@ class QgsPythonRunnerImpl : public QgsPythonRunner
@@ -9939,7 +9939,7 @@ class QgsPythonRunnerImpl : public QgsPythonRunner
void QgisApp::loadPythonSupport()
{
QString pythonlibName( QStringLiteral( "qgispython" ) );

23
geo/qgis/patches/patch-src_app_qgsoptions_cpp Normal file
View File

@ -0,0 +1,23 @@
$OpenBSD: patch-src_app_qgsoptions_cpp,v 1.1 2018/09/16 16:47:59 landry Exp $
crash on ctrl-k
https://github.com/qgis/QGIS/commit/670760b49fe14abbe41070302f38f51046f0d12b
Index: src/app/qgsoptions.cpp
--- src/app/qgsoptions.cpp.orig
+++ src/app/qgsoptions.cpp
@@ -1098,9 +1098,11 @@ QMap< QString, QString > QgsOptions::pageWidgetNameMap
{
QWidget *currentPage = mOptionsStackedWidget->widget( idx );
QListWidgetItem *item = mOptionsListWidget->item( idx );
- QString title = item->text();
- QString name = currentPage->objectName();
- pageNames.insert( title, name );
+ if ( currentPage && item ) {
+ QString title = item->text();
+ QString name = currentPage->objectName();
+ pageNames.insert( title, name );
+ }
}
return pageNames;
}