From dc907877dc39d29e8bf2d7476bc8c4caa025c8a5943c06a6ce298b278771fd06 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Wed, 8 Sep 2021 11:18:42 +0000 Subject: [PATCH] Accepting request 917367 from home:Guillaume_G:branches:Application:Geo - Update to 3.20.2 (monthly bugfix) - Drop upstream patch: * fix-infinite-loop.patch OBS-URL: https://build.opensuse.org/request/show/917367 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/qgis?expand=0&rev=338 --- fix-infinite-loop.patch | 214 ------------------------------------- qgis-3.20.1.tar.bz2 | 3 - qgis-3.20.1.tar.bz2.sha256 | 1 - qgis-3.20.2.tar.bz2 | 3 + qgis-3.20.2.tar.bz2.sha256 | 1 + qgis.changes | 7 ++ qgis.spec | 4 +- 7 files changed, 12 insertions(+), 221 deletions(-) delete mode 100644 fix-infinite-loop.patch delete mode 100644 qgis-3.20.1.tar.bz2 delete mode 100644 qgis-3.20.1.tar.bz2.sha256 create mode 100644 qgis-3.20.2.tar.bz2 create mode 100644 qgis-3.20.2.tar.bz2.sha256 diff --git a/fix-infinite-loop.patch b/fix-infinite-loop.patch deleted file mode 100644 index e04b4bf..0000000 --- a/fix-infinite-loop.patch +++ /dev/null @@ -1,214 +0,0 @@ -From 2055199a3a4a01f5fcc9fe54a14d3ca27a21961b Mon Sep 17 00:00:00 2001 -From: PeterPetrik -Date: Fri, 2 Jul 2021 14:40:59 +0200 -Subject: [PATCH 1/2] fix infinite loop in qgsstyle - ---- - src/core/symbology/qgsstyle.cpp | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/core/symbology/qgsstyle.cpp b/src/core/symbology/qgsstyle.cpp -index 6ca37dde3a15..c87305b3c8fa 100644 ---- a/src/core/symbology/qgsstyle.cpp -+++ b/src/core/symbology/qgsstyle.cpp -@@ -2755,6 +2755,7 @@ bool QgsStyle::importXml( const QString &filename, int sinceVersion ) - if ( entityAddedVersion != 0 && sinceVersion != -1 && entityAddedVersion <= sinceVersion ) - { - // skip the symbol, should already be present -+ e = e.nextSiblingElement(); - continue; - } - -@@ -2810,6 +2811,7 @@ bool QgsStyle::importXml( const QString &filename, int sinceVersion ) - if ( entityAddedVersion != 0 && sinceVersion != -1 && entityAddedVersion <= sinceVersion ) - { - // skip the ramp, should already be present -+ e = e.nextSiblingElement(); - continue; - } - -@@ -2859,6 +2861,7 @@ bool QgsStyle::importXml( const QString &filename, int sinceVersion ) - if ( entityAddedVersion != 0 && sinceVersion != -1 && entityAddedVersion <= sinceVersion ) - { - // skip the format, should already be present -+ e = e.nextSiblingElement(); - continue; - } - -@@ -2904,6 +2907,7 @@ bool QgsStyle::importXml( const QString &filename, int sinceVersion ) - if ( entityAddedVersion != 0 && sinceVersion != -1 && entityAddedVersion <= sinceVersion ) - { - // skip the settings, should already be present -+ e = e.nextSiblingElement(); - continue; - } - -@@ -2950,6 +2954,7 @@ bool QgsStyle::importXml( const QString &filename, int sinceVersion ) - if ( entityAddedVersion != 0 && sinceVersion != -1 && entityAddedVersion <= sinceVersion ) - { - // skip the shape, should already be present -+ e = e.nextSiblingElement(); - continue; - } - -@@ -2995,6 +3000,7 @@ bool QgsStyle::importXml( const QString &filename, int sinceVersion ) - if ( entityAddedVersion != 0 && sinceVersion != -1 && entityAddedVersion <= sinceVersion ) - { - // skip the symbol, should already be present -+ e = e.nextSiblingElement(); - continue; - } - - -From d03c4b4806ca241c8daed446c98ae66988bd1dcd Mon Sep 17 00:00:00 2001 -From: Nyall Dawson -Date: Thu, 22 Jul 2021 10:30:05 +1000 -Subject: [PATCH 2/2] Cleanup style upgrade loop - -Refs https://github.com/qgis/QGIS/pull/44038/files#r663350654 ---- - src/core/symbology/qgsstyle.cpp | 24 ++++++------------------ - 1 file changed, 6 insertions(+), 18 deletions(-) - -diff --git a/src/core/symbology/qgsstyle.cpp b/src/core/symbology/qgsstyle.cpp -index c87305b3c8fa..b4f57116d81e 100644 ---- a/src/core/symbology/qgsstyle.cpp -+++ b/src/core/symbology/qgsstyle.cpp -@@ -2749,13 +2749,12 @@ bool QgsStyle::importXml( const QString &filename, int sinceVersion ) - if ( version == QLatin1String( STYLE_CURRENT_VERSION ) || version == QLatin1String( "1" ) ) - { - // For the new style, load symbols individually -- while ( !e.isNull() ) -+ for ( ; !e.isNull(); e = e.nextSiblingElement() ) - { - const int entityAddedVersion = e.attribute( QStringLiteral( "addedVersion" ) ).toInt(); - if ( entityAddedVersion != 0 && sinceVersion != -1 && entityAddedVersion <= sinceVersion ) - { - // skip the symbol, should already be present -- e = e.nextSiblingElement(); - continue; - } - -@@ -2787,7 +2786,6 @@ bool QgsStyle::importXml( const QString &filename, int sinceVersion ) - { - QgsDebugMsg( "unknown tag: " + e.tagName() ); - } -- e = e.nextSiblingElement(); - } - } - else -@@ -2805,13 +2803,12 @@ bool QgsStyle::importXml( const QString &filename, int sinceVersion ) - // load color ramps - QDomElement rampsElement = docEl.firstChildElement( QStringLiteral( "colorramps" ) ); - e = rampsElement.firstChildElement(); -- while ( !e.isNull() ) -+ for ( ; !e.isNull(); e = e.nextSiblingElement() ) - { - const int entityAddedVersion = e.attribute( QStringLiteral( "addedVersion" ) ).toInt(); - if ( entityAddedVersion != 0 && sinceVersion != -1 && entityAddedVersion <= sinceVersion ) - { - // skip the ramp, should already be present -- e = e.nextSiblingElement(); - continue; - } - -@@ -2843,7 +2840,6 @@ bool QgsStyle::importXml( const QString &filename, int sinceVersion ) - { - QgsDebugMsg( "unknown tag: " + e.tagName() ); - } -- e = e.nextSiblingElement(); - } - - // load text formats -@@ -2855,13 +2851,12 @@ bool QgsStyle::importXml( const QString &filename, int sinceVersion ) - { - const QDomElement textFormatElement = docEl.firstChildElement( QStringLiteral( "textformats" ) ); - e = textFormatElement.firstChildElement(); -- while ( !e.isNull() ) -+ for ( ; !e.isNull(); e = e.nextSiblingElement() ) - { - const int entityAddedVersion = e.attribute( QStringLiteral( "addedVersion" ) ).toInt(); - if ( entityAddedVersion != 0 && sinceVersion != -1 && entityAddedVersion <= sinceVersion ) - { - // skip the format, should already be present -- e = e.nextSiblingElement(); - continue; - } - -@@ -2892,7 +2887,6 @@ bool QgsStyle::importXml( const QString &filename, int sinceVersion ) - { - QgsDebugMsg( "unknown tag: " + e.tagName() ); - } -- e = e.nextSiblingElement(); - } - } - -@@ -2901,13 +2895,12 @@ bool QgsStyle::importXml( const QString &filename, int sinceVersion ) - { - const QDomElement labelSettingsElement = docEl.firstChildElement( QStringLiteral( "labelsettings" ) ); - e = labelSettingsElement.firstChildElement(); -- while ( !e.isNull() ) -+ for ( ; !e.isNull(); e = e.nextSiblingElement() ) - { - const int entityAddedVersion = e.attribute( QStringLiteral( "addedVersion" ) ).toInt(); - if ( entityAddedVersion != 0 && sinceVersion != -1 && entityAddedVersion <= sinceVersion ) - { - // skip the settings, should already be present -- e = e.nextSiblingElement(); - continue; - } - -@@ -2938,7 +2931,6 @@ bool QgsStyle::importXml( const QString &filename, int sinceVersion ) - { - QgsDebugMsg( "unknown tag: " + e.tagName() ); - } -- e = e.nextSiblingElement(); - } - } - } -@@ -2948,13 +2940,12 @@ bool QgsStyle::importXml( const QString &filename, int sinceVersion ) - { - const QDomElement legendPatchShapesElement = docEl.firstChildElement( QStringLiteral( "legendpatchshapes" ) ); - e = legendPatchShapesElement.firstChildElement(); -- while ( !e.isNull() ) -+ for ( ; !e.isNull(); e = e.nextSiblingElement() ) - { - const int entityAddedVersion = e.attribute( QStringLiteral( "addedVersion" ) ).toInt(); - if ( entityAddedVersion != 0 && sinceVersion != -1 && entityAddedVersion <= sinceVersion ) - { - // skip the shape, should already be present -- e = e.nextSiblingElement(); - continue; - } - -@@ -2985,7 +2976,6 @@ bool QgsStyle::importXml( const QString &filename, int sinceVersion ) - { - QgsDebugMsg( "unknown tag: " + e.tagName() ); - } -- e = e.nextSiblingElement(); - } - } - -@@ -2994,13 +2984,12 @@ bool QgsStyle::importXml( const QString &filename, int sinceVersion ) - { - const QDomElement symbols3DElement = docEl.firstChildElement( QStringLiteral( "symbols3d" ) ); - e = symbols3DElement.firstChildElement(); -- while ( !e.isNull() ) -+ for ( ; !e.isNull(); e = e.nextSiblingElement() ) - { - const int entityAddedVersion = e.attribute( QStringLiteral( "addedVersion" ) ).toInt(); - if ( entityAddedVersion != 0 && sinceVersion != -1 && entityAddedVersion <= sinceVersion ) - { - // skip the symbol, should already be present -- e = e.nextSiblingElement(); - continue; - } - -@@ -3036,7 +3025,6 @@ bool QgsStyle::importXml( const QString &filename, int sinceVersion ) - { - QgsDebugMsg( "unknown tag: " + e.tagName() ); - } -- e = e.nextSiblingElement(); - } - } - diff --git a/qgis-3.20.1.tar.bz2 b/qgis-3.20.1.tar.bz2 deleted file mode 100644 index c2d2f10..0000000 --- a/qgis-3.20.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a4209df4d5b1a2ffb1c8c3e0d2f0b17ccea118197b43fbb1185e5dcdf0bc520d -size 132009880 diff --git a/qgis-3.20.1.tar.bz2.sha256 b/qgis-3.20.1.tar.bz2.sha256 deleted file mode 100644 index b773bdc..0000000 --- a/qgis-3.20.1.tar.bz2.sha256 +++ /dev/null @@ -1 +0,0 @@ -a4209df4d5b1a2ffb1c8c3e0d2f0b17ccea118197b43fbb1185e5dcdf0bc520d qgis-3.20.1.tar.bz2 diff --git a/qgis-3.20.2.tar.bz2 b/qgis-3.20.2.tar.bz2 new file mode 100644 index 0000000..cbb1ca7 --- /dev/null +++ b/qgis-3.20.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cbc55a05d88e27251c36319ca99882541f3e6892c9f557117bb6f9ca7a279e6d +size 132063211 diff --git a/qgis-3.20.2.tar.bz2.sha256 b/qgis-3.20.2.tar.bz2.sha256 new file mode 100644 index 0000000..63a7fc1 --- /dev/null +++ b/qgis-3.20.2.tar.bz2.sha256 @@ -0,0 +1 @@ +cbc55a05d88e27251c36319ca99882541f3e6892c9f557117bb6f9ca7a279e6d qgis-3.20.2.tar.bz2 diff --git a/qgis.changes b/qgis.changes index 919598a..9d51de7 100644 --- a/qgis.changes +++ b/qgis.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Sep 7 09:13:17 UTC 2021 - Guillaume GARDET + +- Update to 3.20.2 (monthly bugfix) +- Drop upstream patch: + * fix-infinite-loop.patch + ------------------------------------------------------------------- Wed Aug 11 18:40:04 UTC 2021 - Jason Craig diff --git a/qgis.spec b/qgis.spec index a5760ca..2bd808e 100644 --- a/qgis.spec +++ b/qgis.spec @@ -24,7 +24,7 @@ Name: qgis-ltr %else Name: qgis %endif -Version: 3.20.1 +Version: 3.20.2 Release: 0 Summary: A Geographic Information System (GIS) License: GPL-2.0-only @@ -41,8 +41,6 @@ Patch2: qgis-fix-missing-qwt-inc.patch Patch3: qgis-fix-missing-qwt-inc-part2.patch # PATCH-FIX-UPSTREAM - scan for pdal-config instead of pdal in cmake Patch4: qgis-fix-cmake-findpdal.patch -# PATCH-FIX-UPSTREAM - gh#qgis/QGIS#44293 -Patch5: fix-infinite-loop.patch BuildRequires: FastCGI-devel BuildRequires: PDAL-devel BuildRequires: bison >= 2.4