SHA256
1
0
forked from pool/qgis

Accepting request 1100567 from home:Guillaume_G:branches:Application:Geo

- Update to 3.32.0:
  https://changelog.qgis.org/en/qgis/version/3.32/
- Drop upstream patch:
  * qgis-3.30.0_include_fix.patch

OBS-URL: https://build.opensuse.org/request/show/1100567
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/qgis?expand=0&rev=380
This commit is contained in:
Dirk Stoecker 2023-07-26 08:21:04 +00:00 committed by Git OBS Bridge
parent e1d9ad53a4
commit 9bcd162d41
7 changed files with 14 additions and 29 deletions

View File

@ -1,21 +0,0 @@
diff -ur qgis-3.30.0/external/untwine/api/QgisUntwine.hpp qgis-3.30.0_fix/external/untwine/api/QgisUntwine.hpp
--- qgis-3.30.0/external/untwine/api/QgisUntwine.hpp 2023-03-03 20:25:40.000000000 +0100
+++ qgis-3.30.0_fix/external/untwine/api/QgisUntwine.hpp 2023-04-04 09:40:57.344786266 +0200
@@ -1,5 +1,6 @@
#pragma once
+#include <cstdint>
#include <map>
#include <string>
#include <vector>
diff -ur qgis-3.30.0/external/untwine/untwine/VoxelKey.hpp qgis-3.30.0_fix/external/untwine/untwine/VoxelKey.hpp
--- qgis-3.30.0/external/untwine/untwine/VoxelKey.hpp 2023-03-03 20:25:40.000000000 +0100
+++ qgis-3.30.0_fix/external/untwine/untwine/VoxelKey.hpp 2023-04-04 08:48:07.969689579 +0200
@@ -10,6 +10,7 @@
* *
****************************************************************************/
+#include <cstdint>
#include <string>
#include <algorithm>

View File

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

View File

@ -1 +0,0 @@
e291cb7c74fd44bfebf8ac3738490e185ab8e64b3e45bbec769b4b14c2f82687 qgis-3.30.3.tar.bz2

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

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

View File

@ -0,0 +1 @@
dfc90a6103a3c6020d005dbb68c81caf9a4c11fca4be53bfe070226813f87a9a qgis-3.32.0.tar.bz2

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Jul 25 06:35:09 UTC 2023 - Guillaume GARDET <guillaume.gardet@opensuse.org>
- Update to 3.32.0:
https://changelog.qgis.org/en/qgis/version/3.32/
- Drop upstream patch:
* qgis-3.30.0_include_fix.patch
-------------------------------------------------------------------
Fri Jul 7 06:41:39 UTC 2023 - Guillaume GARDET <guillaume.gardet@opensuse.org>

View File

@ -24,7 +24,7 @@ Name: qgis-ltr
%else
Name: qgis
%endif
Version: 3.30.3
Version: 3.32.0
Release: 0
Summary: A Geographic Information System (GIS)
License: GPL-2.0-only
@ -38,10 +38,8 @@ Source3: qgis_sample_data.zip
Patch1: fix-fastcgi-include.patch
# PATCH-FIX-UPSTREAM - scan for pdal-config instead of pdal in cmake
Patch2: qgis-fix-cmake-findpdal.patch
# PATCH-FIX-UPSTREAM - add missing include file https://github.com/qgis/QGIS/issues/52526
Patch3: qgis-3.30.0_include_fix.patch
# PATCH-FIX-UPSTREAM - https://github.com/qgis/QGIS/issues/53700#issuecomment-1623365356
Patch4: exiv2-0.28.patch
Patch3: exiv2-0.28.patch
BuildRequires: FastCGI-devel
BuildRequires: PDAL-devel
BuildRequires: bison >= 2.4