3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-28 03:10:57 +08:00
Code Issues Projects Releases Wiki Activity

[kenlm, pdal] Fix const overload on Visual Studio 2019 version 16.8 (#14382)

Browse Source
This commit is contained in:
Lily 2020-11-04 15:10:51 +08:00 committed by GitHub
parent 5c36967f36
commit 74ae197d7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ports/kenlm/fix-const-overloaded.patch Normal file
View File

@ -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); }

4
ports/kenlm/portfile.cmake
View File

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

1
ports/kenlm/vcpkg.json
View File

@ -1,6 +1,7 @@
{
"name": "kenlm",
"version-string": "20200924",
"port-version": 1,
"description": "KenLM: Faster and Smaller Language Model Queries",
"supports": "!(arm64 & windows)",
"dependencies": [

13
ports/pdal/0004-fix-const-overloaded.patch Normal file
View File

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

2
ports/pdal/CONTROL
View File

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

1
ports/pdal/portfile.cmake
View File

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