public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Sandro Mani <manisandro@gmail.com>
To: git-commits@fedoraproject.org
Subject: [rpms/mod_mapcache] rawhide: Add mapcache-gdal313.patch
Date: Wed, 24 Jun 2026 11:42:21 GMT [thread overview]
Message-ID: <178230134156.1.4261206086488639960.rpms-mod_mapcache-298e20f7fb12@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/mod_mapcache
Branch : rawhide
Commit : 298e20f7fb12d19ec5261c64c80f9bd68cdc4969
Author : Sandro Mani <manisandro@gmail.com>
Date : 2026-06-24T13:34:45+02:00
Stats : +19/-1 in 2 file(s)
URL : https://src.fedoraproject.org/rpms/mod_mapcache/c/298e20f7fb12d19ec5261c64c80f9bd68cdc4969?branch=rawhide
Log:
Add mapcache-gdal313.patch
---
diff --git a/mapcache-gdal313.patch b/mapcache-gdal313.patch
new file mode 100644
index 0000000..5f01daa
--- /dev/null
+++ b/mapcache-gdal313.patch
@@ -0,0 +1,14 @@
+diff -rupN --no-dereference mapcache-1.14.1/lib/source_gdal.c mapcache-1.14.1-new/lib/source_gdal.c
+--- mapcache-1.14.1/lib/source_gdal.c 2024-08-02 15:40:15.000000000 +0200
++++ mapcache-1.14.1-new/lib/source_gdal.c 2026-06-24 13:34:31.991645875 +0200
+@@ -347,8 +347,8 @@ CreateWarpedVRT( GDALDatasetH hSrcDS,
+ {
+ double dfDesiredXRes = (extent->maxx - extent->minx) / width;
+ double dfDesiredYRes = (extent->maxy - extent->miny) / height;
+- double dfDesiredRes = MIN( dfDesiredXRes, dfDesiredYRes );
+- double dfGuessedFullRes = MIN( adfDstGeoTransform[1],
++ double dfDesiredRes = MAPCACHE_MIN( dfDesiredXRes, dfDesiredYRes );
++ double dfGuessedFullRes = MAPCACHE_MIN( adfDstGeoTransform[1],
+ fabs(adfDstGeoTransform[5]) );
+ double dfApproxDstOvrRatio = dfDesiredRes / dfGuessedFullRes;
+
diff --git a/mod_mapcache.spec b/mod_mapcache.spec
index 78675b2..5753e0a 100644
--- a/mod_mapcache.spec
+++ b/mod_mapcache.spec
@@ -23,6 +23,10 @@ Source: mapcache.sysusers
Source: https://salsa.debian.org/debian-gis-team/mapcache/-/raw/master/debian/man/mapcache_detail.1.xml
Source: https://salsa.debian.org/debian-gis-team/mapcache/-/raw/master/debian/man/mapcache_seed.1.xml
+# Fix build against gdal-3.13
+# https://github.com/MapServer/mapcache/commit/0948ea28df9ef5dae8705196b32f0742268953cf
+Patch: mapcache-gdal313.patch
+
Requires: httpd
Requires: libmapcache%{?_isa} = %{version}-%{release}
@@ -95,7 +99,7 @@ Summary: Tools for mapcache
Provides command-line utilities for mapcache
%prep
-%autosetup -n %{project_name}-%{version}
+%autosetup -n %{project_name}-%{version} -p1
%build
%cmake -DCMAKE_INSTALL_LIBDIR=%{_lib} -DWITH_MEMCACHE=1 -DCMAKE_SKIP_BUILD_RPATH=TRUE .
reply other threads:[~2026-06-24 11:42 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178230134156.1.4261206086488639960.rpms-mod_mapcache-298e20f7fb12@fedoraproject.org \
--to=manisandro@gmail.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox