aboutsummaryrefslogtreecommitdiff
path: root/ports/qt5-location
diff options
context:
space:
mode:
authorAlexander Neumann <30894796+Neumann-A@users.noreply.github.com>2021-01-20 21:55:41 +0100
committerGitHub <noreply@github.com>2021-01-20 12:55:41 -0800
commit8e926cc06c3b52056926697b87fc350af7e66d69 (patch)
treea22c33d961a95d9e8c267e1d3d08dc194d5b8703 /ports/qt5-location
parenta8a07972dbd6a835329f31133fb83b3f4723cb55 (diff)
downloadvcpkg-8e926cc06c3b52056926697b87fc350af7e66d69.tar.gz
vcpkg-8e926cc06c3b52056926697b87fc350af7e66d69.zip
[qt5] Update to 5.15.2 (#14678)
* [qt5] Update to 5.15.2 (mqtt currently missing git tag) * deactivate update of ports * update version * reduce port version * fix typo * fix patch for linux missing pthread * fix qt5-tools * fix qt5-webengine * add xcb-util to linux provisioning script * fix version numbers * fix other typo * remove new hashes file * fix latest version info * switch to vcpkg_from_git adjust vcpkg_from_git to handle tags. add OUT_REF for vcpkg_from_git to enable scriptable update of ports * regenerate docs * [vcpkg_from_git] new options TAG and OUT_REF - TAG github tag to checkout - OUT_REF github commit id related to tag or ref (useable for automatic updates of ports if used with a version tag) * Apply suggestions from code review Co-authored-by: Robert Schumacher <roschuma@microsoft.com> * additional changes due to CR * regenerate docs * Remove 'Port-Version:0' from qt5-location Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com> * add all those versions * fix versions Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> Co-authored-by: Robert Schumacher <roschuma@microsoft.com> Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>
Diffstat (limited to 'ports/qt5-location')
-rw-r--r--ports/qt5-location/CONTROL9
-rw-r--r--ports/qt5-location/portfile.cmake2
-rw-r--r--ports/qt5-location/rename_third_party_libs_conflicts.patch68
3 files changed, 5 insertions, 74 deletions
diff --git a/ports/qt5-location/CONTROL b/ports/qt5-location/CONTROL
index 470d25e3d..e123c56b9 100644
--- a/ports/qt5-location/CONTROL
+++ b/ports/qt5-location/CONTROL
@@ -1,5 +1,4 @@
-Source: qt5-location
-Version: 5.15.1
-Port-Version: 2
-Description: Qt5 Location Module - Displays map, navigation, and place content in a QML application.
-Build-Depends: qt5-base[core], qt5-declarative, qt5-quickcontrols, qt5-quickcontrols2, qt5-serialport
+Source: qt5-location
+Version: 5.15.2
+Description: Qt5 Location Module - Displays map, navigation, and place content in a QML application.
+Build-Depends: qt5-base[core], qt5-declarative, qt5-quickcontrols, qt5-quickcontrols2, qt5-serialport
diff --git a/ports/qt5-location/portfile.cmake b/ports/qt5-location/portfile.cmake
index 6855151bd..c8d591b2d 100644
--- a/ports/qt5-location/portfile.cmake
+++ b/ports/qt5-location/portfile.cmake
@@ -1,3 +1,3 @@
message(STATUS "${PORT} has a spurious failure in which it is unable to create a parent directory! Just retry.")
include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
-qt_submodule_installation(PATCHES rename_third_party_libs_conflicts.patch)
+qt_submodule_installation()
diff --git a/ports/qt5-location/rename_third_party_libs_conflicts.patch b/ports/qt5-location/rename_third_party_libs_conflicts.patch
deleted file mode 100644
index 786cea1ba..000000000
--- a/ports/qt5-location/rename_third_party_libs_conflicts.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff --git a/src/3rdparty/clip2tri/clip2tri.pro b/src/3rdparty/clip2tri/clip2tri.pro
-index 802c040..4059a63 100644
---- a/src/3rdparty/clip2tri/clip2tri.pro
-+++ b/src/3rdparty/clip2tri/clip2tri.pro
-@@ -1,4 +1,4 @@
--TARGET = clip2tri
-+TARGET = qt_clip2tri
-
- CONFIG += staticlib exceptions warn_off optimize_full
-
-@@ -18,5 +18,5 @@ gcc {
- HEADERS += clip2tri.h
- SOURCES += clip2tri.cpp
-
--LIBS_PRIVATE += -L$$MODULE_BASE_OUTDIR/lib -lpoly2tri$$qtPlatformTargetSuffix() -lclipper$$qtPlatformTargetSuffix()
-+LIBS_PRIVATE += -L$$MODULE_BASE_OUTDIR/lib -lqt_poly2tri$$qtPlatformTargetSuffix() -lqt_clipper$$qtPlatformTargetSuffix()
-
-diff --git a/src/3rdparty/clipper/clipper.pro b/src/3rdparty/clipper/clipper.pro
-index 874d55c..a518d24 100644
---- a/src/3rdparty/clipper/clipper.pro
-+++ b/src/3rdparty/clipper/clipper.pro
-@@ -1,4 +1,4 @@
--TARGET = clipper
-+TARGET = qt_clipper
-
- CONFIG += staticlib exceptions warn_off optimize_full
-
-diff --git a/src/3rdparty/poly2tri/poly2tri.pro b/src/3rdparty/poly2tri/poly2tri.pro
-index 76f2779..6c5f769 100644
---- a/src/3rdparty/poly2tri/poly2tri.pro
-+++ b/src/3rdparty/poly2tri/poly2tri.pro
-@@ -1,4 +1,4 @@
--TARGET = poly2tri
-+TARGET = qt_poly2tri
-
- CONFIG += staticlib warn_off optimize_full
-
-diff --git a/src/location/declarativemaps/declarativemaps.pri b/src/location/declarativemaps/declarativemaps.pri
-index e2a922f..12199ee 100644
---- a/src/location/declarativemaps/declarativemaps.pri
-+++ b/src/location/declarativemaps/declarativemaps.pri
-@@ -68,5 +68,5 @@ SOURCES += \
- declarativemaps/qquickgeomapgesturearea.cpp
-
- load(qt_build_paths)
--LIBS_PRIVATE += -L$$MODULE_BASE_OUTDIR/lib -lpoly2tri$$qtPlatformTargetSuffix() -lclip2tri$$qtPlatformTargetSuffix()
-+LIBS_PRIVATE += -L$$MODULE_BASE_OUTDIR/lib -lqt_poly2tri$$qtPlatformTargetSuffix() -lqt_clip2tri$$qtPlatformTargetSuffix()
-
-diff --git a/src/location/location.pro b/src/location/location.pro
-index 1b541b9..b0e2c3f 100644
---- a/src/location/location.pro
-+++ b/src/location/location.pro
-@@ -45,4 +45,4 @@ HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS
-
- load(qt_module)
-
--LIBS_PRIVATE += -L$$MODULE_BASE_OUTDIR/lib -lclip2tri$$qtPlatformTargetSuffix()
-+LIBS_PRIVATE += -L$$MODULE_BASE_OUTDIR/lib -lqt_clip2tri$$qtPlatformTargetSuffix()
-diff --git a/src/positioning/positioning.pro b/src/positioning/positioning.pro
-index 6535090..db49921 100644
---- a/src/positioning/positioning.pro
-+++ b/src/positioning/positioning.pro
-@@ -95,4 +95,4 @@ HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS
-
- load(qt_module)
-
--LIBS_PRIVATE += -L$$MODULE_BASE_OUTDIR/lib -lclip2tri$$qtPlatformTargetSuffix()
-+LIBS_PRIVATE += -L$$MODULE_BASE_OUTDIR/lib -lqt_clip2tri$$qtPlatformTargetSuffix()