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/qmapshack] rawhide: Add qmapshack-gdal313.patch
Date: Fri, 19 Jun 2026 14:39:05 GMT	[thread overview]
Message-ID: <178187994515.1.4201726448314116363.rpms-qmapshack-91e8ffd2590d@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/qmapshack
Branch : rawhide
Commit : 91e8ffd2590d3cf75ff844d5cf0e9a24d3fb76b4
Author : Sandro Mani <manisandro@gmail.com>
Date   : 2026-06-19T16:38:45+02:00
Stats  : +16/-0 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/qmapshack/c/91e8ffd2590d3cf75ff844d5cf0e9a24d3fb76b4?branch=rawhide

Log:
Add qmapshack-gdal313.patch

---
diff --git a/qmapshack-gdal313.patch b/qmapshack-gdal313.patch
new file mode 100644
index 0000000..b3df52b
--- /dev/null
+++ b/qmapshack-gdal313.patch
@@ -0,0 +1,13 @@
+diff -rupN --no-dereference qmapshack-V_1.17.1/src/qmt_map2jnx/main.cpp qmapshack-V_1.17.1-new/src/qmt_map2jnx/main.cpp
+--- qmapshack-V_1.17.1/src/qmt_map2jnx/main.cpp	2023-12-12 07:50:09.000000000 +0100
++++ qmapshack-V_1.17.1-new/src/qmt_map2jnx/main.cpp	2026-06-19 16:37:05.156070420 +0200
+@@ -430,7 +430,8 @@ static void printProgress(int current, i
+   static int nLastTick = -1;
+   int nThisTick = (int)(dfComplete * 40.0);
+ 
+-  nThisTick = MIN(40, MAX(0, nThisTick));
++  // gdal >= 3.13 issue: MIN -> std::min, MAX -> std::max
++  nThisTick = std::min(40, std::max(0, nThisTick));
+ 
+   // Have we started a new progress run?
+   if (nThisTick < nLastTick && nLastTick >= 39) {

diff --git a/qmapshack.spec b/qmapshack.spec
index f609470..cc8a0ca 100644
--- a/qmapshack.spec
+++ b/qmapshack.spec
@@ -14,6 +14,9 @@ Source0: https://github.com/Maproom/qmapshack/archive/%{commit}/%{name}-%{shortc
 %else
 Source0: https://github.com/Maproom/qmapshack/archive/V_%{version}/%{name}-%{version}.tar.gz
 %endif
+# Backport gdal-3.13 build fix
+# https://github.com/Maproom/qmapshack/commit/9dc06c5e6c94f48cb3efca12d8fefcb106b5ee01.patch
+Patch: qmapshack-gdal313.patch
 
 Recommends: routino
 Recommends: qmaptool

                 reply	other threads:[~2026-06-19 14:39 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=178187994515.1.4201726448314116363.rpms-qmapshack-91e8ffd2590d@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