diff options
| author | Lily <47812810+LilyWangL@users.noreply.github.com> | 2020-11-04 15:10:51 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-03 23:10:51 -0800 |
| commit | 74ae197d7b333d9e2c19a058f3c88aabffdfdff4 (patch) | |
| tree | b2d7736f08f89264ccdd64d8048918023064bd38 | |
| parent | 5c36967f365db6daf07a6e3d192814f6b9d6104c (diff) | |
| download | vcpkg-74ae197d7b333d9e2c19a058f3c88aabffdfdff4.tar.gz vcpkg-74ae197d7b333d9e2c19a058f3c88aabffdfdff4.zip | |
[kenlm, pdal] Fix const overload on Visual Studio 2019 version 16.8 (#14382)
| -rw-r--r-- | ports/kenlm/fix-const-overloaded.patch | 14 | ||||
| -rw-r--r-- | ports/kenlm/portfile.cmake | 4 | ||||
| -rw-r--r-- | ports/kenlm/vcpkg.json | 1 | ||||
| -rw-r--r-- | ports/pdal/0004-fix-const-overloaded.patch | 13 | ||||
| -rw-r--r-- | ports/pdal/CONTROL | 2 | ||||
| -rw-r--r-- | ports/pdal/portfile.cmake | 1 |
6 files changed, 33 insertions, 2 deletions
diff --git a/ports/kenlm/fix-const-overloaded.patch b/ports/kenlm/fix-const-overloaded.patch new file mode 100644 index 000000000..2a77b335f --- /dev/null +++ b/ports/kenlm/fix-const-overloaded.patch @@ -0,0 +1,14 @@ +diff --git a/util/proxy_iterator.hh b/util/proxy_iterator.hh +index 8aa697b..9de2663 100644 +--- a/util/proxy_iterator.hh ++++ b/util/proxy_iterator.hh +@@ -77,8 +77,7 @@ template <class Proxy> class ProxyIterator { + + std::ptrdiff_t operator-(const S &other) const { return I() - other.I(); } + +- Proxy operator*() { return p_; } +- const Proxy operator*() const { return p_; } ++ Proxy operator*() const { return p_; } + Proxy *operator->() { return &p_; } + const Proxy *operator->() const { return &p_; } + Proxy operator[](std::ptrdiff_t amount) const { return *(*this + amount); } diff --git a/ports/kenlm/portfile.cmake b/ports/kenlm/portfile.cmake index 38fe9652f..ad0c5c6c9 100644 --- a/ports/kenlm/portfile.cmake +++ b/ports/kenlm/portfile.cmake @@ -6,7 +6,9 @@ vcpkg_from_github( REF 1f054617eca14eae921e987b4b4eeb2b1d91de6b SHA512 c18f9c22fbbb1f54ebe9c3b771fb2d7c09d502141d1b3645cff9db44cc51b3c976311ff0db79b60f410622579d043f185c56a4c7386e1b0ba8708e433238968b HEAD_REF master - PATCHES fix-boost.patch + PATCHES + fix-boost.patch + fix-const-overloaded.patch ) file(REMOVE ${SOURCE_PATH}/cmake/modules/FindEigen3.cmake) diff --git a/ports/kenlm/vcpkg.json b/ports/kenlm/vcpkg.json index 0542aa6ed..66c218ad9 100644 --- a/ports/kenlm/vcpkg.json +++ b/ports/kenlm/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kenlm", "version-string": "20200924", + "port-version": 1, "description": "KenLM: Faster and Smaller Language Model Queries", "supports": "!(arm64 & windows)", "dependencies": [ diff --git a/ports/pdal/0004-fix-const-overloaded.patch b/ports/pdal/0004-fix-const-overloaded.patch new file mode 100644 index 000000000..1f820aef3 --- /dev/null +++ b/ports/pdal/0004-fix-const-overloaded.patch @@ -0,0 +1,13 @@ +diff --git a/pdal/PointViewIter.hpp b/pdal/PointViewIter.hpp +index 0c387be..ccb0721 100644 +--- a/pdal/PointViewIter.hpp ++++ b/pdal/PointViewIter.hpp +@@ -139,7 +139,7 @@ public: + + bool operator==(const PointViewIter& i) + { return m_id == i.m_id; } +- bool operator!=(const PointViewIter& i) ++ bool operator!=(const PointViewIter& i) const + { return m_id != i.m_id; } + bool operator<=(const PointViewIter& i) + { return m_id <= i.m_id; } diff --git a/ports/pdal/CONTROL b/ports/pdal/CONTROL index dfaaf0daf..9098db285 100644 --- a/ports/pdal/CONTROL +++ b/ports/pdal/CONTROL @@ -1,5 +1,5 @@ Source: pdal
Version: 1.7.1
-Port-Version: 9
+Port-Version: 10
Description: PDAL - Point Data Abstraction Library is a library for manipulating point cloud data.
Build-Depends: gdal, geos, jsoncpp, libgeotiff, laszip, boost-system, boost-filesystem
diff --git a/ports/pdal/portfile.cmake b/ports/pdal/portfile.cmake index 44654a4eb..b6c503d16 100644 --- a/ports/pdal/portfile.cmake +++ b/ports/pdal/portfile.cmake @@ -17,6 +17,7 @@ vcpkg_extract_source_archive_ex( fix-dependency.patch libpq.patch fix-CPL_DLL.patch + 0004-fix-const-overloaded.patch ) file(REMOVE "${SOURCE_PATH}/pdal/gitsha.cpp") |