Bas Couwenberg pushed to branch master at Debian GIS Project / merkaartor
Commits: 3a189473 by Bas Couwenberg at 2026-05-30T13:42:46+02:00 Add upstream patch to fix crash on download no server is loaded. - - - - - 3 changed files: - debian/changelog - + debian/patches/0001-Fixed-a-crash-on-download-when-no-server-is-loaded-f.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -4,6 +4,7 @@ merkaartor (0.20.0+ds-4) UNRELEASED; urgency=medium * Use test-build-validate-cleanup instead of test-build-twice. * Drop Priority: optional, default since dpkg 1.22.13. * Bump Standards-Version to 4.7.4, changes: priority. + * Add upstream patch to fix crash on download no server is loaded. -- Bas Couwenberg <[email protected]> Sat, 25 Oct 2025 12:59:59 +0200 ===================================== debian/patches/0001-Fixed-a-crash-on-download-when-no-server-is-loaded-f.patch ===================================== @@ -0,0 +1,36 @@ +From 61fac7791e2c17be946ae54d2f485f02732ac40a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <[email protected]> +Date: Thu, 26 Sep 2024 22:53:56 +0200 +Subject: Fixed a crash on download when no server is loaded from config. + +Default osm server is loaded with no credentials. +--- + src/Preferences/MerkaartorPreferences.cpp | 5 +++++ + src/Utils/OsmServer.h | 2 ++ + 2 files changed, 7 insertions(+) + +--- a/src/Preferences/MerkaartorPreferences.cpp ++++ b/src/Preferences/MerkaartorPreferences.cpp +@@ -630,6 +630,11 @@ void MerkaartorPreferences::initialize() + + } + ++ if (theOsmServers.size() == 0) { ++ theOsmServers.append(defaultOsmServerInfo); ++ qDebug(lc_MerkaartorPreferences) << "No OSM servers found, adding default server."; ++ } ++ + //Ensure we have a CacheDir value in QSettings + if (!g_Merk_Ignore_Preferences) + Sets->setValue("backgroundImage/CacheDir", Sets->value("backgroundImage/CacheDir", HOMEDIR + "/BackgroundCache")); +--- a/src/Utils/OsmServer.h ++++ b/src/Utils/OsmServer.h +@@ -46,6 +46,8 @@ struct OsmServerInfo + int CfgVersion = 1; + }; + ++OsmServerInfo const defaultOsmServerInfo = OsmServerInfo{true, OsmServerInfo::AuthType::OAuth2Redirect, "https://www.openstreetmap.org/";, "", ""}; ++ + class IOsmServerImpl : public QObject { + Q_OBJECT + ===================================== debian/patches/series ===================================== @@ -1,2 +1,3 @@ no-git-version.patch gdal-3.12.patch +0001-Fixed-a-crash-on-download-when-no-server-is-loaded-f.patch View it on GitLab: https://salsa.debian.org/debian-gis-team/merkaartor/-/commit/3a189473df46dc59c1fcbbaa0b5f17ac38588c13 -- View it on GitLab: https://salsa.debian.org/debian-gis-team/merkaartor/-/commit/3a189473df46dc59c1fcbbaa0b5f17ac38588c13 You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
_______________________________________________ Pkg-grass-devel mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
