Accepting request 1238189 from Application:Geo

OBS-URL: https://build.opensuse.org/request/show/1238189
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gdal?expand=0&rev=93
This commit is contained in:
Ana Guerrero 2025-01-16 17:34:16 +00:00 committed by Git OBS Bridge
commit 3f666591d0
9 changed files with 20 additions and 26 deletions

View File

@ -1,16 +0,0 @@
diff --git a/frmts/pdf/pdfsdk_headers_poppler.h b/frmts/pdf/pdfsdk_headers_poppler.h
index 00cc4067fe5b..d2a3a449d124 100644
--- a/frmts/pdf/pdfsdk_headers_poppler.h
+++ b/frmts/pdf/pdfsdk_headers_poppler.h
@@ -19,6 +19,11 @@
#ifdef HAVE_POPPLER
+// The "#define private public" hacks we do below do not play well with the
+// sstream header.
+// Cf https://github.com/conda-forge/gdal-feedstock/pull/1019#issuecomment-2528710051
+#include <sstream>
+
/* Horrible hack because there's a conflict between struct FlateDecode of */
/* include/poppler/Stream.h and the FlateDecode() function of */
/* pdfium/core/include/fpdfapi/fpdf_parser.h. */

View File

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

View File

@ -1 +0,0 @@
14e1fc511d816d23ed383fd0a3946841 gdal-3.10.0.tar.xz

3
gdal-3.10.1.tar.xz Normal file
View File

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

1
gdal-3.10.1.tar.xz.md5 Normal file
View File

@ -0,0 +1 @@
fba2a0e5d33fdefbe745a3577e156139 gdal-3.10.1.tar.xz

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Wed Jan 15 19:50:51 UTC 2025 - Bruno Friedmann <bruno@ioda-net.ch>
- Update to bugfix release version 3.10.1
+ CMake: FindDotnet.cmake: remove obsolete cmake_minimum_required()
+ CMake: fix swig/csharp/CMakeLists.txt compatibility with CMake 3.31
+ CMake: use add_compile_options() instead of setting CMAKE_CXX_FLAGS for -fno-finite-math-only (#11286)
+ Set GDAL_DEV_SUFFIX to the pre-release suffix if a corresponding Git tag was found.
+ PDF: fix build issue on CondaForge build infrastructure (gcc 13.3)
+ Fix issues in cpl_vsil_win32.cpp with latest mingw64
- Remove merged upstream 19ba2562.patch
-------------------------------------------------------------------
Sun Jan 5 08:36:23 UTC 2025 - Bruno Friedmann <bruno@ioda-net.ch>

View File

@ -42,7 +42,7 @@
%define mypython_sitearch %{expand:%%%{mypython}_sitearch}
Name: gdal
Version: 3.10.0
Version: 3.10.1
Release: 0
Summary: GDAL/OGR - a translator library for raster and vector geospatial data formats
License: BSD-3-Clause AND MIT AND SUSE-Public-Domain
@ -50,8 +50,6 @@ URL: https://www.gdal.org/
Source0: https://download.osgeo.org/%{name}/%{version}/%{sourcename}-%{version}.tar.xz
Source1: https://download.osgeo.org/%{name}/%{version}/%{sourcename}-%{version}.tar.xz.md5
Source2: https://download.osgeo.org/%{name}/%{version}/%{sourcename}autotest-%{version}.tar.gz
#UPSTREAM Patch https://github.com/OSGeo/gdal/pull/11473/
Patch0: 19ba2562.patch
BuildRequires: KEALib-devel
BuildRequires: bison
BuildRequires: blas-devel

View File

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

View File

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