* Re: [PR PATCH] [Updated] WIP: merkaartor: update to 0.20.0
2024-12-29 19:23 [PR PATCH] WIP: merkaartor: update to 0.20.0 Johnnynator
@ 2024-12-29 19:49 ` Johnnynator
2024-12-29 19:51 ` Johnnynator
` (7 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Johnnynator @ 2024-12-29 19:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1365 bytes --]
There is an updated 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**, they do segfault at least on musl
<!--
#### 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: 5191 bytes --]
From c4303733e5eea47489bc639674d521f6e2231514 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 | 23 +++++++----
2 files changed, 57 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..e4ece5ee1bef9b 100644
--- a/srcpkgs/merkaartor/template
+++ b/srcpkgs/merkaartor/template
@@ -1,14 +1,23 @@
# 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"
+else
+ build_options_default=""
+fi
From 16cb8ea43223182ae45f4e36a25f2211c958fb8b 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..e85e414455f2d4 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"
+build_helper="qemu"
+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
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PR PATCH] [Updated] WIP: merkaartor: update to 0.20.0
2024-12-29 19:23 [PR PATCH] WIP: merkaartor: update to 0.20.0 Johnnynator
2024-12-29 19:49 ` [PR PATCH] [Updated] " Johnnynator
@ 2024-12-29 19:51 ` Johnnynator
2024-12-29 20:09 ` Johnnynator
` (6 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Johnnynator @ 2024-12-29 19:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1330 bytes --]
There is an updated 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**
<!--
#### 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: 5157 bytes --]
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 6046b1ec3861cca5b6e9f7037b92f35f8c52ac1b 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..e85e414455f2d4 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"
+build_helper="qemu"
+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
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PR PATCH] [Updated] WIP: merkaartor: update to 0.20.0
2024-12-29 19:23 [PR PATCH] WIP: merkaartor: update to 0.20.0 Johnnynator
2024-12-29 19:49 ` [PR PATCH] [Updated] " Johnnynator
2024-12-29 19:51 ` Johnnynator
@ 2024-12-29 20:09 ` Johnnynator
2025-01-02 13:29 ` Johnnynator
` (5 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Johnnynator @ 2024-12-29 20:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1330 bytes --]
There is an updated 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**
<!--
#### 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: 5162 bytes --]
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
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PR PATCH] [Updated] WIP: merkaartor: update to 0.20.0
2024-12-29 19:23 [PR PATCH] WIP: merkaartor: update to 0.20.0 Johnnynator
` (2 preceding siblings ...)
2024-12-29 20:09 ` Johnnynator
@ 2025-01-02 13:29 ` Johnnynator
2025-02-04 20:57 ` Johnnynator
` (4 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Johnnynator @ 2025-01-02 13:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1330 bytes --]
There is an updated 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**
<!--
#### 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: 5201 bytes --]
From 85d0bed4ae39d163660d0fb7a98740f7957434bc 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 3943fcd36693b5c6ad14da0e9d29d81d2685c799 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 | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/proj/template b/srcpkgs/proj/template
index b11ff8b9b49269..fb41c0b308647a 100644
--- a/srcpkgs/proj/template
+++ b/srcpkgs/proj/template
@@ -1,24 +1,24 @@
# 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 gtest-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} libcurl-devel
+ sqlite-devel tiff-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PR PATCH] [Updated] WIP: merkaartor: update to 0.20.0
2024-12-29 19:23 [PR PATCH] WIP: merkaartor: update to 0.20.0 Johnnynator
` (3 preceding siblings ...)
2025-01-02 13:29 ` Johnnynator
@ 2025-02-04 20:57 ` Johnnynator
2025-05-06 2:09 ` github-actions
` (3 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Johnnynator @ 2025-02-04 20:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1330 bytes --]
There is an updated 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**
<!--
#### 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: 5201 bytes --]
From 9e856a8b02f560f3eef53c5e1bd9c07fa6988686 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 4662c727b1a7056043b2c8a3d15ba6243bebb30a 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 | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/proj/template b/srcpkgs/proj/template
index b11ff8b9b49269..fb41c0b308647a 100644
--- a/srcpkgs/proj/template
+++ b/srcpkgs/proj/template
@@ -1,24 +1,24 @@
# 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 gtest-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} libcurl-devel
+ sqlite-devel tiff-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: WIP: merkaartor: update to 0.20.0
2024-12-29 19:23 [PR PATCH] WIP: merkaartor: update to 0.20.0 Johnnynator
` (4 preceding siblings ...)
2025-02-04 20:57 ` Johnnynator
@ 2025-05-06 2:09 ` github-actions
2025-05-08 5:45 ` [PR PATCH] [Updated] " Johnnynator
` (2 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: github-actions @ 2025-05-06 2:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/53750#issuecomment-2853069238
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PR PATCH] [Updated] WIP: merkaartor: update to 0.20.0
2024-12-29 19:23 [PR PATCH] WIP: merkaartor: update to 0.20.0 Johnnynator
` (5 preceding siblings ...)
2025-05-06 2:09 ` github-actions
@ 2025-05-08 5:45 ` Johnnynator
2025-05-08 7:18 ` Johnnynator
2025-05-08 7:18 ` [PR PATCH] [Merged]: " Johnnynator
8 siblings, 0 replies; 10+ messages in thread
From: Johnnynator @ 2025-05-08 5:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1330 bytes --]
There is an updated 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**
<!--
#### 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: 5201 bytes --]
From 9e856a8b02f560f3eef53c5e1bd9c07fa6988686 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 4662c727b1a7056043b2c8a3d15ba6243bebb30a 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 | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/proj/template b/srcpkgs/proj/template
index b11ff8b9b49269..fb41c0b308647a 100644
--- a/srcpkgs/proj/template
+++ b/srcpkgs/proj/template
@@ -1,24 +1,24 @@
# 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 gtest-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} libcurl-devel
+ sqlite-devel tiff-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PR PATCH] [Updated] WIP: merkaartor: update to 0.20.0
2024-12-29 19:23 [PR PATCH] WIP: merkaartor: update to 0.20.0 Johnnynator
` (6 preceding siblings ...)
2025-05-08 5:45 ` [PR PATCH] [Updated] " Johnnynator
@ 2025-05-08 7:18 ` Johnnynator
2025-05-08 7:18 ` [PR PATCH] [Merged]: " Johnnynator
8 siblings, 0 replies; 10+ messages in thread
From: Johnnynator @ 2025-05-08 7:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1330 bytes --]
There is an updated 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**
<!--
#### 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: 5201 bytes --]
From 2808da3411a5412016e13b820923aa53eacfbefc 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 b526bdfe3745699a68c018a9f540ac95847d07a9 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 | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/proj/template b/srcpkgs/proj/template
index b11ff8b9b49269..fb41c0b308647a 100644
--- a/srcpkgs/proj/template
+++ b/srcpkgs/proj/template
@@ -1,24 +1,24 @@
# 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 gtest-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} libcurl-devel
+ sqlite-devel tiff-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PR PATCH] [Merged]: WIP: merkaartor: update to 0.20.0
2024-12-29 19:23 [PR PATCH] WIP: merkaartor: update to 0.20.0 Johnnynator
` (7 preceding siblings ...)
2025-05-08 7:18 ` Johnnynator
@ 2025-05-08 7:18 ` Johnnynator
8 siblings, 0 replies; 10+ messages in thread
From: Johnnynator @ 2025-05-08 7:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1163 bytes --]
There's a merged pull request on the void-packages repository
WIP: merkaartor: update to 0.20.0
https://github.com/void-linux/void-packages/pull/53750
Description:
- **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**
<!--
#### 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
-->
^ permalink raw reply [flat|nested] 10+ messages in thread