pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/misc/marble marble: Avoid ambiguous function call.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/e8e814485c6f
branches:  trunk
changeset: 379262:e8e814485c6f
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Fri May 13 17:06:01 2022 +0000

description:
marble: Avoid ambiguous function call.

diffstat:

 misc/marble/distinfo                                         |   3 +-
 misc/marble/patches/patch-src_lib_marble_VectorTileModel.cpp |  15 ++++++++++++
 2 files changed, 17 insertions(+), 1 deletions(-)

diffs (35 lines):

diff -r e019f8c9db96 -r e8e814485c6f misc/marble/distinfo
--- a/misc/marble/distinfo      Fri May 13 16:06:46 2022 +0000
+++ b/misc/marble/distinfo      Fri May 13 17:06:01 2022 +0000
@@ -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 @@
 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
diff -r e019f8c9db96 -r e8e814485c6f misc/marble/patches/patch-src_lib_marble_VectorTileModel.cpp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/marble/patches/patch-src_lib_marble_VectorTileModel.cpp      Fri May 13 17:06:01 2022 +0000
@@ -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
+ {
+ 



Home | Main Index | Thread Index | Old Index