Accepting request 960179 from home:Guillaume_G:branches:Application:Geo
- Update to 3.22.4 (monthly bugfix) * Drop usptream patch: qgis-pr45830-sip6-gil.patch OBS-URL: https://build.opensuse.org/request/show/960179 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/qgis?expand=0&rev=341
This commit is contained in:
Dirk Stoecker
Git OBS Bridge
parent
cde9f31040
commit
3ecea1aff0
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:cf0c169863f332aab67d8c4943e14b73a564f0254bf54015f5826c6427e6785b
|
||||
size 135469417
|
||||
@ -1 +0,0 @@
|
||||
cf0c169863f332aab67d8c4943e14b73a564f0254bf54015f5826c6427e6785b qgis-3.22.0.tar.bz2
|
||||
3
qgis-3.22.4.tar.bz2
Normal file
3
qgis-3.22.4.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:80e93f55e3afaa951eac2b7298c96e92ef3ded35882fcb3c1442a3d05de3808d
|
||||
size 137701974
|
||||
1
qgis-3.22.4.tar.bz2.sha256
Normal file
1
qgis-3.22.4.tar.bz2.sha256
Normal file
@ -0,0 +1 @@
|
||||
80e93f55e3afaa951eac2b7298c96e92ef3ded35882fcb3c1442a3d05de3808d qgis-3.22.4.tar.bz2
|
||||
@ -1,73 +0,0 @@
|
||||
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):
|
||||
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 8 09:04:02 UTC 2022 - Guillaume GARDET <guillaume.gardet@opensuse.org>
|
||||
|
||||
- Update to 3.22.4 (monthly bugfix)
|
||||
* Drop usptream patch: qgis-pr45830-sip6-gil.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 5 12:28:10 UTC 2021 - Ben Greiner <code@bnavigator.de>
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package qgis-ltr
|
||||
#
|
||||
# Copyright (c) 2021 SUSE LLC
|
||||
# Copyright (c) 2022 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -24,7 +24,7 @@ Name: qgis-ltr
|
||||
%else
|
||||
Name: qgis
|
||||
%endif
|
||||
Version: 3.22.0
|
||||
Version: 3.22.4
|
||||
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 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
|
||||
Patch2: qgis-fix-cmake-findpdal.patch
|
||||
BuildRequires: FastCGI-devel
|
||||
BuildRequires: PDAL-devel
|
||||
BuildRequires: bison >= 2.4
|
||||
|
||||
Loading…
Reference in New Issue
Block a user