From 30ce3e8641df8b2796b4ce3da579db8d540c8d207f24618939684e382dcf161f Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Tue, 3 Aug 2021 08:26:42 +0000 Subject: [PATCH] Accepting request 909695 from home:Guillaume_G:branches: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/909695 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/qgis?expand=0&rev=329 --- qgis-3.20.0.tar.bz2 | 3 -- qgis-3.20.0.tar.bz2.sha256 | 1 - qgis-3.20.1.tar.bz2 | 3 ++ qgis-3.20.1.tar.bz2.sha256 | 1 + qgis-fix-missing-qwt-inc-part2.patch | 49 ++++++++++++++++++++++++++++ qgis-fix-missing-qwt-inc.patch | 34 +++++++++++++++++++ qgis.spec | 13 +++++--- 7 files changed, 96 insertions(+), 8 deletions(-) delete mode 100644 qgis-3.20.0.tar.bz2 delete mode 100644 qgis-3.20.0.tar.bz2.sha256 create mode 100644 qgis-3.20.1.tar.bz2 create mode 100644 qgis-3.20.1.tar.bz2.sha256 create mode 100644 qgis-fix-missing-qwt-inc-part2.patch create mode 100644 qgis-fix-missing-qwt-inc.patch diff --git a/qgis-3.20.0.tar.bz2 b/qgis-3.20.0.tar.bz2 deleted file mode 100644 index b48ac7b..0000000 --- a/qgis-3.20.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7decdacb7d6d2cb905b5302bbbc5ed6f64e9739ab2793cb585dc95670ab3f737 -size 131619071 diff --git a/qgis-3.20.0.tar.bz2.sha256 b/qgis-3.20.0.tar.bz2.sha256 deleted file mode 100644 index ac690b6..0000000 --- a/qgis-3.20.0.tar.bz2.sha256 +++ /dev/null @@ -1 +0,0 @@ -7decdacb7d6d2cb905b5302bbbc5ed6f64e9739ab2793cb585dc95670ab3f737 qgis-3.20.0.tar.bz2 diff --git a/qgis-3.20.1.tar.bz2 b/qgis-3.20.1.tar.bz2 new file mode 100644 index 0000000..c2d2f10 --- /dev/null +++ b/qgis-3.20.1.tar.bz2 @@ -0,0 +1,3 @@ +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 new file mode 100644 index 0000000..b773bdc --- /dev/null +++ b/qgis-3.20.1.tar.bz2.sha256 @@ -0,0 +1 @@ +a4209df4d5b1a2ffb1c8c3e0d2f0b17ccea118197b43fbb1185e5dcdf0bc520d qgis-3.20.1.tar.bz2 diff --git a/qgis-fix-missing-qwt-inc-part2.patch b/qgis-fix-missing-qwt-inc-part2.patch new file mode 100644 index 0000000..ebae8b3 --- /dev/null +++ b/qgis-fix-missing-qwt-inc-part2.patch @@ -0,0 +1,49 @@ +From 581cb40603dd3daca2916b564a4cd2630d005556 Mon Sep 17 00:00:00 2001 +From: Nyall Dawson +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 + #include + #include ++#include ++#include + + #include + #include +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 + #include + #include ++#include ++#include + + 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 + #include + #include ++#include + + + QgsHistogramWidget::QgsHistogramWidget( QWidget *parent, QgsVectorLayer *layer, const QString &fieldOrExp ) diff --git a/qgis-fix-missing-qwt-inc.patch b/qgis-fix-missing-qwt-inc.patch new file mode 100644 index 0000000..6a7fb37 --- /dev/null +++ b/qgis-fix-missing-qwt-inc.patch @@ -0,0 +1,34 @@ +From 6f9cbde7c782274ebe5875da7dbac98d68e9827b Mon Sep 17 00:00:00 2001 +From: Nyall Dawson +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 + #include + #include ++#include + + #ifdef Q_OS_WIN + #include +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 + #include + #include ++#include + + + QgsGraduatedHistogramWidget::QgsGraduatedHistogramWidget( QWidget *parent ) diff --git a/qgis.spec b/qgis.spec index bc8de87..1a2c748 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,5 +1,5 @@ # -# spec file for package qgis +# spec file for package qgis-ltr # # Copyright (c) 2021 SUSE LLC # @@ -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