From ccd150f5dc15df090995602d009c985e097e5166 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?= =?UTF-8?q?=20=28Mehdi=20Chinoune=29?= Date: Sun, 25 Jun 2023 04:54:43 +0100 Subject: [PATCH] qgis: update to 3.32.0 --- ...01-fix-building-with-mingw-w64-clang.patch | 44 ++++++++++++++----- mingw-w64-qgis/PKGBUILD | 13 +++--- 2 files changed, 40 insertions(+), 17 deletions(-) diff --git a/mingw-w64-qgis/001-fix-building-with-mingw-w64-clang.patch b/mingw-w64-qgis/001-fix-building-with-mingw-w64-clang.patch index da2ae8d5b1..070d875add 100644 --- a/mingw-w64-qgis/001-fix-building-with-mingw-w64-clang.patch +++ b/mingw-w64-qgis/001-fix-building-with-mingw-w64-clang.patch @@ -1,6 +1,17 @@ +--- a/src/core/processing/models/qgsprocessingmodelalgorithm.cpp ++++ b/src/core/processing/models/qgsprocessingmodelalgorithm.cpp +@@ -971,7 +971,7 @@ + auto safeName = []( const QString & name )->QString + { + QString s = name; +- const thread_local QRegularExpression safeNameRe( QStringLiteral( "[\\s'\"\\(\\):\\.]" ) ); ++ const QRegularExpression safeNameRe( QStringLiteral( "[\\s'\"\\(\\):\\.]" ) ); + return s.replace( safeNameRe, QStringLiteral( "_" ) ); + }; + --- a/src/core/processing/qgsprocessingalgorithm.cpp +++ b/src/core/processing/qgsprocessingalgorithm.cpp -@@ -325,7 +325,7 @@ +@@ -327,7 +327,7 @@ auto escapeIfNeeded = []( const QString & input ) -> QString { // play it safe and escape everything UNLESS it's purely alphanumeric characters (and a very select scattering of other common characters!) @@ -11,7 +22,7 @@ QString escaped = input; --- a/src/core/processing/qgsprocessingcontext.cpp +++ b/src/core/processing/qgsprocessingcontext.cpp -@@ -166,7 +166,7 @@ +@@ -187,7 +187,7 @@ auto escapeIfNeeded = []( const QString & input ) -> QString { // play it safe and escape everything UNLESS it's purely alphanumeric characters (and a very select scattering of other common characters!) @@ -22,7 +33,7 @@ QString escaped = input; --- a/src/core/qgsogrutils.cpp +++ b/src/core/qgsogrutils.cpp -@@ -1245,7 +1245,7 @@ +@@ -1367,7 +1367,7 @@ auto convertSize = []( const QString & size, double & value, Qgis::RenderUnit & unit )->bool { @@ -31,7 +42,7 @@ const QRegularExpressionMatch match = sUnitRx.match( size ); if ( match.hasMatch() ) { -@@ -1301,7 +1301,7 @@ +@@ -1423,7 +1423,7 @@ if ( string.isEmpty() ) return QColor(); @@ -40,7 +51,7 @@ const QRegularExpressionMatch match = sColorWithAlphaRx.match( string ); if ( match.hasMatch() ) { -@@ -1323,7 +1323,7 @@ +@@ -1445,7 +1445,7 @@ convertSize( lineStyle.value( QStringLiteral( "w" ) ).toString(), lineWidth, lineWidthUnit ); // if the pen is a mapinfo pen, use dedicated converter for more accurate results @@ -49,7 +60,7 @@ const QRegularExpressionMatch match = sMapInfoId.match( string ); if ( match.hasMatch() ) { -@@ -1341,7 +1341,7 @@ +@@ -1463,7 +1463,7 @@ const QString pattern = lineStyle.value( QStringLiteral( "p" ) ).toString(); if ( !pattern.isEmpty() ) { @@ -58,7 +69,7 @@ const QRegularExpressionMatch match = sPatternUnitRx.match( pattern ); if ( match.hasMatch() ) { -@@ -1422,7 +1422,7 @@ +@@ -1544,7 +1544,7 @@ const QString id = brushStyle.value( QStringLiteral( "id" ) ).toString(); // if the pen is a mapinfo brush, use dedicated converter for more accurate results @@ -67,7 +78,7 @@ const QRegularExpressionMatch match = sMapInfoId.match( id ); if ( match.hasMatch() ) { -@@ -1433,7 +1433,7 @@ +@@ -1555,7 +1555,7 @@ return res; } @@ -76,7 +87,7 @@ const QRegularExpressionMatch ogrMatch = sOgrId.match( id ); Qt::BrushStyle style = Qt::SolidPattern; -@@ -1511,7 +1511,7 @@ +@@ -1633,7 +1633,7 @@ const QString id = symbolStyle.value( QStringLiteral( "id" ) ).toString(); // if the symbol is a mapinfo symbol, use dedicated converter for more accurate results @@ -85,7 +96,7 @@ const QRegularExpressionMatch match = sMapInfoId.match( id ); if ( match.hasMatch() ) { -@@ -1528,7 +1528,7 @@ +@@ -1650,7 +1650,7 @@ std::unique_ptr< QgsMarkerSymbolLayer > markerLayer; @@ -94,7 +105,7 @@ const QRegularExpressionMatch fontMatch = sFontId.match( id ); if ( fontMatch.hasMatch() ) { -@@ -1582,7 +1582,7 @@ +@@ -1704,7 +1704,7 @@ if ( !markerLayer ) { @@ -116,6 +127,17 @@ QString processed = family.toLower(); processed.replace( styleNames, QString() ); +--- a/src/gui/editorwidgets/qgshtmlwidgetwrapper.cpp ++++ b/src/gui/editorwidgets/qgshtmlwidgetwrapper.cpp +@@ -44,7 +44,7 @@ + { + if ( attributeChanged ) + { +- const thread_local QRegularExpression expRe { QStringLiteral( R"re(expression.evaluate\s*\(\s*"(.*)"\))re" ), QRegularExpression::PatternOption::MultilineOption | QRegularExpression::PatternOption::DotMatchesEverythingOption }; ++ const QRegularExpression expRe { QStringLiteral( R"re(expression.evaluate\s*\(\s*"(.*)"\))re" ), QRegularExpression::PatternOption::MultilineOption | QRegularExpression::PatternOption::DotMatchesEverythingOption }; + const QRegularExpressionMatch match { expRe.match( mHtmlCode ) }; + if ( match.hasMatch() && QgsValueRelationFieldFormatter::expressionRequiresFormScope( match.captured( 1 ) ) ) + { --- a/src/gui/editorwidgets/qgstextwidgetwrapper.cpp +++ b/src/gui/editorwidgets/qgstextwidgetwrapper.cpp @@ -43,7 +43,7 @@ diff --git a/mingw-w64-qgis/PKGBUILD b/mingw-w64-qgis/PKGBUILD index 389a3d7fe6..a03fd0b229 100644 --- a/mingw-w64-qgis/PKGBUILD +++ b/mingw-w64-qgis/PKGBUILD @@ -2,13 +2,13 @@ _realname=qgis pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=3.30.3 -pkgrel=2 +pkgver=3.32.0 +pkgrel=1 pkgdesc='Geographic Information System (GIS) that supports vector, raster & database formats (mingw-w64)' arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') url='https://qgis.org/' -license=('spdx:GPL-2.0') +license=('spdx:GPL-2.0-or-later') depends=("${MINGW_PACKAGE_PREFIX}-protobuf" "${MINGW_PACKAGE_PREFIX}-gdal" "${MINGW_PACKAGE_PREFIX}-libzip" @@ -19,7 +19,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-protobuf" "${MINGW_PACKAGE_PREFIX}-libxml2" "${MINGW_PACKAGE_PREFIX}-netcdf" "${MINGW_PACKAGE_PREFIX}-opencl-icd" - "${MINGW_PACKAGE_PREFIX}-pdal" + #"${MINGW_PACKAGE_PREFIX}-pdal" "${MINGW_PACKAGE_PREFIX}-proj" "${MINGW_PACKAGE_PREFIX}-python-gdal" "${MINGW_PACKAGE_PREFIX}-python-owslib" @@ -50,8 +50,8 @@ source=("https://qgis.org/downloads/${_realname}-$pkgver.tar.bz2" "002-fix-settingstree-init-order-clang.patch" "003-fix-pyrcc-command.patch" "004-fix-customwidgets-install.patch") -sha256sums=('e291cb7c74fd44bfebf8ac3738490e185ab8e64b3e45bbec769b4b14c2f82687' - '651b208376cb6325d0a7fc2eb066aefbd00ea34cca81dcba1f5fff842d27d293' +sha256sums=('dfc90a6103a3c6020d005dbb68c81caf9a4c11fca4be53bfe070226813f87a9a' + '8a1c67b3bed1545813044f842cc0f6ff1076849e27379db6f64092014936b4c5' 'e880eef26fa06d8fae291346f87735e140145c2d65558fce69e480e303c629e2' 'c0f599996d90da55d1370f7144d545352d0075ca7876d4ade52c520b237ce318' '216dc67ef707f2e918afb7d190c9ea75c11065dea0d23d11b94cab5d8463bac3') @@ -101,6 +101,7 @@ build() { -DENABLE_TESTS=OFF \ -DWITH_BINDINGS=ON \ -DWITH_GRASS=OFF \ + -DWITH_PDAL=OFF \ ../${_realname}-$pkgver ${MINGW_PREFIX}/bin/cmake --build .