Accepting request 1250599 from Application:Geo

- Update to 3.42.0 * See https://changelog.qgis.org/en/qgis/version/3.42/ and https://github.com/qgis/QGIS/compare/final-3_40_3...final-3_42_0 for changes * Add new qgis-check-if-maxcliplanes-is-defined.patch to fix building with aarch64 OBS-URL: https://build.opensuse.org/request/show/1250599 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/qgis?expand=0&rev=63
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/qgis?expand=0&rev=415
2025-03-10 16:58:43 +00:00 · 2025-03-06 09:48:42 +00:00 · 2025-03-06 09:37:28 +00:00
7 changed files with 38 additions and 6 deletions
--- a/qgis-3.40.3.tar.bz2
+++ b/qgis-3.40.3.tar.bz2
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:51135f0b0f82f2b76de4b89a0978396dbdab9baa3c9c03c4a53b7e2f48451076
-size 181531383
--- a/qgis-3.40.3.tar.bz2.sha256
+++ b/qgis-3.40.3.tar.bz2.sha256
@@ -1 +0,0 @@
-51135f0b0f82f2b76de4b89a0978396dbdab9baa3c9c03c4a53b7e2f48451076  qgis-3.40.3.tar.bz2
--- a/qgis-3.42.0.tar.bz2
+++ b/qgis-3.42.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:04b743397ee2375a1a0521578131fc514752f84db2f86225a9551d1f87e704e8
+size 185525665
--- a/qgis-3.42.0.tar.bz2.sha256
+++ b/qgis-3.42.0.tar.bz2.sha256
@@ -0,0 +1 @@
+04b743397ee2375a1a0521578131fc514752f84db2f86225a9551d1f87e704e8  qgis-3.42.0.tar.bz2
--- a/qgis-check-if-maxcliplanes-is-defined.patch
+++ b/qgis-check-if-maxcliplanes-is-defined.patch
@@ -0,0 +1,20 @@
+diff --git i/src/3d/qgs3dutils.cpp w/src/3d/qgs3dutils.cpp
+index 053c9458611..78ab57b9915 100644
+--- i/src/3d/qgs3dutils.cpp
+++ w/src/3d/qgs3dutils.cpp
+@@ -972,6 +972,7 @@ int Qgs3DUtils::openGlMaxClipPlanes( QSurface *surface )
+ {
+   int numPlanes = 6;
+ 
+#ifdef GL_MAX_CLIP_PLANES
+   QOpenGLContext context;
+   context.setFormat( QSurfaceFormat::defaultFormat() );
+   if ( context.create() )
+@@ -982,6 +983,7 @@ int Qgs3DUtils::openGlMaxClipPlanes( QSurface *surface )
+       funcs->glGetIntegerv( GL_MAX_CLIP_PLANES, &numPlanes );
+     }
+   }
+#endif
+ 
+   return numPlanes;
+ }
--- a/qgis.changes
+++ b/qgis.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Mar  5 12:05:50 UTC 2025 - Enno Tensing <tenno+suse@suij.in>
+
+- Update to 3.42.0
+  * See https://changelog.qgis.org/en/qgis/version/3.42/ and
+    https://github.com/qgis/QGIS/compare/final-3_40_3...final-3_42_0
+    for changes
+  * Add new qgis-check-if-maxcliplanes-is-defined.patch to fix
+    building with aarch64
+
 -------------------------------------------------------------------
 Fri Jan 17 20:17:41 UTC 2025 - Enno Tensing <tenno+suse@suij.in>

--- a/qgis.spec
+++ b/qgis.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package qgis
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -34,7 +34,7 @@ Name:           qgis
 %define mypython %pythons
 %define __mypython %{expand:%%__%{mypython}}

-Version:        3.40.3
+Version:        3.42.0
 Release:        0
 Summary:        A Geographic Information System (GIS)
 License:        GPL-2.0-only
@@ -48,6 +48,8 @@ Source3:        https://download.qgis.org/downloads/data/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 - only determine GL_MAX_CLIP_PLANES if it is defined
+Patch3:         qgis-check-if-maxcliplanes-is-defined.patch
 BuildRequires:  FastCGI-devel
 BuildRequires:  PDAL-devel
 BuildRequires:  bison >= 2.4
				`@@ -1 +0,0 @@`
				`51135f0b0f82f2b76de4b89a0978396dbdab9baa3c9c03c4a53b7e2f48451076 qgis-3.40.3.tar.bz2`
				`@@ -0,0 +1 @@`
				`04b743397ee2375a1a0521578131fc514752f84db2f86225a9551d1f87e704e8 qgis-3.42.0.tar.bz2`