rpm/qgis
SHA256
1
0
Fork 0
forked from pool/qgis
Code Pull Requests Activity

Accepting request 929710 from home:bnavigator:branches:Application:Geo

Browse Source 
- Update to 3.22.0
  https://changelog.qgis.org/en/qgis/version/3.22/
- Drop upstreamed patches
  * qgis-fix-missing-qwt-inc.patch
  * qgis-fix-missing-qwt-inc-part2.patch
- Refresh fix-fastcgi-include.patch
- Add recommendation for mod_spatialite -- boo#1185415
- Suggest saga-gis -- boo#1190435
- Enable SIP6 and add qgis-pr45830-sip6-gil.patch -- boo#1192300
- Update qgis.rpmlintrc

OBS-URL: https://build.opensuse.org/request/show/929710
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/qgis?expand=0&rev=340
This commit is contained in:
Dirk Stoecker 2021-11-09 10:42:48 +00:00 committed by Git OBS Bridge
parent 033c949f81
commit cde9f31040
11 changed files with 120 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fix-fastcgi-include.patch
View File

@ -1,8 +1,10 @@
--- qgis-3.18.0/src/server/qgis_map_serv.cpp.orig 2021-02-24 17:05:17.609036243 +0100
+++ qgis-3.18.0/src/server/qgis_map_serv.cpp 2021-02-24 17:05:31.697185106 +0100
@@ -23,7 +23,7 @@
#include "qgsfcgiserverrequest.h"
Index: qgis-3.22.0/src/server/qgis_map_serv.cpp
===================================================================
--- qgis-3.22.0.orig/src/server/qgis_map_serv.cpp
+++ qgis-3.22.0/src/server/qgis_map_serv.cpp
@@ -24,7 +24,7 @@
#include "qgsapplication.h"
#include "qgscommandlineutils.h"
-#include <fcgi_stdio.h>
+#include <fastcgi/fcgi_stdio.h>

3
qgis-3.20.3.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:93ac52138f4f7832078e6e79ed5249dcd8c3dd34c8801c4039f87b690657294e
size 133775542

1
qgis-3.20.3.tar.bz2.sha256
View File

@ -1 +0,0 @@
93ac52138f4f7832078e6e79ed5249dcd8c3dd34c8801c4039f87b690657294e qgis-3.20.3.tar.bz2

3
qgis-3.22.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cf0c169863f332aab67d8c4943e14b73a564f0254bf54015f5826c6427e6785b
size 135469417

1
qgis-3.22.0.tar.bz2.sha256 Normal file
View File

@ -0,0 +1 @@
cf0c169863f332aab67d8c4943e14b73a564f0254bf54015f5826c6427e6785b qgis-3.22.0.tar.bz2

49
qgis-fix-missing-qwt-inc-part2.patch
View File

@ -1,49 +0,0 @@
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
View File

@ -1,34 +0,0 @@
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 )

73
qgis-pr45830-sip6-gil.patch Normal file
View File

@ -0,0 +1,73 @@
From 6559a76cd6e02b442c15d895bfde827e1e25e9e6 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Wed, 3 Nov 2021 09:31:16 +0100
Subject: [PATCH] Set release_gil = True when generating bindings
---
python/3d/project.py.in | 1 +
python/analysis/project.py.in | 1 +
python/core/project.py.in | 1 +
python/gui/project.py.in | 1 +
python/server/project.py.in | 1 +
5 files changed, 5 insertions(+)
diff --git a/python/3d/project.py.in b/python/3d/project.py.in
index ecbdce41f570..df8f76b7f5d6 100644
--- a/python/3d/project.py.in
+++ b/python/3d/project.py.in
@@ -37,6 +37,7 @@ class Qgis3D(PyQtBindings):
super().__init__(project, '3d')
self.sip_file = '3d.sip'
self.exceptions = True
+ self.release_gil = True
self.disabled_features = "@SIP_DISABLE_FEATURES@".split(";")
def apply_user_defaults(self, tool):
diff --git a/python/analysis/project.py.in b/python/analysis/project.py.in
index d62cfc8d7c5e..55c65cf0b34b 100644
--- a/python/analysis/project.py.in
+++ b/python/analysis/project.py.in
@@ -37,6 +37,7 @@ class QgisAnalysis(PyQtBindings):
super().__init__(project, 'analysis')
self.sip_file = 'analysis.sip'
self.exceptions = True
+ self.release_gil = True
self.disabled_features = "@SIP_DISABLE_FEATURES@".split(";")
def apply_user_defaults(self, tool):
diff --git a/python/core/project.py.in b/python/core/project.py.in
index 1fd92b7f9374..5f383d434d15 100644
--- a/python/core/project.py.in
+++ b/python/core/project.py.in
@@ -37,6 +37,7 @@ class QgisCore(PyQtBindings):
super().__init__(project, 'core')
self.sip_file = 'core.sip'
self.exceptions = True
+ self.release_gil = True
self.disabled_features = "@SIP_DISABLE_FEATURES@".split(";")
def apply_user_defaults(self, tool):
diff --git a/python/gui/project.py.in b/python/gui/project.py.in
index aa9cd77f7036..c6a751721136 100644
--- a/python/gui/project.py.in
+++ b/python/gui/project.py.in
@@ -37,6 +37,7 @@ class QgisGui(PyQtBindings):
super().__init__(project, 'gui')
self.sip_file = 'gui.sip'
self.exceptions = True
+ self.release_gil = True
self.disabled_features = "@SIP_DISABLE_FEATURES@".split(";")
def apply_user_defaults(self, tool):
diff --git a/python/server/project.py.in b/python/server/project.py.in
index a07045619c15..146d96a56448 100644
--- a/python/server/project.py.in
+++ b/python/server/project.py.in
@@ -37,6 +37,7 @@ class QgisServer(PyQtBindings):
super().__init__(project, 'server')
self.sip_file = 'server.sip'
self.exceptions = True
+ self.release_gil = True
self.disabled_features = "@SIP_DISABLE_FEATURES@".split(";")
def apply_user_defaults(self, tool):

14
qgis.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Fri Nov 5 12:28:10 UTC 2021 - Ben Greiner <code@bnavigator.de>
- Update to 3.22.0
https://changelog.qgis.org/en/qgis/version/3.22/
- Drop upstreamed patches
* qgis-fix-missing-qwt-inc.patch
* qgis-fix-missing-qwt-inc-part2.patch
- Refresh fix-fastcgi-include.patch
- Add recommendation for mod_spatialite -- boo#1185415
- Suggest saga-gis -- boo#1190435
- Enable SIP6 and add qgis-pr45830-sip6-gil.patch -- boo#1192300
- Update qgis.rpmlintrc
-------------------------------------------------------------------
Fri Oct 22 08:17:30 UTC 2021 - Guillaume GARDET <guillaume.gardet@opensuse.org>

12
qgis.rpmlintrc
View File

@ -1,3 +1,11 @@
addFilter("devel-file-in-non-devel-package .*/usr/lib/libqgis*.*")
addFilter("devel-file-in-non-devel-package .*/usr/lib64/libqgis*.*")
addFilter("devel-file-in-non-devel-package .*/usr/lib.*/libqgis*.*")
addFilter("arch-dependent-file-in-usr-share .*/usr/share/qgis/python/qgis/.*")
addFilter("zero-length .*sample-data.*gtopo30")
# QGIS Server Files in QGIS_CGIBIN_DIR
addFilter("script-without-shebang .*admin.sld")
addFilter("script-without-shebang .*wms_metadata.xml")
addFilter("non-executable-in-bin .*admin.sld")
addFilter("non-executable-in-bin .*wms_metadata.xml")
# intentional forced dependencies
addFilter("explicit-lib-dependency libQt5Sql5-.*sql.*")
addFilter("explicit-lib-dependency python.*-OWSLib")

29
qgis.spec
View File

@ -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.3
Version: 3.22.0
Release: 0
Summary: A Geographic Information System (GIS)
License: GPL-2.0-only
@ -35,10 +35,8 @@ 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
# PATCH-FIX-UPSTREAM ggis-pr45830-sip6-gil.patch -- release GIL with sip6 https://github.com/qgis/QGIS/pull/45830
Patch2: https://github.com/qgis/QGIS/pull/45830.patch#/qgis-pr45830-sip6-gil.patch
# PATCH-FIX-UPSTREAM - scan for pdal-config instead of pdal in cmake
Patch4: qgis-fix-cmake-findpdal.patch
BuildRequires: FastCGI-devel
@ -71,14 +69,11 @@ BuildRequires: python3-PyYAML
BuildRequires: python3-future
BuildRequires: python3-psycopg2
BuildRequires: python3-pygments
BuildRequires: python3-pyqt-builder
BuildRequires: python3-qscintilla-qt5
BuildRequires: python3-qscintilla-qt5-sip
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.
# qgis is not compatible with sip6 yet - https://github.com/qgis/QGIS/issues/38911
BuildRequires: python3-sip5-devel
BuildRequires: python3-sip-devel
BuildRequires: python3-six
BuildRequires: python3-termcolor
BuildRequires: qwt6-devel
@ -146,6 +141,9 @@ Requires: python3-termcolor
Recommends: %{name}-sample-data
Recommends: apache2-mod_fcgid
Recommends: gpsbabel
Recommends: mod_spatialite
# It's in Application:Geo, but not in Factory
Suggests: saga-gis
%if %is_ltr
Conflicts: qgis
%else
@ -301,8 +299,8 @@ popd
%exclude %{_libdir}/libqgisgrass7.so
%exclude %{_libdir}/libqgisgrass7.so.*
%exclude %{_libdir}/qgis/libgrassplugin7.so
%exclude %{_libdir}/qgis/libgrassprovider7.so
%exclude %{_libdir}/qgis/libgrassrasterprovider7.so
%exclude %{_libdir}/qgis/libprovider_grass7.so
%exclude %{_libdir}/qgis/libprovider_grassraster7.so
%exclude %{_libdir}/qgis/grass
%endif
%exclude %{_datadir}/qgis/%{sampledir}
@ -311,13 +309,12 @@ popd
%files devel
%{_includedir}/qgis/
%{_libdir}/liboauth2authmethod_static.a
%if %{with grass}
%files plugin-grass
%{_libdir}/qgis/libgrassplugin7.so
%{_libdir}/qgis/libgrassprovider7.so
%{_libdir}/qgis/libgrassrasterprovider7.so
%{_libdir}/qgis/libprovider_grass7.so
%{_libdir}/qgis/libprovider_grassraster7.so
%{_libdir}/libqgisgrass7.so
%{_libdir}/libqgisgrass7.so.*
%defattr(755,root,root)