[PR PATCH] WIP: merkaartor: update to 0.20.0

[Johnnynator <Johnnynator@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1318 bytes --]

There is a new pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages merkaartor
https://github.com/void-linux/void-packages/pull/53750

WIP: merkaartor: update to 0.20.0
- **merkaartor: update to 0.20.0.**
- **proj: update to 9.5.1.**

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/53750.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-merkaartor-53750.patch --]
[-- Type: text/x-diff, Size: 2747 bytes --]

From 37c63d03e6ab97c359e671b05372b16f332de76b 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.

---
 srcpkgs/merkaartor/template | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/merkaartor/template b/srcpkgs/merkaartor/template
index edfd24149dd766..030a46e55edccd 100644
--- a/srcpkgs/merkaartor/template
+++ b/srcpkgs/merkaartor/template
@@ -1,14 +1,19 @@
 # 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"
+build_options_default="webengine"

From 96795564d350743e25450c89648782dbf5a7b924 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 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/proj/template b/srcpkgs/proj/template
index b11ff8b9b49269..ac2b92f1de0b5a 100644
--- a/srcpkgs/proj/template
+++ b/srcpkgs/proj/template
@@ -1,6 +1,6 @@
 # Template file for 'proj'
 pkgname=proj
-version=9.4.1
+version=9.5.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -11,14 +11,14 @@ 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} libcurl-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include