wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-07-31 09:52:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

merkaartor: update to 0.20.0.

Browse source
This commit is contained in:
John 2024-12-29 20:04:23 +01:00 • committed by John Zimmermann
parent 6178c49fd2
commit 8b65a60be2
2 changed files with 55 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
srcpkgs/merkaartor/patches/75223944dc3e61fbe124a0677af709cdd7c83028.patch Normal file
View file

@ -0,0 +1,41 @@
From 61fac7791e2c17be946ae54d2f485f02732ac40a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krakonos@krakonos.org>
Date: Thu, 26 Sep 2024 22:53:56 +0200
Subject: [PATCH] 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(+)
diff --git a/src/Preferences/MerkaartorPreferences.cpp b/src/Preferences/MerkaartorPreferences.cpp
index 25c7a16c..0e35b165 100644
--- 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"));
diff --git a/src/Utils/OsmServer.h b/src/Utils/OsmServer.h
index 1b23ff72..302d0421 100644
--- 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

21
srcpkgs/merkaartor/template
View file

@ -1,14 +1,21 @@
# Template file for 'merkaartor' # Template file for 'merkaartor'
pkgname=merkaartor pkgname=merkaartor
version=0.19.0 version=0.20.0
revision=4 revision=1
build_style=qmake build_style=cmake
hostmakedepends="qt5-qmake libgdal-tools qt5-host-tools" configure_args="$(vopt_bool webengine WEBENGINE)"
makedepends="libgdal-devel proj-devel qt5-declarative-devel qt5-svg-devel hostmakedepends="libgdal-tools qt6-base qt6-tools pkg-config protobuf"
qt5-tools-devel qt5-webkit-devel" makedepends="libgdal-devel proj-devel qt6-declarative-devel qt6-svg-devel
qt6-networkauth-devel qt6-qt5compat-devel protobuf-devel proj-devel
exiv2-devel $(vopt_if webengine qt6-webengine-devel)"
short_desc="Openstreetmap map editor" short_desc="Openstreetmap map editor"
maintainer="John <me@johnnynator.dev>" maintainer="John <me@johnnynator.dev>"
license="GPL-2.0-or-later" license="GPL-2.0-or-later"
homepage="http://merkaartor.be" homepage="http://merkaartor.be"
distfiles="https://github.com/openstreetmap/merkaartor/archive/${version}.tar.gz" distfiles="https://github.com/openstreetmap/merkaartor/archive/${version}.tar.gz"
checksum=f538d1eb380005cbd5d047070b276da59c58bb7ff47218e20a080b893d0ba457 checksum=31b73a9d50cb6366a7c15ab36e030467ffe9f7de2be38bad5f3832314d4a5751
build_options="webengine"
if [ "$XBPS_WORDSIZE$XBPS_WORDSIZE" = "64$XBPS_TARGET_WORDSIZE" ]; then
build_options_default="webengine"
fi