Accepting request 909901 from Application:Geo
- Update to 3.20.1 (monthly bugfix) - Add patch to fix build with current Tumbleweed - boo#1188902 * qgis-fix-missing-qwt-inc.patch * qgis-fix-missing-qwt-inc-part2.patch OBS-URL: https://build.opensuse.org/request/show/909901 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/qgis?expand=0&rev=24
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
b88efdc230
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7decdacb7d6d2cb905b5302bbbc5ed6f64e9739ab2793cb585dc95670ab3f737
|
||||
size 131619071
|
||||
@ -1 +0,0 @@
|
||||
7decdacb7d6d2cb905b5302bbbc5ed6f64e9739ab2793cb585dc95670ab3f737 qgis-3.20.0.tar.bz2
|
||||
3
qgis-3.20.1.tar.bz2
Normal file
3
qgis-3.20.1.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a4209df4d5b1a2ffb1c8c3e0d2f0b17ccea118197b43fbb1185e5dcdf0bc520d
|
||||
size 132009880
|
||||
1
qgis-3.20.1.tar.bz2.sha256
Normal file
1
qgis-3.20.1.tar.bz2.sha256
Normal file
@ -0,0 +1 @@
|
||||
a4209df4d5b1a2ffb1c8c3e0d2f0b17ccea118197b43fbb1185e5dcdf0bc520d qgis-3.20.1.tar.bz2
|
||||
49
qgis-fix-missing-qwt-inc-part2.patch
Normal file
49
qgis-fix-missing-qwt-inc-part2.patch
Normal file
@ -0,0 +1,49 @@
|
||||
From 581cb40603dd3daca2916b564a4cd2630d005556 Mon Sep 17 00:00:00 2001
|
||||
From: Nyall Dawson <nyall.dawson@gmail.com>
|
||||
Date: Tue, 27 Jul 2021 09:44:48 +1000
|
||||
Subject: [PATCH] Add required explicit imports for qwt
|
||||
|
||||
---
|
||||
src/gui/qgscurveeditorwidget.cpp | 2 ++
|
||||
src/gui/qgsgradientcolorrampdialog.cpp | 2 ++
|
||||
src/gui/qgshistogramwidget.cpp | 1 +
|
||||
3 files changed, 5 insertions(+)
|
||||
|
||||
diff --git a/src/gui/qgscurveeditorwidget.cpp b/src/gui/qgscurveeditorwidget.cpp
|
||||
index e82548041af..38609fca447 100644
|
||||
--- a/src/gui/qgscurveeditorwidget.cpp
|
||||
+++ b/src/gui/qgscurveeditorwidget.cpp
|
||||
@@ -34,6 +34,8 @@
|
||||
#include <qwt_plot_layout.h>
|
||||
#include <qwt_symbol.h>
|
||||
#include <qwt_legend.h>
|
||||
+#include <qwt_scale_div.h>
|
||||
+#include <qwt_scale_map.h>
|
||||
|
||||
#include <qwt_plot_renderer.h>
|
||||
#include <qwt_plot_histogram.h>
|
||||
diff --git a/src/gui/qgsgradientcolorrampdialog.cpp b/src/gui/qgsgradientcolorrampdialog.cpp
|
||||
index d7b28d0e88c..79fee838379 100644
|
||||
--- a/src/gui/qgsgradientcolorrampdialog.cpp
|
||||
+++ b/src/gui/qgsgradientcolorrampdialog.cpp
|
||||
@@ -41,6 +41,8 @@
|
||||
#include <qwt_plot_layout.h>
|
||||
#include <qwt_symbol.h>
|
||||
#include <qwt_legend.h>
|
||||
+#include <qwt_scale_div.h>
|
||||
+#include <qwt_scale_map.h>
|
||||
|
||||
QgsGradientColorRampDialog::QgsGradientColorRampDialog( const QgsGradientColorRamp &ramp, QWidget *parent )
|
||||
: QDialog( parent )
|
||||
diff --git a/src/gui/qgshistogramwidget.cpp b/src/gui/qgshistogramwidget.cpp
|
||||
index 4f277be924a..1ca24f618d1 100644
|
||||
--- a/src/gui/qgshistogramwidget.cpp
|
||||
+++ b/src/gui/qgshistogramwidget.cpp
|
||||
@@ -37,6 +37,7 @@
|
||||
#include <qwt_plot_layout.h>
|
||||
#include <qwt_plot_renderer.h>
|
||||
#include <qwt_plot_histogram.h>
|
||||
+#include <qwt_text.h>
|
||||
|
||||
|
||||
QgsHistogramWidget::QgsHistogramWidget( QWidget *parent, QgsVectorLayer *layer, const QString &fieldOrExp )
|
||||
34
qgis-fix-missing-qwt-inc.patch
Normal file
34
qgis-fix-missing-qwt-inc.patch
Normal file
@ -0,0 +1,34 @@
|
||||
From 6f9cbde7c782274ebe5875da7dbac98d68e9827b Mon Sep 17 00:00:00 2001
|
||||
From: Nyall Dawson <nyall.dawson@gmail.com>
|
||||
Date: Tue, 20 Jul 2021 11:01:42 +1000
|
||||
Subject: [PATCH] Some qwt related build fixes
|
||||
|
||||
---
|
||||
src/gui/raster/qgsrasterhistogramwidget.cpp | 1 +
|
||||
src/gui/symbology/qgsgraduatedhistogramwidget.cpp | 1 +
|
||||
2 files changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/gui/raster/qgsrasterhistogramwidget.cpp b/src/gui/raster/qgsrasterhistogramwidget.cpp
|
||||
index 856c078f7a7..ec3e14d0de9 100644
|
||||
--- a/src/gui/raster/qgsrasterhistogramwidget.cpp
|
||||
+++ b/src/gui/raster/qgsrasterhistogramwidget.cpp
|
||||
@@ -45,6 +45,7 @@
|
||||
#include <qwt_plot_layout.h>
|
||||
#include <qwt_plot_renderer.h>
|
||||
#include <qwt_plot_histogram.h>
|
||||
+#include <qwt_scale_div.h>
|
||||
|
||||
#ifdef Q_OS_WIN
|
||||
#include <time.h>
|
||||
diff --git a/src/gui/symbology/qgsgraduatedhistogramwidget.cpp b/src/gui/symbology/qgsgraduatedhistogramwidget.cpp
|
||||
index 7b1e6a71474..85caf4c1ce7 100644
|
||||
--- a/src/gui/symbology/qgsgraduatedhistogramwidget.cpp
|
||||
+++ b/src/gui/symbology/qgsgraduatedhistogramwidget.cpp
|
||||
@@ -38,6 +38,7 @@
|
||||
#include <qwt_plot_layout.h>
|
||||
#include <qwt_plot_renderer.h>
|
||||
#include <qwt_plot_histogram.h>
|
||||
+#include <qwt_scale_map.h>
|
||||
|
||||
|
||||
QgsGraduatedHistogramWidget::QgsGraduatedHistogramWidget( QWidget *parent )
|
||||
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 3 08:40:57 UTC 2021 - Dirk Stoecker <opensuse@dstoecker.de>
|
||||
|
||||
- Update to 3.20.1 (monthly bugfix)
|
||||
- Add patch to fix build with current Tumbleweed - boo#1188902
|
||||
* qgis-fix-missing-qwt-inc.patch
|
||||
* qgis-fix-missing-qwt-inc-part2.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 30 11:24:50 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
|
||||
|
||||
|
||||
13
qgis.spec
13
qgis.spec
@ -24,7 +24,7 @@ Name: qgis-ltr
|
||||
%else
|
||||
Name: qgis
|
||||
%endif
|
||||
Version: 3.20.0
|
||||
Version: 3.20.1
|
||||
Release: 0
|
||||
Summary: A Geographic Information System (GIS)
|
||||
License: GPL-2.0-only
|
||||
@ -35,6 +35,10 @@ Source1: https://qgis.org/downloads/qgis-%{version}.tar.bz2.sha256
|
||||
Source2: %{name}.rpmlintrc
|
||||
Source3: qgis_sample_data.zip
|
||||
Patch1: fix-fastcgi-include.patch
|
||||
# PATCH-FIX-UPSTREAM - https://github.com/qgis/QGIS/commit/6f9cbde7c782274ebe5875da7dbac98d68e9827
|
||||
Patch2: qgis-fix-missing-qwt-inc.patch
|
||||
# PATCH-FIX-UPSTREAM - https://github.com/qgis/QGIS/commit/581cb40603dd3daca2916b564a4cd2630d005556
|
||||
Patch3: qgis-fix-missing-qwt-inc-part2.patch
|
||||
BuildRequires: FastCGI-devel
|
||||
BuildRequires: bison >= 2.4
|
||||
BuildRequires: cmake >= 3.0.0
|
||||
@ -70,7 +74,8 @@ BuildRequires: python3-qt5-devel
|
||||
# The package can build with sip v4 or sip v5 but needs to use the same module
|
||||
# as PyQt5 (python-sip vs python-qt5-sip).The correct sip.so is pulled in by
|
||||
# python-qt5, do not explicitly depend on it.
|
||||
BuildRequires: python3-sip-devel
|
||||
# qgis is not compatible with sip6 yet - https://github.com/qgis/QGIS/issues/38911
|
||||
BuildRequires: python3-sip5-devel
|
||||
BuildRequires: python3-six
|
||||
BuildRequires: python3-termcolor
|
||||
BuildRequires: qwt6-devel
|
||||
@ -108,13 +113,13 @@ BuildRequires: cmake(Qt5Xml)
|
||||
BuildRequires: pkgconfig(expat) >= 1.95
|
||||
# Requires at least gdal 3.1 for GeoTIFF and Proj >= 6 - https://github.com/qgis/QGIS/issues/36699#issuecomment-633539864
|
||||
BuildRequires: pkgconfig(gdal) >= 3.1
|
||||
BuildRequires: pkgconfig(Qt5Qwt6)
|
||||
BuildRequires: pkgconfig(gsl) >= 1.8
|
||||
BuildRequires: pkgconfig(libpq) > 9.4
|
||||
BuildRequires: pkgconfig(libzip)
|
||||
BuildRequires: pkgconfig(proj) >= 6.3.1
|
||||
BuildRequires: pkgconfig(python3) >= 3.7
|
||||
BuildRequires: pkgconfig(qca2-qt5)
|
||||
BuildRequires: pkgconfig(Qt5Qwt6)
|
||||
BuildRequires: pkgconfig(spatialite) >= 4.2.0
|
||||
# Force requires of those 3 main component.
|
||||
Requires: libQt5Sql5-mysql
|
||||
@ -142,7 +147,7 @@ Conflicts: qgis
|
||||
Conflicts: qgis-ltr
|
||||
%endif
|
||||
Conflicts: qgis-master
|
||||
Obsoletes: qgis2
|
||||
Obsoletes: qgis2 < %{version}
|
||||
%if %{with grass}
|
||||
BuildRequires: grass-devel >= 7.2
|
||||
%endif
|
||||
|
||||
Loading…
Reference in New Issue
Block a user