cemu-project/vcpkg
1
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2024-11-23 11:19:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[qt5-location] Modify clipper library name to avoid conflicts with vxl (#8777)

Browse Source 
* [qt5-location] Modify clipper library name to avoid conflicts with vxl

* update the patch
This commit is contained in:
Robert Schumacher 2019-10-29 11:27:26 -07:00 committed by GitHub
parent b9f30b7197
commit cd42fba998
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 42 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ports/qt5-location/CONTROL
View File

@ -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

39
ports/qt5-location/clipper.patch Normal file
View File

@ -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

2
ports/qt5-location/portfile.cmake
View File

@ -1,2 +1,2 @@
include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
qt_submodule_installation()
qt_submodule_installation(PATCHES clipper.patch)