- 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")

OBS-URL: https://build.opensuse.org/package/show/Application:Geo/qgis?expand=0&rev=418
This commit is contained in:
2025-04-28 14:59:27 +00:00
committed by Git OBS Bridge
parent 22067b9c3c
commit 2428561fc6
7 changed files with 14 additions and 19 deletions

View File

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

View File

@@ -1 +0,0 @@
9d6a01b24712140c4159842fd00cd9c7532da8bc13625d1a3bf09abedd42c1e9 qgis-3.42.1.tar.bz2

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

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

View File

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

View File

@@ -1,12 +0,0 @@
diff --git i/src/3d/qgs3dutils.cpp w/src/3d/qgs3dutils.cpp
index 053c9458611..78b10ca00b0 100644
--- i/src/3d/qgs3dutils.cpp
+++ w/src/3d/qgs3dutils.cpp
@@ -45,6 +45,7 @@
#include <Qt3DRender/QRenderSettings>
#include <QOpenGLContext>
#include <QOpenGLFunctions>
+#include <GL/gl.h>
#if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 )

View File

@@ -1,3 +1,12 @@
-------------------------------------------------------------------
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>

View File

@@ -34,7 +34,7 @@ Name: qgis
%define mypython %pythons
%define __mypython %{expand:%%__%{mypython}}
Version: 3.42.1
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 - some OpenGL constants are not defined for aarch64 (Issue #60882 upstream)
Patch3: qgis-import-gl_h.patch
BuildRequires: FastCGI-devel
BuildRequires: PDAL-devel
BuildRequires: bison >= 2.4