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
This commit is contained in:
Dirk Stoecker
Git OBS Bridge
parent
ef528c8103
commit
dc907877dc
@ -1,214 +0,0 @@
|
|||||||
From 2055199a3a4a01f5fcc9fe54a14d3ca27a21961b Mon Sep 17 00:00:00 2001
|
|
||||||
From: PeterPetrik <zilolv@gmail.com>
|
|
||||||
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 <nyall.dawson@gmail.com>
|
|
||||||
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();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:a4209df4d5b1a2ffb1c8c3e0d2f0b17ccea118197b43fbb1185e5dcdf0bc520d
|
|
||||||
size 132009880
|
|
||||||
@ -1 +0,0 @@
|
|||||||
a4209df4d5b1a2ffb1c8c3e0d2f0b17ccea118197b43fbb1185e5dcdf0bc520d qgis-3.20.1.tar.bz2
|
|
||||||
3
qgis-3.20.2.tar.bz2
Normal file
3
qgis-3.20.2.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:cbc55a05d88e27251c36319ca99882541f3e6892c9f557117bb6f9ca7a279e6d
|
||||||
|
size 132063211
|
||||||
1
qgis-3.20.2.tar.bz2.sha256
Normal file
1
qgis-3.20.2.tar.bz2.sha256
Normal file
@ -0,0 +1 @@
|
|||||||
|
cbc55a05d88e27251c36319ca99882541f3e6892c9f557117bb6f9ca7a279e6d qgis-3.20.2.tar.bz2
|
||||||
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Sep 7 09:13:17 UTC 2021 - Guillaume GARDET <guillaume.gardet@opensuse.org>
|
||||||
|
|
||||||
|
- Update to 3.20.2 (monthly bugfix)
|
||||||
|
- Drop upstream patch:
|
||||||
|
* fix-infinite-loop.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Aug 11 18:40:04 UTC 2021 - Jason Craig <os@jacraig.com>
|
Wed Aug 11 18:40:04 UTC 2021 - Jason Craig <os@jacraig.com>
|
||||||
|
|
||||||
|
|||||||
@ -24,7 +24,7 @@ Name: qgis-ltr
|
|||||||
%else
|
%else
|
||||||
Name: qgis
|
Name: qgis
|
||||||
%endif
|
%endif
|
||||||
Version: 3.20.1
|
Version: 3.20.2
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: A Geographic Information System (GIS)
|
Summary: A Geographic Information System (GIS)
|
||||||
License: GPL-2.0-only
|
License: GPL-2.0-only
|
||||||
@ -41,8 +41,6 @@ Patch2: qgis-fix-missing-qwt-inc.patch
|
|||||||
Patch3: qgis-fix-missing-qwt-inc-part2.patch
|
Patch3: qgis-fix-missing-qwt-inc-part2.patch
|
||||||
# PATCH-FIX-UPSTREAM - scan for pdal-config instead of pdal in cmake
|
# PATCH-FIX-UPSTREAM - scan for pdal-config instead of pdal in cmake
|
||||||
Patch4: qgis-fix-cmake-findpdal.patch
|
Patch4: qgis-fix-cmake-findpdal.patch
|
||||||
# PATCH-FIX-UPSTREAM - gh#qgis/QGIS#44293
|
|
||||||
Patch5: fix-infinite-loop.patch
|
|
||||||
BuildRequires: FastCGI-devel
|
BuildRequires: FastCGI-devel
|
||||||
BuildRequires: PDAL-devel
|
BuildRequires: PDAL-devel
|
||||||
BuildRequires: bison >= 2.4
|
BuildRequires: bison >= 2.4
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user