From 54d7af0be37da10f95f94ed86280d5a54fddde4a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 29 Dec 2024 20:04:23 +0100
Subject: [PATCH 1/2] merkaartor: update to 0.20.0.

---
 ...3944dc3e61fbe124a0677af709cdd7c83028.patch | 41 +++++++++++++++++++
 srcpkgs/merkaartor/template                   | 21 ++++++----
 2 files changed, 55 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/merkaartor/patches/75223944dc3e61fbe124a0677af709cdd7c83028.patch

diff --git a/srcpkgs/merkaartor/patches/75223944dc3e61fbe124a0677af709cdd7c83028.patch b/srcpkgs/merkaartor/patches/75223944dc3e61fbe124a0677af709cdd7c83028.patch
new file mode 100644
index 00000000000000..07e63d3111daac
--- /dev/null
+++ b/srcpkgs/merkaartor/patches/75223944dc3e61fbe124a0677af709cdd7c83028.patch
@@ -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
+ 
diff --git a/srcpkgs/merkaartor/template b/srcpkgs/merkaartor/template
index edfd24149dd766..38d2cf9e5684e7 100644
--- a/srcpkgs/merkaartor/template
+++ b/srcpkgs/merkaartor/template
@@ -1,14 +1,21 @@
 # Template file for 'merkaartor'
 pkgname=merkaartor
-version=0.19.0
-revision=4
-build_style=qmake
-hostmakedepends="qt5-qmake libgdal-tools qt5-host-tools"
-makedepends="libgdal-devel proj-devel qt5-declarative-devel qt5-svg-devel
- qt5-tools-devel qt5-webkit-devel"
+version=0.20.0
+revision=1
+build_style=cmake
+configure_args="$(vopt_bool webengine WEBENGINE)"
+hostmakedepends="libgdal-tools qt6-base qt6-tools pkg-config protobuf"
+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"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="http://merkaartor.be"
 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

From cf7c63abd491d3409339d846a94ffd1a6c2948c6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 29 Dec 2024 20:12:34 +0100
Subject: [PATCH 2/2] proj: update to 9.5.1.

---
 srcpkgs/proj/template | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/proj/template b/srcpkgs/proj/template
index b11ff8b9b49269..2949be43ba0294 100644
--- a/srcpkgs/proj/template
+++ b/srcpkgs/proj/template
@@ -1,24 +1,23 @@
 # Template file for 'proj'
 pkgname=proj
-version=9.4.1
+version=9.5.1
 revision=1
 build_style=cmake
-configure_args="-DBUILD_TESTING=OFF"
-hostmakedepends="python3"
-makedepends="libcurl-devel openssl-devel sqlite-devel tiff-devel"
+hostmakedepends="sqlite"
+makedepends="libcurl-devel sqlite-devel tiff-devel"
 short_desc="Cartographic Projections Library"
 maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="https://proj.org"
 distfiles="https://download.osgeo.org/proj/proj-${version}.tar.gz"
-checksum=ffe20170ee2b952207adf8a195e2141eab12cda181e49fdeb54425d98c7171d7
+checksum=a8395f9696338ffd46b0feb603edbb730fad6746fba77753c77f7f997345e3d3
 
 post_install() {
 	vlicense COPYING
 }
 
 proj-devel_package() {
-	depends="${sourcepkg}-${version}_${revision}"
+	depends="${sourcepkg}-${version}_${revision} ${makedepends}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include