Skip to Content.
Sympa Menu

sm-commit - [[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (e6c97a8098cc7c2c566124801f1633ca090fd932)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
  • Subject: [[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (e6c97a8098cc7c2c566124801f1633ca090fd932)
  • Date: Tue, 17 Sep 2024 08:48:37 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

qt5-cmake/merkaartor/BUILD | 2 ++
qt5-cmake/merkaartor/DEPENDS | 14 +++++++++++---
qt5-cmake/merkaartor/DETAILS | 4 ++--
qt5-cmake/merkaartor/HISTORY | 5 +++++
4 files changed, 20 insertions(+), 5 deletions(-)

New commits:
commit e6c97a8098cc7c2c566124801f1633ca090fd932
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

merkaartor - qt6 support

commit 895fe5d46a3e73cf7a9a00aa1393798188b7218e
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

merkaartor: => 0.20.0

diff --git a/qt5-cmake/merkaartor/BUILD b/qt5-cmake/merkaartor/BUILD
new file mode 100755
index 0000000..99d79a7
--- /dev/null
+++ b/qt5-cmake/merkaartor/BUILD
@@ -0,0 +1,2 @@
+OPTS+=" -DCMAKE_UNITY_BUILD=true" &&
+cmake_build
diff --git a/qt5-cmake/merkaartor/DEPENDS b/qt5-cmake/merkaartor/DEPENDS
index a40018b..7eb9409 100755
--- a/qt5-cmake/merkaartor/DEPENDS
+++ b/qt5-cmake/merkaartor/DEPENDS
@@ -1,9 +1,17 @@
-source $GRIMOIRE/QT5_DEPENDS &&
-source $GRIMOIRE/CMAKE_DEPENDS &&
+source $GRIMOIRE/QT_DEPENDS &&
depends gdal &&
depends proj &&
depends desktop-file-utils &&
optional_depends exiv2 " -DGEOIMAGE=ON" "" "for geotagged image support" &&
optional_depends gpsd " -DGPSDLIB=ON" "" "for GPS support" &&
optional_depends libproxy " -DUSE_LIBPROXY=ON" "" "for automatic proxy
configuration" &&
-optional_depends qtwebengine " -DWEBENGINE=ON" "" ""
+if is_depends_enabled $SPELL qt6base;then
+ depends qt5compat &&
+ depends qt6svg &&
+ depends qt6tools &&
+ optional_depends qt6webengine " -DWEBENGINE=ON" "" ""
+else
+ depends qtsvg &&
+ depends qttools &&
+ optional_depends qtwebengine " -DWEBENGINE=ON" "" ""
+fi
diff --git a/qt5-cmake/merkaartor/DETAILS b/qt5-cmake/merkaartor/DETAILS
index 1661eb1..1049588 100755
--- a/qt5-cmake/merkaartor/DETAILS
+++ b/qt5-cmake/merkaartor/DETAILS
@@ -1,7 +1,7 @@
# Watch: https://github.com/openstreetmap/merkaartor/tags
SPELL=merkaartor
- VERSION=0.19.0
-
SOURCE_HASH=sha512:2e832ba14fd89861a4ae2940d281c801d039e09aaf30ada996ac508e084a29d033f8ac3d3e4711c78d1f36df84ab133bd0a901e0e8fa72efa098001724940a6d
+ VERSION=0.20.0
+
SOURCE_HASH=sha512:db64c3053618a0bed7984223c9aa8e4175fdf7db2dd70bf3c6ec021b46fae1d095c513c3e151086baf07446c7cf81c49923a2e43e79963d956d29643d7f93910
SOURCE="${SPELL}-${VERSION}.tar.gz"

SOURCE_URL[0]=https://github.com/openstreetmap/merkaartor/archive/${VERSION}.tar.gz
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
diff --git a/qt5-cmake/merkaartor/HISTORY b/qt5-cmake/merkaartor/HISTORY
index dea2fb0..8fd174f 100644
--- a/qt5-cmake/merkaartor/HISTORY
+++ b/qt5-cmake/merkaartor/HISTORY
@@ -1,3 +1,8 @@
+2024-09-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.20.0
+ * DEPENDS: add qt6 support
+ * BUILD: add unity build
+
2023-03-29 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.19.0
move to qt5-cmake section


  • [[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (e6c97a8098cc7c2c566124801f1633ca090fd932), Treeve Jelbert, 09/17/2024

Archive powered by MHonArc 2.6.24.

Top of Page