Changes 5.4.0:

Chromium-based browser engine Qt WebEngine
Qt WebView for showing web content using the native OS web engine on mobile
Full support on Qt for Windows Store Apps, including WinRT and Windows Phone 8.1
Improved Compliance with iOS 8 and Xcode 6
Improved OS X 10.10 ‘Yosemite’ support and new Mac AppStore signing
High-DPI support for Windows and OS X
Dynamic GL switching between OpenGL and ANGLE on Windows
Mix OpenGL and Qt Quick with QOpenGLWidget
Android Look-and-Feel for Qt Quick Controls
Qt Creator 3.3 with new Qt Quick Designer
Bluetooth now supports BlueZ5 with tech preview on Bluetooth LE

4 files changed, 175 insertions, 16 deletions

diff --git a/x11/qt5-qtlocation/Makefile b/x11/qt5-qtlocation/Makefile
index eb55174c768..a16d499a815 100644
--- a/x11/qt5-qtlocation/Makefile
+++ b/x11/qt5-qtlocation/Makefile
@@ -1,27 +1,20 @@
-# $NetBSD: Makefile,v 1.7 2014/12/25 13:51:14 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2014/12/30 17:23:46 adam Exp $
 
+DISTNAME=	qtlocation-opensource-src-${QTVERSION}
 PKGNAME=	qt5-qtlocation-${QTVERSION}
 COMMENT=	Qt5 module for qtlocation
 
-USE_LIBTOOL=		yes
-CONFIGURE_ARGS+=	-I${QTDIR}/include -L${QTDIR}/lib
-
-BUILD_DIRS+=		qtlocation
 BUILD_TARGET=		sub-src
 MAKE_ENV+=		QTDIR=${QTDIR}
-
 INSTALL_ENV+=		INSTALL_ROOT=${DESTDIR}
 INSTALLATION_DIRS+=	lib/pkgconfig
 
-PC_FILES=		Qt5Positioning.pc
-
 .include "../../x11/qt5-qtbase/Makefile.common"
 
 post-install:
-.for i in ${PC_FILES}
-	${RM} -f ${DESTDIR}${PREFIX}/lib/pkgconfig/${i} && \
-		cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \
-		${LN} -s ${QTPREFIX}/lib/pkgconfig/${i} ${i}
+.for i in Qt5Positioning.pc
+	cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \
+	${LN} -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i}
 .endfor
 
 .include "../../x11/qt5-qtdeclarative/buildlink3.mk"
diff --git a/x11/qt5-qtlocation/PLIST b/x11/qt5-qtlocation/PLIST
index 3ce1249bcd1..f34eb03711d 100644
--- a/x11/qt5-qtlocation/PLIST
+++ b/x11/qt5-qtlocation/PLIST
@@ -1,12 +1,158 @@
-@comment $NetBSD: PLIST,v 1.2 2013/12/15 09:42:44 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.3 2014/12/30 17:23:46 adam Exp $
 lib/pkgconfig/Qt5Positioning.pc
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qcache3q_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeocameracapabilities_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeocameradata_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeocameratiles_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeocodereply_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeocodingmanager_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeocodingmanagerengine_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeomaneuver_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeomap_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeomapcontroller_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeomapdata_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeomapdata_p_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeomappingmanager_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeomappingmanager_p_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeomappingmanagerengine_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeomappingmanagerengine_p_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeomapscene_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeomaptype_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeomaptype_p_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeoroute_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeoroutereply_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeorouterequest_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeoroutesegment_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeoroutingmanager_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeoroutingmanagerengine_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeoserviceprovider_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeotilecache_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeotiledmapdata_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeotiledmapdata_p_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeotiledmappingmanagerengine_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeotiledmappingmanagerengine_p_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeotiledmapreply_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeotiledmapreply_p_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeotilefetcher_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeotilefetcher_p_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeotilerequestmanager_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeotilespec_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qgeotilespec_p_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qplace_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qplaceattribute_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qplacecategory_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qplacecontactdetail_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qplacecontent_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qplacecontentrequest_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qplaceeditorial_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qplaceicon_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qplaceimage_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qplacemanagerengine_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qplaceproposedsearchresult_p.h
+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/qplacesearchresult_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qplacesupplier_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/qplaceuser_p.h
+qt5/include/QtLocation/${PKGVERSION}/QtLocation/private/unsupportedreplies_p.h
+qt5/include/QtLocation/QGeoCodeReply
+qt5/include/QtLocation/QGeoCodingManager
+qt5/include/QtLocation/QGeoCodingManagerEngine
+qt5/include/QtLocation/QGeoManeuver
+qt5/include/QtLocation/QGeoRoute
+qt5/include/QtLocation/QGeoRouteReply
+qt5/include/QtLocation/QGeoRouteRequest
+qt5/include/QtLocation/QGeoRouteSegment
+qt5/include/QtLocation/QGeoRoutingManager
+qt5/include/QtLocation/QGeoRoutingManagerEngine
+qt5/include/QtLocation/QGeoServiceProvider
+qt5/include/QtLocation/QGeoServiceProviderFactory
+qt5/include/QtLocation/QLocation
+qt5/include/QtLocation/QPlace
+qt5/include/QtLocation/QPlaceAttribute
+qt5/include/QtLocation/QPlaceCategory
+qt5/include/QtLocation/QPlaceContactDetail
+qt5/include/QtLocation/QPlaceContent
+qt5/include/QtLocation/QPlaceContentReply
+qt5/include/QtLocation/QPlaceContentRequest
+qt5/include/QtLocation/QPlaceDetailsReply
+qt5/include/QtLocation/QPlaceEditorial
+qt5/include/QtLocation/QPlaceIcon
+qt5/include/QtLocation/QPlaceIdReply
+qt5/include/QtLocation/QPlaceImage
+qt5/include/QtLocation/QPlaceManager
+qt5/include/QtLocation/QPlaceManagerEngine
+qt5/include/QtLocation/QPlaceMatchReply
+qt5/include/QtLocation/QPlaceMatchRequest
+qt5/include/QtLocation/QPlaceProposedSearchResult
+qt5/include/QtLocation/QPlaceRatings
+qt5/include/QtLocation/QPlaceReply
+qt5/include/QtLocation/QPlaceResult
+qt5/include/QtLocation/QPlaceReview
+qt5/include/QtLocation/QPlaceSearchReply
+qt5/include/QtLocation/QPlaceSearchRequest
+qt5/include/QtLocation/QPlaceSearchResult
+qt5/include/QtLocation/QPlaceSearchSuggestionReply
+qt5/include/QtLocation/QPlaceSupplier
+qt5/include/QtLocation/QPlaceUser
+qt5/include/QtLocation/QtLocation
+qt5/include/QtLocation/QtLocationDepends
+qt5/include/QtLocation/QtLocationVersion
+qt5/include/QtLocation/placemacro.h
+qt5/include/QtLocation/qgeocodereply.h
+qt5/include/QtLocation/qgeocodingmanager.h
+qt5/include/QtLocation/qgeocodingmanagerengine.h
+qt5/include/QtLocation/qgeomaneuver.h
+qt5/include/QtLocation/qgeoroute.h
+qt5/include/QtLocation/qgeoroutereply.h
+qt5/include/QtLocation/qgeorouterequest.h
+qt5/include/QtLocation/qgeoroutesegment.h
+qt5/include/QtLocation/qgeoroutingmanager.h
+qt5/include/QtLocation/qgeoroutingmanagerengine.h
+qt5/include/QtLocation/qgeoserviceprovider.h
+qt5/include/QtLocation/qgeoserviceproviderfactory.h
+qt5/include/QtLocation/qlocation.h
+qt5/include/QtLocation/qlocationglobal.h
+qt5/include/QtLocation/qplace.h
+qt5/include/QtLocation/qplaceattribute.h
+qt5/include/QtLocation/qplacecategory.h
+qt5/include/QtLocation/qplacecontactdetail.h
+qt5/include/QtLocation/qplacecontent.h
+qt5/include/QtLocation/qplacecontentreply.h
+qt5/include/QtLocation/qplacecontentrequest.h
+qt5/include/QtLocation/qplacedetailsreply.h
+qt5/include/QtLocation/qplaceeditorial.h
+qt5/include/QtLocation/qplaceicon.h
+qt5/include/QtLocation/qplaceidreply.h
+qt5/include/QtLocation/qplaceimage.h
+qt5/include/QtLocation/qplacemanager.h
+qt5/include/QtLocation/qplacemanagerengine.h
+qt5/include/QtLocation/qplacematchreply.h
+qt5/include/QtLocation/qplacematchrequest.h
+qt5/include/QtLocation/qplaceproposedsearchresult.h
+qt5/include/QtLocation/qplaceratings.h
+qt5/include/QtLocation/qplacereply.h
+qt5/include/QtLocation/qplaceresult.h
+qt5/include/QtLocation/qplacereview.h
+qt5/include/QtLocation/qplacesearchreply.h
+qt5/include/QtLocation/qplacesearchrequest.h
+qt5/include/QtLocation/qplacesearchresult.h
+qt5/include/QtLocation/qplacesearchsuggestionreply.h
+qt5/include/QtLocation/qplacesupplier.h
+qt5/include/QtLocation/qplaceuser.h
+qt5/include/QtLocation/qtlocationversion.h
 qt5/include/QtPositioning/${PKGVERSION}/QtPositioning/private/qdeclarativegeoaddress_p.h
 qt5/include/QtPositioning/${PKGVERSION}/QtPositioning/private/qdeclarativegeolocation_p.h
+qt5/include/QtPositioning/${PKGVERSION}/QtPositioning/private/qdoublevector2d_p.h
+qt5/include/QtPositioning/${PKGVERSION}/QtPositioning/private/qdoublevector3d_p.h
 qt5/include/QtPositioning/${PKGVERSION}/QtPositioning/private/qgeoaddress_p.h
 qt5/include/QtPositioning/${PKGVERSION}/QtPositioning/private/qgeocircle_p.h
 qt5/include/QtPositioning/${PKGVERSION}/QtPositioning/private/qgeocoordinate_p.h
 qt5/include/QtPositioning/${PKGVERSION}/QtPositioning/private/qgeolocation_p.h
 qt5/include/QtPositioning/${PKGVERSION}/QtPositioning/private/qgeopositioninfosource_p.h
+qt5/include/QtPositioning/${PKGVERSION}/QtPositioning/private/qgeoprojection_p.h
 qt5/include/QtPositioning/${PKGVERSION}/QtPositioning/private/qgeorectangle_p.h
 qt5/include/QtPositioning/${PKGVERSION}/QtPositioning/private/qgeoshape_p.h
 qt5/include/QtPositioning/${PKGVERSION}/QtPositioning/private/qlocationutils_p.h
@@ -44,14 +190,29 @@ qt5/include/QtPositioning/qgeoshape.h
 qt5/include/QtPositioning/qnmeapositioninfosource.h
 qt5/include/QtPositioning/qpositioningglobal.h
 qt5/include/QtPositioning/qtpositioningversion.h
+qt5/lib/cmake/Qt5Location/Qt5LocationConfig.cmake
+qt5/lib/cmake/Qt5Location/Qt5LocationConfigVersion.cmake
+qt5/lib/cmake/Qt5Location/Qt5Location_QGeoServiceProviderFactoryNokia.cmake
+qt5/lib/cmake/Qt5Location/Qt5Location_QGeoServiceProviderFactoryOsm.cmake
 qt5/lib/cmake/Qt5Positioning/Qt5PositioningConfig.cmake
 qt5/lib/cmake/Qt5Positioning/Qt5PositioningConfigVersion.cmake
+qt5/lib/cmake/Qt5Positioning/Qt5Positioning_QGeoPositionInfoSourceFactoryPoll.cmake
+qt5/lib/libQt5Location.la
+qt5/lib/libQt5Location.prl
 qt5/lib/libQt5Positioning.la
 qt5/lib/libQt5Positioning.prl
+qt5/lib/pkgconfig/Qt5Location.pc
 qt5/lib/pkgconfig/Qt5Positioning.pc
+qt5/mkspecs/modules/qt_lib_location.pri
+qt5/mkspecs/modules/qt_lib_location_private.pri
 qt5/mkspecs/modules/qt_lib_positioning.pri
 qt5/mkspecs/modules/qt_lib_positioning_private.pri
+qt5/plugins/geoservices/libqtgeoservices_nokia.la
+qt5/plugins/geoservices/libqtgeoservices_osm.la
 qt5/plugins/position/libqtposition_positionpoll.la
+qt5/qml/QtLocation/libdeclarative_location.la
+qt5/qml/QtLocation/plugins.qmltypes
+qt5/qml/QtLocation/qmldir
 qt5/qml/QtPositioning/libdeclarative_positioning.la
 qt5/qml/QtPositioning/plugins.qmltypes
 qt5/qml/QtPositioning/qmldir
diff --git a/x11/qt5-qtlocation/buildlink3.mk b/x11/qt5-qtlocation/buildlink3.mk
index cef2a7ccc76..d7c224fb4c5 100644
--- a/x11/qt5-qtlocation/buildlink3.mk
+++ b/x11/qt5-qtlocation/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.6 2014/10/07 16:47:16 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2014/12/30 17:23:46 adam Exp $
 
 BUILDLINK_TREE+=	qt5-qtlocation
 
 .if !defined(QT5_QTLOCATION_BUILDLINK3_MK)
 QT5_QTLOCATION_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.qt5-qtlocation+=	qt5-qtlocation>=5.2.0
-BUILDLINK_ABI_DEPENDS.qt5-qtlocation?=	qt5-qtlocation>=5.2.1
+BUILDLINK_API_DEPENDS.qt5-qtlocation+=	qt5-qtlocation>=5.4.0
+BUILDLINK_ABI_DEPENDS.qt5-qtlocation+=	qt5-qtlocation>=5.4.0
 BUILDLINK_PKGSRCDIR.qt5-qtlocation?=	../../x11/qt5-qtlocation
 
 BUILDLINK_INCDIRS.qt5-qtlocation+=	qt5/include
diff --git a/x11/qt5-qtlocation/distinfo b/x11/qt5-qtlocation/distinfo
new file mode 100644
index 00000000000..301dbd6f8ee
--- /dev/null
+++ b/x11/qt5-qtlocation/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2014/12/30 17:23:46 adam Exp $
+
+SHA1 (qtlocation-opensource-src-5.4.0.tar.xz) = c47e80c4282f96de843d90341f93cd0f48333284
+RMD160 (qtlocation-opensource-src-5.4.0.tar.xz) = 575c3660a81fc285b331a23d49df43dd5d070006
+Size (qtlocation-opensource-src-5.4.0.tar.xz) = 3297720 bytes