diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2019-10-29 11:27:26 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-29 11:27:26 -0700 |
| commit | cd42fba998d50f6660814c4e5a7884f583192d15 (patch) | |
| tree | 5b94c1f05be8f3e01d4b06e2e5836a4b8683b18c | |
| parent | b9f30b7197fd5874aa919e85ce6fabafa790a3c4 (diff) | |
| download | vcpkg-cd42fba998d50f6660814c4e5a7884f583192d15.tar.gz vcpkg-cd42fba998d50f6660814c4e5a7884f583192d15.zip | |
[qt5-location] Modify clipper library name to avoid conflicts with vxl (#8777)
* [qt5-location] Modify clipper library name to avoid conflicts with vxl
* update the patch
| -rw-r--r-- | ports/qt5-location/CONTROL | 4 | ||||
| -rw-r--r-- | ports/qt5-location/clipper.patch | 39 | ||||
| -rw-r--r-- | ports/qt5-location/portfile.cmake | 2 |
3 files changed, 42 insertions, 3 deletions
diff --git a/ports/qt5-location/CONTROL b/ports/qt5-location/CONTROL index 7914e5cd7..05de15d9d 100644 --- a/ports/qt5-location/CONTROL +++ b/ports/qt5-location/CONTROL @@ -1,4 +1,4 @@ Source: qt5-location
-Version: 5.12.5-1
+Version: 5.12.5-2
Description: Qt5 Location Module - Displays map, navigation, and place content in a QML application.
-Build-Depends: qt5-base, qt5-declarative, qt5-quickcontrols, qt5-quickcontrols2, qt5-serialport
+Build-Depends: qt5-base, qt5-declarative, qt5-quickcontrols, qt5-quickcontrols2, qt5-serialport
diff --git a/ports/qt5-location/clipper.patch b/ports/qt5-location/clipper.patch new file mode 100644 index 000000000..acbeb09d9 --- /dev/null +++ b/ports/qt5-location/clipper.patch @@ -0,0 +1,39 @@ +diff --git a/src/3rdparty/clip2tri/clip2tri.pro b/src/3rdparty/clip2tri/clip2tri.pro
+index 802c040..3545025 100644
+--- a/src/3rdparty/clip2tri/clip2tri.pro
++++ b/src/3rdparty/clip2tri/clip2tri.pro
+@@ -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 -lpoly2tri$$qtPlatformTargetSuffix() -lqtclipper$$qtPlatformTargetSuffix()
+
+diff --git a/src/3rdparty/clipper/clipper.pro b/src/3rdparty/clipper/clipper.pro
+index 874d55c..5abedf5 100644
+--- a/src/3rdparty/clipper/clipper.pro
++++ b/src/3rdparty/clipper/clipper.pro
+@@ -1,4 +1,4 @@
+-TARGET = clipper
++TARGET = qtclipper
+
+ CONFIG += staticlib exceptions warn_off optimize_full
+
+diff --git a/src/src.pro b/src/src.pro
+index 417e227..612748e 100644
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -6,10 +6,10 @@ include($$OUT_PWD/positioning/qtpositioning-config.pri)
+
+ clip2tri.subdir = 3rdparty/clip2tri
+ poly2tri.subdir = 3rdparty/poly2tri
+-clipper.subdir = 3rdparty/clipper
++qtclipper.subdir = 3rdparty/clipper
+
+-SUBDIRS += clip2tri clipper poly2tri
+-clip2tri.depends = clipper poly2tri
++SUBDIRS += clip2tri qtclipper poly2tri
++clip2tri.depends = qtclipper poly2tri
+
+ SUBDIRS += positioning
+ positioning.depends = clip2tri
diff --git a/ports/qt5-location/portfile.cmake b/ports/qt5-location/portfile.cmake index 214726759..f49813c33 100644 --- a/ports/qt5-location/portfile.cmake +++ b/ports/qt5-location/portfile.cmake @@ -1,2 +1,2 @@ include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) -qt_submodule_installation()
\ No newline at end of file +qt_submodule_installation(PATCHES clipper.patch)
\ No newline at end of file |