Accepting request 1273217 from Application:Geo

- Update to 3.42.2
  * See https://github.com/qgis/QGIS/compare/final-3_42_1%5E...final-3_42_2
    for commits between 3.42.1 and 3.42.2
  * Drop qgis-import-gl_h.patch; The issue has been fixed upstream with
    commit 7a8d98c ("Fix QGIS 3.42 build on arm64")
- Update to 3.42.1
  * See https://github.com/qgis/QGIS/compare/final-3_42_0%5E...final-3_42_1
    for commits between 3.42.0 and 4.32.1
  * Replace qgis-check-if-maxcliplanes-is-defined.patch with
    qgis-import-gl_h.patch to fix building with aarch64 (less
    invasive patch, which also restores the intended behaviour)
  * Add Mesa-libGL-devel as a dependency for aarch64, since it does
    not get picked up automatically for some reason

OBS-URL: https://build.opensuse.org/request/show/1273217
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/qgis?expand=0&rev=64

qgis-3.42.0.tar.bz2

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

qgis-3.42.0.tar.bz2.sha256

@@ -1 +0,0 @@
-04b743397ee2375a1a0521578131fc514752f84db2f86225a9551d1f87e704e8  qgis-3.42.0.tar.bz2

qgis-3.42.2.tar.bz2

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

qgis-3.42.2.tar.bz2.sha256

@@ -0,0 +1 @@
+ce63863990da409de09606651252a3811b1cbee017ce8e8fbf2fd20a64778883  qgis-3.42.2.tar.bz2

qgis-check-if-maxcliplanes-is-defined.patch

@@ -1,20 +0,0 @@
-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;
- }

qgis.changes

@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Wed Apr 23 18:11:28 UTC 2025 - Enno Tensing <tenno+suse@suij.in>
+
+- Update to 3.42.2
+  * See https://github.com/qgis/QGIS/compare/final-3_42_1%5E...final-3_42_2
+    for commits between 3.42.1 and 3.42.2
+  * Drop qgis-import-gl_h.patch; The issue has been fixed upstream with
+    commit 7a8d98c ("Fix QGIS 3.42 build on arm64")
+
+-------------------------------------------------------------------
+Sat Mar 22 08:04:27 UTC 2025 - Enno Tensing <tenno+suse@suij.in>
+
+- Update to 3.42.1
+  * See https://github.com/qgis/QGIS/compare/final-3_42_0%5E...final-3_42_1
+    for commits between 3.42.0 and 4.32.1
+  * Replace qgis-check-if-maxcliplanes-is-defined.patch with
+    qgis-import-gl_h.patch to fix building with aarch64 (less
+    invasive patch, which also restores the intended behaviour)
+  * Add Mesa-libGL-devel as a dependency for aarch64, since it does
+    not get picked up automatically for some reason
+
 -------------------------------------------------------------------
 Wed Mar  5 12:05:50 UTC 2025 - Enno Tensing <tenno+suse@suij.in>
 

qgis.spec

@@ -34,7 +34,7 @@ Name:           qgis
 %define mypython %pythons
 %define __mypython %{expand:%%__%{mypython}}
 
-Version:        3.42.0
+Version:        3.42.2
 Release:        0
 Summary:        A Geographic Information System (GIS)
 License:        GPL-2.0-only
@@ -48,8 +48,6 @@ 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
@@ -168,6 +166,10 @@ BuildRequires:  grass-devel >= 7.2
 %ifarch ppc64le
 BuildRequires:  memory-constraints
 %endif
+%ifarch aarch64
+# Picked up by x86_64 and ppc64le, but not aarch64
+BuildRequires: Mesa-libGL-devel
+%endif
 
 %package devel
 Summary:        Development Libraries for QGIS