diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2019-11-22 09:47:40 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-22 09:47:40 -0800 |
| commit | 45f4b820e5743b89bca3508ba2028cdd5d8bbd17 (patch) | |
| tree | f874a8c4a7392309bdbb86447288597ec0a4a281 /ports/dimcli | |
| parent | 62d67d3bf8eeff1afa8009041fd08b8822676b7b (diff) | |
| parent | 8831e8f25f1ff6546ee4a5291b91d599421637b3 (diff) | |
| download | vcpkg-45f4b820e5743b89bca3508ba2028cdd5d8bbd17.tar.gz vcpkg-45f4b820e5743b89bca3508ba2028cdd5d8bbd17.zip | |
Merge branch 'master' into vcpkg_nuget
Diffstat (limited to 'ports/dimcli')
| -rw-r--r-- | ports/dimcli/CONTROL | 2 | ||||
| -rw-r--r-- | ports/dimcli/fix-NameBoolean.patch | 63 | ||||
| -rw-r--r-- | ports/dimcli/portfile.cmake | 6 |
3 files changed, 68 insertions, 3 deletions
diff --git a/ports/dimcli/CONTROL b/ports/dimcli/CONTROL index e98f11565..4f6049616 100644 --- a/ports/dimcli/CONTROL +++ b/ports/dimcli/CONTROL @@ -1,4 +1,4 @@ Source: dimcli -Version: 4.1.0 +Version: 5.0.1 Homepage: https://github.com/gknowles/dimcli Description: C++ command line parser toolkit diff --git a/ports/dimcli/fix-NameBoolean.patch b/ports/dimcli/fix-NameBoolean.patch new file mode 100644 index 000000000..a0d9afb56 --- /dev/null +++ b/ports/dimcli/fix-NameBoolean.patch @@ -0,0 +1,63 @@ +diff --git a/libs/dimcli/cli.cpp b/libs/dimcli/cli.cpp
+index 45dac3b..6129884 100644
+--- a/libs/dimcli/cli.cpp
++++ b/libs/dimcli/cli.cpp
+@@ -392,8 +392,8 @@ GroupConfig const & Cli::Config::findGrpOrDie(Cli const & cli) {
+ ***/
+
+ //===========================================================================
+-Cli::OptBase::OptBase(string const & names, bool boolean)
+- : m_bool{boolean}
++Cli::OptBase::OptBase(string const & names, bool in_boolean)
++ : m_bool{in_boolean}
+ , m_names{names}
+ {
+ // set m_fromName and assert if names is malformed
+@@ -526,12 +526,12 @@ static bool includeName(
+ OptName const & name,
+ NameListType type,
+ Cli::OptBase const & opt,
+- bool boolean,
++ bool in_boolean,
+ bool inverted
+ ) {
+ if (name.opt != &opt)
+ return false;
+- if (boolean) {
++ if (in_boolean) {
+ if (type == kNameEnable)
+ return !name.invert;
+ if (type == kNameDisable)
+diff --git a/libs/dimcli/cli.h b/libs/dimcli/cli.h
+index d4941dc..fa8d526 100644
+--- a/libs/dimcli/cli.h
++++ b/libs/dimcli/cli.h
+@@ -777,7 +777,7 @@ public:
+ };
+
+ public:
+- OptBase(std::string const & keys, bool boolean);
++ OptBase(std::string const & keys, bool in_boolean);
+ virtual ~OptBase() {}
+
+ //-----------------------------------------------------------------------
+@@ -1062,7 +1062,7 @@ std::string Cli::OptBase::toValueDesc<DIMCLI_LIB_FILESYSTEM_PATH>() const {
+ template <typename A, typename T>
+ class Cli::OptShim : public OptBase {
+ public:
+- OptShim(std::string const & keys, bool boolean);
++ OptShim(std::string const & keys, bool in_boolean);
+ OptShim(OptShim const &) = delete;
+ OptShim & operator=(OptShim const &) = delete;
+
+@@ -1249,8 +1249,8 @@ protected:
+
+ //===========================================================================
+ template <typename A, typename T>
+-Cli::OptShim<A, T>::OptShim(std::string const & keys, bool boolean)
+- : OptBase(keys, boolean)
++Cli::OptShim<A, T>::OptShim(std::string const & keys, bool in_boolean)
++ : OptBase(keys, in_boolean)
+ {
+ if (std::is_arithmetic<T>::value)
+ this->imbue(std::locale(""));
diff --git a/ports/dimcli/portfile.cmake b/ports/dimcli/portfile.cmake index 6362aa987..938d313a9 100644 --- a/ports/dimcli/portfile.cmake +++ b/ports/dimcli/portfile.cmake @@ -3,9 +3,11 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gknowles/dimcli - REF v4.1.0 - SHA512 5de010b5abfda9e6996bba8c621e03ae0cf81dbc2f69cd859e2ebf7b1706c451f7f8e142299784646d89ca3c3e5803e8711215680b8bdb8eb663158bff3b4f3d + REF v5.0.1 + SHA512 ff005777230f9ded5e407f11ebed7d70db2a18ec60da8c80d36644b96c9d090d2f211e3c36b7d296a446c1b54d61c359a51082034b94e2398cc2305316f33d0f HEAD_REF master + PATCHES + fix-NameBoolean.patch ) set(staticCrt OFF) if(VCPKG_CRT_LINKAGE STREQUAL "static") |