CVS commit: pkgsrc/misc/marble

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri May 13 17:06:01 UTC 2022

Modified Files:
        pkgsrc/misc/marble: distinfo
Added Files:
        pkgsrc/misc/marble/patches: patch-src_lib_marble_VectorTileModel.cpp

Log Message:
marble: Avoid ambiguous function call.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/misc/marble/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/misc/marble/patches/patch-src_lib_marble_VectorTileModel.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/misc/marble/distinfo
diff -u pkgsrc/misc/marble/distinfo:1.19 pkgsrc/misc/marble/distinfo:1.20
--- pkgsrc/misc/marble/distinfo:1.19    Fri Dec 17 08:51:53 2021
+++ pkgsrc/misc/marble/distinfo Fri May 13 17:06:01 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2021/12/17 08:51:53 prlw1 Exp $
+$NetBSD: distinfo,v 1.20 2022/05/13 17:06:01 jperkin Exp $
 
 BLAKE2s (marble-20.12.3.tar.xz) = f4d65c53c3b9f6c86f620cae916980473c03518abe138c5ad750b279e7b8ec8a
 SHA512 (marble-20.12.3.tar.xz) = 0dc69ce2dafac196d3b494bd29a268f879e8bd14ae916454682289822024d58e077e4972588cc6d51284459f2fc9aceacd4e1e8a8302f987556e20a7acaf172a
@@ -6,5 +6,6 @@ Size (marble-20.12.3.tar.xz) = 52242116 
 SHA1 (patch-src_lib_astro_astrolib.cpp) = 541b39516af740b0ff8e485e9e4e8a339ca5d7f4
 SHA1 (patch-src_lib_astro_astrolib.h) = 4123af9f32a35400e05943598e7dceff84899928
 SHA1 (patch-src_lib_astro_solarsystem.cpp) = 1e00e5edf7ac5b38a1d4d29ccf4847470b6f4906
+SHA1 (patch-src_lib_marble_VectorTileModel.cpp) = 37694434914e9f067f7bf5112b4a9596baa8e889
 SHA1 (patch-src_plugins_positionprovider_gpsd_GpsdPositionProviderPlugin.cpp) = 7d6efd81d30ba8ffd6e993c3843ee743c02f3afc
 SHA1 (patch-src_plugins_render_stars_StarsPlugin.cpp) = 06fdce98d53db7a74e972dcc39459016646246d0

Added files:

Index: pkgsrc/misc/marble/patches/patch-src_lib_marble_VectorTileModel.cpp
diff -u /dev/null pkgsrc/misc/marble/patches/patch-src_lib_marble_VectorTileModel.cpp:1.1
--- /dev/null   Fri May 13 17:06:01 2022
+++ pkgsrc/misc/marble/patches/patch-src_lib_marble_VectorTileModel.cpp Fri May 13 17:06:01 2022
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_lib_marble_VectorTileModel.cpp,v 1.1 2022/05/13 17:06:01 jperkin Exp $
+
+Avoid ambiguous function call.
+
+--- src/lib/marble/VectorTileModel.cpp.orig    2021-02-27 00:23:23.000000000 +0000
++++ src/lib/marble/VectorTileModel.cpp
+@@ -22,6 +22,8 @@
+ #include <qmath.h>
+ #include <QThreadPool>
+ 
++using std::log;
++
+ namespace Marble
+ {
+