CVS commit: [pkgsrc-2018Q2] pkgsrc/x11/qt5-qtlocation

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Thu Jul 19 13:48:41 UTC 2018

Modified Files:
        pkgsrc/x11/qt5-qtlocation [pkgsrc-2018Q2]: Makefile distinfo
Added Files:
        pkgsrc/x11/qt5-qtlocation/patches [pkgsrc-2018Q2]:
            patch-src_location_declarativemaps_qdeclarativegeomap.cpp

Log Message:
Pullup ticket #5794 - requested by maya
x11/qt5-qtlocation: build fix

Revisions pulled up:
- x11/qt5-qtlocation/Makefile                                   1.27
- x11/qt5-qtlocation/distinfo                                   1.8
- x11/qt5-qtlocation/patches/patch-src_location_declarativemaps_qdeclarativegeomap.cpp 1.1

---
   Module Name: pkgsrc
   Committed By:        maya
   Date:                Tue Jul 17 20:22:54 UTC 2018

   Modified Files:
        pkgsrc/x11/qt5-qtlocation: Makefile distinfo
   Added Files:
        pkgsrc/x11/qt5-qtlocation/patches:
            patch-src_location_declarativemaps_qdeclarativegeomap.cpp

   Log Message:
   qt5-qtlocation: workaround GCC < 5.x bug and be explicit on how to cast this.
   from thiago on qt irc.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.26.2.1 pkgsrc/x11/qt5-qtlocation/Makefile
cvs rdiff -u -r1.7 -r1.7.2.1 pkgsrc/x11/qt5-qtlocation/distinfo
cvs rdiff -u -r0 -r1.1.2.2 \
    pkgsrc/x11/qt5-qtlocation/patches/patch-src_location_declarativemaps_qdeclarativegeomap.cpp

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

Modified files:

Index: pkgsrc/x11/qt5-qtlocation/Makefile
diff -u pkgsrc/x11/qt5-qtlocation/Makefile:1.26 pkgsrc/x11/qt5-qtlocation/Makefile:1.26.2.1
--- pkgsrc/x11/qt5-qtlocation/Makefile:1.26     Tue Jun 19 07:21:24 2018
+++ pkgsrc/x11/qt5-qtlocation/Makefile  Thu Jul 19 13:48:41 2018
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2018/06/19 07:21:24 adam Exp $
+# $NetBSD: Makefile,v 1.26.2.1 2018/07/19 13:48:41 bsiegert Exp $
 
 DISTNAME=      qtlocation-everywhere-src-${QTVERSION}
 PKGNAME=       qt5-qtlocation-${QTVERSION}
+PKGREVISION=   1
 COMMENT=       Qt5 module for qtlocation
 
 BUILD_TARGET=          sub-src

Index: pkgsrc/x11/qt5-qtlocation/distinfo
diff -u pkgsrc/x11/qt5-qtlocation/distinfo:1.7 pkgsrc/x11/qt5-qtlocation/distinfo:1.7.2.1
--- pkgsrc/x11/qt5-qtlocation/distinfo:1.7      Fri Jun 22 06:29:20 2018
+++ pkgsrc/x11/qt5-qtlocation/distinfo  Thu Jul 19 13:48:41 2018
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.7 2018/06/22 06:29:20 adam Exp $
+$NetBSD: distinfo,v 1.7.2.1 2018/07/19 13:48:41 bsiegert Exp $
 
 SHA1 (qtlocation-everywhere-src-5.11.1.tar.xz) = 77b06f3baf6f5d582fe5455d7657e181ad2f55b1
 RMD160 (qtlocation-everywhere-src-5.11.1.tar.xz) = aef55997be298042c248d45b824c25f69771f303
 SHA512 (qtlocation-everywhere-src-5.11.1.tar.xz) = 8b89aae5bb7caa0999c20c86da1a356e5ba21e1e12ac892a695d180f21527846aa45f926828934b83147b851145477028ff1212802c1c21f8f6bb4e616b8b1fd
 Size (qtlocation-everywhere-src-5.11.1.tar.xz) = 5593144 bytes
 SHA1 (patch-src_location_configure.json) = 5000b63fd76a8bade6a36c777f9b5b7b1b471ab7
+SHA1 (patch-src_location_declarativemaps_qdeclarativegeomap.cpp) = c89cfdf06c2f3354ff717e390511e4059e3b5601

Added files:

Index: pkgsrc/x11/qt5-qtlocation/patches/patch-src_location_declarativemaps_qdeclarativegeomap.cpp
diff -u /dev/null pkgsrc/x11/qt5-qtlocation/patches/patch-src_location_declarativemaps_qdeclarativegeomap.cpp:1.1.2.2
--- /dev/null   Thu Jul 19 13:48:41 2018
+++ pkgsrc/x11/qt5-qtlocation/patches/patch-src_location_declarativemaps_qdeclarativegeomap.cpp Thu Jul 19 13:48:41 2018
@@ -0,0 +1,31 @@
+$NetBSD: patch-src_location_declarativemaps_qdeclarativegeomap.cpp,v 1.1.2.2 2018/07/19 13:48:41 bsiegert Exp $
+
+Build fix with GCC 4.8.
+
+--- src/location/declarativemaps/qdeclarativegeomap.cpp.orig   2018-06-12 18:44:12.000000000 +0000
++++ src/location/declarativemaps/qdeclarativegeomap.cpp
+@@ -694,11 +694,11 @@ void QDeclarativeGeoMap::mappingManagerI
+     QImage copyrightImage;
+     if (!m_initialized && width() > 0 && height() > 0) {
+         QMetaObject::Connection copyrightStringCatcherConnection =
+-                connect(m_map,
++                connect(m_map.data(),
+                         QOverload<const QString &>::of(&QGeoMap::copyrightsChanged),
+                         [&copyrightString](const QString &copy){ copyrightString = copy; });
+         QMetaObject::Connection copyrightImageCatcherConnection =
+-                connect(m_map,
++                connect(m_map.data(),
+                         QOverload<const QImage &>::of(&QGeoMap::copyrightsChanged),
+                         [&copyrightImage](const QImage &copy){ copyrightImage = copy; });
+         m_map->setViewportSize(QSize(width(), height()));
+@@ -719,8 +719,8 @@ void QDeclarativeGeoMap::mappingManagerI
+         emit m_map->copyrightsChanged(copyrightImage);
+ 
+ 
+-    connect(m_map, &QGeoMap::sgNodeChanged, this, &QQuickItem::update);
+-    connect(m_map, &QGeoMap::cameraCapabilitiesChanged, this, &QDeclarativeGeoMap::onCameraCapabilitiesChanged);
++    connect(m_map.data(), &QGeoMap::sgNodeChanged, this, &QQuickItem::update);
++    connect(m_map.data(), &QGeoMap::cameraCapabilitiesChanged, this, &QDeclarativeGeoMap::onCameraCapabilitiesChanged);
+ 
+     // This prefetches a buffer around the map
+     m_map->prefetchData();