head	1.2;
access;
symbols
	pkgsrc-2018Q4:1.1.0.6
	pkgsrc-2018Q4-base:1.1
	pkgsrc-2018Q3:1.1.0.4
	pkgsrc-2018Q3-base:1.1
	pkgsrc-2018Q2:1.1.0.2;
locks; strict;
comment	@// @;


1.2
date	2019.03.26.11.14.17;	author adam;	state dead;
branches;
next	1.1;
commitid	MsdQkN9UMK7tKRgB;

1.1
date	2018.07.17.20.22.54;	author maya;	state Exp;
branches
	1.1.2.1;
next	;
commitid	rZ2Ki7H06uhOSwKA;

1.1.2.1
date	2018.07.17.20.22.54;	author bsiegert;	state dead;
branches;
next	1.1.2.2;
commitid	XpSeWZ7mHmGbEKKA;

1.1.2.2
date	2018.07.19.13.48.41;	author bsiegert;	state Exp;
branches;
next	;
commitid	XpSeWZ7mHmGbEKKA;


desc
@@


1.2
log
@qt5: updated to 5.12.2

5.12.2:
While not adding new features, the Qt 5.12.2 release provides a number of bug
fixes and other improvements.

Compared to Qt 5.12.1, the new Qt 5.12.2 contains more than 250 bug fixes. For
details of the most important changes, please check the Change files of Qt
5.12.2.

With Qt 5.12.2 we bring back widely asked MinGW 32 bit prebuild binaries in
addition to 64 bit ones.

Qt 5.12 LTS will receive many more patch releases throughout the coming years
and we recommend all active developed projects to migrate to Qt 5.12 LTS. Qt
5.9 LTS is currently in ‘Strict’ phase and receives only the selected important
bug and security fixes, while Qt 5.12 LTS is currently receiving all the bug
fixes. With Qt 5.6 Support ending in March 2019 all active projects still using
Qt 5.6 LTS should now migrate to a later version of Qt.
@
text
@$NetBSD: patch-src_location_declarativemaps_qdeclarativegeomap.cpp,v 1.1 2018/07/17 20:22:54 maya 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();
@


1.1
log
@qt5-qtlocation: workaround GCC < 5.x bug and be explicit on how to cast this.
from thiago on qt irc.
@
text
@d1 1
a1 1
$NetBSD$
@


1.1.2.1
log
@file patch-src_location_declarativemaps_qdeclarativegeomap.cpp was added on branch pkgsrc-2018Q2 on 2018-07-19 13:48:41 +0000
@
text
@d1 31
@


1.1.2.2
log
@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.
@
text
@a0 31
$NetBSD: patch-src_location_declarativemaps_qdeclarativegeomap.cpp,v 1.1 2018/07/17 20:22:54 maya 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();
@