mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-24 12:09:00 +08:00
[poly2tri] Fix consuming the library due to incorrectly encoded header (#21653)
* [poly2tri] Fix consuming the library due to incorrectly encoded header sweep.h was in ANSI codepage and some characters were illegal in utf-8 * Completely remove the surname. Co-authored-by: Osyotr <8740768+Osyotr@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
This commit is contained in:
parent
b3cfaaf1bb
commit
1d84bbd83d
13
ports/poly2tri/fix-sweep-h-codepage.patch
Normal file
13
ports/poly2tri/fix-sweep-h-codepage.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff --git a/poly2tri/sweep/sweep.h b/poly2tri/sweep/sweep.h
|
||||
index f62c4cc..af8af69 100644
|
||||
--- a/poly2tri/sweep/sweep.h
|
||||
+++ b/poly2tri/sweep/sweep.h
|
||||
@@ -33,7 +33,7 @@
|
||||
* Zalik, B.(2008)'Sweep-line algorithm for constrained Delaunay triangulation',
|
||||
* International Journal of Geographical Information Science
|
||||
*
|
||||
- * "FlipScan" Constrained Edge Algorithm invented by Thomas Åhlén, thahlen@gmail.com
|
||||
+ * "FlipScan" Constrained Edge Algorithm invented by Thomas, thahlen@gmail.com
|
||||
*/
|
||||
|
||||
#ifndef SWEEP_H
|
@ -1,5 +1,3 @@
|
||||
vcpkg_fail_port_install(ON_TARGET "uwp")
|
||||
|
||||
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
||||
|
||||
vcpkg_from_github(
|
||||
@ -8,19 +6,20 @@ vcpkg_from_github(
|
||||
REF 88de49021b6d9bef6faa1bc94ceb3fbd85c3c204
|
||||
SHA512 fa256bcf923ad59f42205edf5a7e07cac6cbd9a37cefb9a0961a2e06aea7fa8ffd09d4e26154c0028601c12804483842cb935d9f602385f5f203c9628382c4fb
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
fix-sweep-h-codepage.patch
|
||||
)
|
||||
|
||||
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
|
||||
file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PREFER_NINJA
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
)
|
||||
|
||||
vcpkg_install_cmake()
|
||||
vcpkg_fixup_cmake_targets()
|
||||
vcpkg_cmake_install()
|
||||
vcpkg_cmake_config_fixup()
|
||||
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
||||
|
||||
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
||||
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||
|
@ -1,8 +1,18 @@
|
||||
{
|
||||
"name": "poly2tri",
|
||||
"version-string": "2020-07-21",
|
||||
"port-version": 1,
|
||||
"port-version": 2,
|
||||
"description": "The Clipper library performs clipping and offsetting for both lines and polygons. All four boolean clipping operations are supported - intersection, union, difference and exclusive-or. Polygons can be of any shape including self-intersecting polygons.",
|
||||
"homepage": "https://github.com/greenm01/poly2tri",
|
||||
"supports": "!uwp"
|
||||
"supports": "!uwp",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
"host": true
|
||||
},
|
||||
{
|
||||
"name": "vcpkg-cmake-config",
|
||||
"host": true
|
||||
}
|
||||
]
|
||||
}
|
||||
|
@ -5326,7 +5326,7 @@
|
||||
},
|
||||
"poly2tri": {
|
||||
"baseline": "2020-07-21",
|
||||
"port-version": 1
|
||||
"port-version": 2
|
||||
},
|
||||
"polyclipping": {
|
||||
"baseline": "6.4.2",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "03cdd793a8f279b18df99f74bf4eef1e24ad5809",
|
||||
"version-string": "2020-07-21",
|
||||
"port-version": 2
|
||||
},
|
||||
{
|
||||
"git-tree": "5202b2e184ce5e7fff3bd268797addd62e9a23c6",
|
||||
"version-string": "2020-07-21",
|
||||
|
Loading…
Reference in New Issue
Block a user