tech-pkg archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: qt5 and c++11 variadic templates
This apparently does the trick
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/qt5-qtlocation/Makefile,v
retrieving revision 1.26
diff -u -r1.26 Makefile
--- Makefile 19 Jun 2018 07:21:24 -0000 1.26
+++ Makefile 17 Jul 2018 19:16:58 -0000
@@ -2,6 +2,7 @@
DISTNAME= qtlocation-everywhere-src-${QTVERSION}
PKGNAME= qt5-qtlocation-${QTVERSION}
+PKGREVISION= 1
COMMENT= Qt5 module for qtlocation
BUILD_TARGET= sub-src
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/x11/qt5-qtlocation/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo 22 Jun 2018 06:29:20 -0000 1.7
+++ distinfo 17 Jul 2018 19:16:58 -0000
@@ -5,3 +5,4 @@
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
Index: patches/patch-src_location_declarativemaps_qdeclarativegeomap.cpp
===================================================================
RCS file: patches/patch-src_location_declarativemaps_qdeclarativegeomap.cpp
diff -N patches/patch-src_location_declarativemaps_qdeclarativegeomap.cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_location_declarativemaps_qdeclarativegeomap.cpp 17 Jul 2018 19:16:58 -0000
@@ -0,0 +1,31 @@
+$NetBSD$
+
+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),
+ [©rightString](const QString ©){ copyrightString = copy; });
+ QMetaObject::Connection copyrightImageCatcherConnection =
+- connect(m_map,
++ connect(m_map.data(),
+ QOverload<const QImage &>::of(&QGeoMap::copyrightsChanged),
+ [©rightImage](const QImage ©){ 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();
Home |
Main Index |
Thread Index |
Old Index