qt5: updated to 5.12.0

Just in time for the end of the year, we have released Qt 5.12 LTS today. This is a long-term-supported (LTS) release that we will support for 3 years to come. We have had a strong focus on quality and fixed more than 2000 bugs since the last Qt LTS version, Qt 5.9.7 – make that over 5000 bugfixes since Qt 5.6.3. Of course, this is only the start, and we will work hard on continuously improving the quality of Qt 5.12 in upcoming patches

4 files changed, 24 insertions, 19 deletions

diff --git a/x11/qt5-qtlocation/Makefile b/x11/qt5-qtlocation/Makefile
index 75e8e227ca0..fac2ad59dbc 100644
--- a/x11/qt5-qtlocation/Makefile
+++ b/x11/qt5-qtlocation/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2018/12/09 18:52:13 adam Exp $
+# $NetBSD: Makefile,v 1.34 2018/12/18 09:57:18 adam Exp $
 
 DISTNAME=	qtlocation-everywhere-src-${QTVERSION}
 PKGNAME=	qt5-qtlocation-${QTVERSION}
-PKGREVISION=	3
 COMMENT=	Qt5 module for qtlocation
 
 BUILD_TARGET=		sub-src
diff --git a/x11/qt5-qtlocation/PLIST b/x11/qt5-qtlocation/PLIST
index 4eab9ed8d52..667beec86b3 100644
--- a/x11/qt5-qtlocation/PLIST
+++ b/x11/qt5-qtlocation/PLIST
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST,v 1.9 2018/11/13 09:34:47 markd Exp $
+@comment $NetBSD: PLIST,v 1.10 2018/12/18 09:57:18 adam Exp $
 lib/pkgconfig/Qt5Location.pc
 lib/pkgconfig/Qt5Positioning.pc
 qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/error_messages_p.h
 qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/locationvaluetypehelper_p.h
-qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/mapitemviewdelegateincubator_p.h
 qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qabstractgeotilecache_p.h
 qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qcache3q_p.h
 qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qdeclarativecategory_p.h
@@ -15,6 +14,7 @@ qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qdeclarativegeomap_p.h
 qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qdeclarativegeomapcopyrightsnotice_p.h
 qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qdeclarativegeomapitembase_p.h
 qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qdeclarativegeomapitemgroup_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qdeclarativegeomapitemtransitionmanager_p.h
 qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qdeclarativegeomapitemview_p.h
 qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qdeclarativegeomapparameter_p.h
 qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qdeclarativegeomapquickitem_p.h
@@ -126,6 +126,7 @@ qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qplaceratings_p.h
 qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qplacereply_p.h
 qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qplaceresult_p.h
 qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qplacereview_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qplacesearchrequest_p.h
 qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qplacesearchresult_p.h
 qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qplacesupplier_p.h
 qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qplaceuser_p.h
@@ -138,6 +139,7 @@ qt5/include/QtLocation/QGeoCodingManager
 qt5/include/QtLocation/QGeoCodingManagerEngine
 qt5/include/QtLocation/QGeoManeuver
 qt5/include/QtLocation/QGeoRoute
+qt5/include/QtLocation/QGeoRouteLeg
 qt5/include/QtLocation/QGeoRouteReply
 qt5/include/QtLocation/QGeoRouteRequest
 qt5/include/QtLocation/QGeoRouteSegment
@@ -284,6 +286,8 @@ qt5/include/QtPositioning/qtpositioningversion.h
 qt5/include/QtPositioningQuick/${PKGVERSION}/QtPositioningQuick/private/qdeclarativeposition_p.h
 qt5/include/QtPositioningQuick/${PKGVERSION}/QtPositioningQuick/private/qdeclarativepositionsource_p.h
 qt5/include/QtPositioningQuick/${PKGVERSION}/QtPositioningQuick/private/qpositioningquickglobal_p.h
+qt5/include/QtPositioningQuick/${PKGVERSION}/QtPositioningQuick/private/qquickgeocoordinateanimation_p.h
+qt5/include/QtPositioningQuick/${PKGVERSION}/QtPositioningQuick/private/qquickgeocoordinateanimation_p_p.h
 qt5/include/QtPositioningQuick/QtPositioningQuick
 qt5/include/QtPositioningQuick/QtPositioningQuickDepends
 qt5/include/QtPositioningQuick/QtPositioningQuickVersion
@@ -299,6 +303,7 @@ qt5/lib/cmake/Qt5Location/Qt5Location_QGeoServiceProviderFactoryOsm.cmake
 qt5/lib/cmake/Qt5Positioning/Qt5PositioningConfig.cmake
 qt5/lib/cmake/Qt5Positioning/Qt5PositioningConfigVersion.cmake
 qt5/lib/cmake/Qt5Positioning/Qt5Positioning_QGeoPositionInfoSourceFactoryGeoclue.cmake
+qt5/lib/cmake/Qt5Positioning/Qt5Positioning_QGeoPositionInfoSourceFactoryGeoclue2.cmake
 qt5/lib/cmake/Qt5Positioning/Qt5Positioning_QGeoPositionInfoSourceFactoryPoll.cmake
 qt5/lib/cmake/Qt5Positioning/Qt5Positioning_QGeoPositionInfoSourceFactorySerialNmea.cmake
 qt5/lib/cmake/Qt5PositioningQuick/Qt5PositioningQuickConfig.cmake
@@ -307,17 +312,17 @@ qt5/lib/libQt5Location.prl
 qt5/lib/libQt5Location.so
 qt5/lib/libQt5Location.so.${PKGVERSION}
 qt5/lib/libQt5Location.so.5
-qt5/lib/libQt5Location.so.5.11
+qt5/lib/libQt5Location.so.5.12
 qt5/lib/libQt5Positioning.prl
 qt5/lib/libQt5Positioning.so
 qt5/lib/libQt5Positioning.so.${PKGVERSION}
 qt5/lib/libQt5Positioning.so.5
-qt5/lib/libQt5Positioning.so.5.11
+qt5/lib/libQt5Positioning.so.5.12
 qt5/lib/libQt5PositioningQuick.prl
-qt5/lib/libQt5PositioningQuick.so.${PKGVERSION}
 qt5/lib/libQt5PositioningQuick.so
+qt5/lib/libQt5PositioningQuick.so.${PKGVERSION}
 qt5/lib/libQt5PositioningQuick.so.5
-qt5/lib/libQt5PositioningQuick.so.5.11
+qt5/lib/libQt5PositioningQuick.so.5.12
 qt5/lib/pkgconfig/Qt5Location.pc
 qt5/lib/pkgconfig/Qt5Positioning.pc
 qt5/lib/pkgconfig/Qt5PositioningQuick.pc
@@ -333,6 +338,7 @@ qt5/plugins/geoservices/libqtgeoservices_mapbox.so
 qt5/plugins/geoservices/libqtgeoservices_nokia.so
 qt5/plugins/geoservices/libqtgeoservices_osm.so
 qt5/plugins/position/libqtposition_geoclue.so
+qt5/plugins/position/libqtposition_geoclue2.so
 qt5/plugins/position/libqtposition_positionpoll.so
 qt5/plugins/position/libqtposition_serialnmea.so
 qt5/qml/Qt/labs/location/liblocationlabsplugin.so
diff --git a/x11/qt5-qtlocation/distinfo b/x11/qt5-qtlocation/distinfo
index 57d5cfb0be1..a815c45ab4d 100644
--- a/x11/qt5-qtlocation/distinfo
+++ b/x11/qt5-qtlocation/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.9 2018/10/01 17:44:47 adam Exp $
+$NetBSD: distinfo,v 1.10 2018/12/18 09:57:18 adam Exp $
 
-SHA1 (qtlocation-everywhere-src-5.11.2.tar.xz) = 4919b44e77c18e73f8ea3ced4b96243cd6881441
-RMD160 (qtlocation-everywhere-src-5.11.2.tar.xz) = 130106e7493f074cea5bf5618a22579c56cac542
-SHA512 (qtlocation-everywhere-src-5.11.2.tar.xz) = 84a52aedac59f1bc4372538dc0810c742f87f04b2ee599e7ed3f8f0cfe0e13d652e80d3cf7de95395bbe1285a60cc15791760e17f0975cf8399527cdadbd7c1b
-Size (qtlocation-everywhere-src-5.11.2.tar.xz) = 5584420 bytes
-SHA1 (patch-src_location_configure.json) = 5000b63fd76a8bade6a36c777f9b5b7b1b471ab7
+SHA1 (qtlocation-everywhere-src-5.12.0.tar.xz) = eeab3abd0dc67172c0fb2ad645af1b2c7ecd9cce
+RMD160 (qtlocation-everywhere-src-5.12.0.tar.xz) = ec71fed7b1e254906503e2986256382c1547d576
+SHA512 (qtlocation-everywhere-src-5.12.0.tar.xz) = ce85ecbfacba12267bf9d4b58abfe95d81242bebceae53c769eac9518b00c3b2569a9049b88d672370b32ef0a91967446cd33b66ecb15739601d73af70320ba0
+Size (qtlocation-everywhere-src-5.12.0.tar.xz) = 5898856 bytes
+SHA1 (patch-src_location_configure.json) = b83ac508df5784d161962bf245e06d93700b4fc1
 SHA1 (patch-src_location_declarativemaps_qdeclarativegeomap.cpp) = c89cfdf06c2f3354ff717e390511e4059e3b5601
diff --git a/x11/qt5-qtlocation/patches/patch-src_location_configure.json b/x11/qt5-qtlocation/patches/patch-src_location_configure.json
index b7807827a8f..63276743e74 100644
--- a/x11/qt5-qtlocation/patches/patch-src_location_configure.json
+++ b/x11/qt5-qtlocation/patches/patch-src_location_configure.json
@@ -1,15 +1,15 @@
-$NetBSD: patch-src_location_configure.json,v 1.2 2018/03/01 20:09:49 adam Exp $
+$NetBSD: patch-src_location_configure.json,v 1.3 2018/12/18 09:57:18 adam Exp $
 
 Only try building mapboxgl on Linux.
 
---- src/location/configure.json.orig	2018-02-08 16:42:15.000000000 +0000
+--- src/location/configure.json.orig	2018-12-13 07:36:23.000000000 +0000
 +++ src/location/configure.json
-@@ -37,7 +37,7 @@
+@@ -43,7 +43,7 @@
              "condition": [
                  "features.opengl",
                  "features.c++14",
--                "!config.qnx && !config.intel_icc && (!config.win32 || config.mingw)"
-+                "config.linux && !config.qnx && !config.intel_icc && (!config.win32 || config.mingw)"
+-                "!config.intel_icc && (!config.win32 || config.mingw)"
++                "config.linux && !config.intel_icc && (!config.win32 || config.mingw)"
              ],
              "output": [ "privateFeature" ]
          },