From 69296a8944e43de5931be0aac8ec39c21f76ea33 Mon Sep 17 00:00:00 2001 From: landry Date: Sat, 10 Sep 2022 17:09:24 +0000 Subject: [PATCH] geo/qgis: update to 3.26.3 backport fix for https://github.com/qgis/QGIS/issues/49513 --- geo/qgis/Makefile | 4 ++-- geo/qgis/distinfo | 4 ++-- .../patch-src_gui_qgsowssourceselect_cpp | 24 +++++++++++++++++++ geo/qgis/pkg/PLIST | 2 ++ 4 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 geo/qgis/patches/patch-src_gui_qgsowssourceselect_cpp diff --git a/geo/qgis/Makefile b/geo/qgis/Makefile index 057fe8c0cea..325e6d5a31a 100644 --- a/geo/qgis/Makefile +++ b/geo/qgis/Makefile @@ -6,12 +6,12 @@ COMMENT = desktop geographical information system DPB_PROPERTIES = parallel -DISTNAME = qgis-3.26.2 +DISTNAME = qgis-3.26.3 EXTRACT_SUFX = .tar.bz2 CATEGORIES = geo x11 DEBUG_PACKAGES =${BUILD_PACKAGES} -SHARED_LIBS = qgis_core 63.0 \ +SHARED_LIBS = qgis_core 64.0 \ qgis_app 41.0 \ qgis_gui 48.1 \ qgis_analysis 20.0 \ diff --git a/geo/qgis/distinfo b/geo/qgis/distinfo index beb99021186..787dbe031b1 100644 --- a/geo/qgis/distinfo +++ b/geo/qgis/distinfo @@ -1,2 +1,2 @@ -SHA256 (qgis-3.26.2.tar.bz2) = imlVeAeIrzxBS8SYTHTAZVz1f0/vOTLCWe04DRkfWMM= -SIZE (qgis-3.26.2.tar.bz2) = 151926937 +SHA256 (qgis-3.26.3.tar.bz2) = UStk4neLzqAtzHChxPrCzEe0+aaFpisI7sDsI2NhBOY= +SIZE (qgis-3.26.3.tar.bz2) = 151276080 diff --git a/geo/qgis/patches/patch-src_gui_qgsowssourceselect_cpp b/geo/qgis/patches/patch-src_gui_qgsowssourceselect_cpp new file mode 100644 index 00000000000..dabb351aaf0 --- /dev/null +++ b/geo/qgis/patches/patch-src_gui_qgsowssourceselect_cpp @@ -0,0 +1,24 @@ +https://github.com/qgis/QGIS/issues/49513 +https://github.com/qgis/QGIS/pull/49997 + +Index: src/gui/qgsowssourceselect.cpp +--- src/gui/qgsowssourceselect.cpp.orig ++++ src/gui/qgsowssourceselect.cpp +@@ -273,7 +273,7 @@ QgsNewHttpConnection::ConnectionType connectionTypeFro + void QgsOWSSourceSelect::mNewButton_clicked() + { + const QgsNewHttpConnection::ConnectionType type = connectionTypeFromServiceString( mService ); +- QgsNewHttpConnection *nc = new QgsNewHttpConnection( this, type, "/qgis/connections-" + mService.toLower() + '/' ); ++ QgsNewHttpConnection *nc = new QgsNewHttpConnection( this, type, mService.toUpper() ); + + if ( nc->exec() ) + { +@@ -287,7 +287,7 @@ void QgsOWSSourceSelect::mNewButton_clicked() + void QgsOWSSourceSelect::mEditButton_clicked() + { + const QgsNewHttpConnection::ConnectionType type = connectionTypeFromServiceString( mService ); +- QgsNewHttpConnection *nc = new QgsNewHttpConnection( this, type, "/qgis/connections-" + mService.toLower() + '/', mConnectionsComboBox->currentText() ); ++ QgsNewHttpConnection *nc = new QgsNewHttpConnection( this, type, mService.toUpper(), mConnectionsComboBox->currentText() ); + + if ( nc->exec() ) + { diff --git a/geo/qgis/pkg/PLIST b/geo/qgis/pkg/PLIST index 9a3adeb99d7..a873fbe7026 100644 --- a/geo/qgis/pkg/PLIST +++ b/geo/qgis/pkg/PLIST @@ -4764,6 +4764,7 @@ share/qgis/resources/symbology-style.xml share/qgis/resources/themes/ share/qgis/resources/themes/Blend of Gray/ share/qgis/resources/themes/Blend of Gray/icons/ +share/qgis/resources/themes/Blend of Gray/icons/arrow-down-disabled.svg share/qgis/resources/themes/Blend of Gray/icons/arrow-down.svg share/qgis/resources/themes/Blend of Gray/icons/arrow-up.svg share/qgis/resources/themes/Blend of Gray/icons/caret-down.svg @@ -4788,6 +4789,7 @@ share/qgis/resources/themes/Blend of Gray/style.qss share/qgis/resources/themes/Blend of Gray/variables.qss share/qgis/resources/themes/Night Mapping/ share/qgis/resources/themes/Night Mapping/icons/ +share/qgis/resources/themes/Night Mapping/icons/arrow-down-disabled.svg share/qgis/resources/themes/Night Mapping/icons/arrow-down.svg share/qgis/resources/themes/Night Mapping/icons/arrow-up.svg share/qgis/resources/themes/Night Mapping/icons/caret-down.svg