diff options
| author | Rodion Malinovsky <rodionmalino@gmail.com> | 2021-01-19 21:45:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-19 11:45:40 -0800 |
| commit | 8b5f8e3c7264c95f3b2d4e104688b93bce496912 (patch) | |
| tree | 80a9d512bcca1dee015795f254c28c1377fb22cb | |
| parent | 0c8af399f5914bd1e3b3f9e14bdcd558797a9763 (diff) | |
| download | vcpkg-8b5f8e3c7264c95f3b2d4e104688b93bce496912.tar.gz vcpkg-8b5f8e3c7264c95f3b2d4e104688b93bce496912.zip | |
[xlnt] Prevent macro redefinition (#15645)
| -rw-r--r-- | port_versions/baseline.json | 2 | ||||
| -rw-r--r-- | port_versions/x-/xlnt.json | 5 | ||||
| -rw-r--r-- | ports/xlnt/CONTROL | 1 | ||||
| -rw-r--r-- | ports/xlnt/static-linking-for-windows.patch | 11 |
4 files changed, 14 insertions, 5 deletions
diff --git a/port_versions/baseline.json b/port_versions/baseline.json index 754b44fab..36195eafa 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -6174,7 +6174,7 @@ }, "xlnt": { "baseline": "1.5.0", - "port-version": 0 + "port-version": 1 }, "xmlsec": { "baseline": "1.2.31", diff --git a/port_versions/x-/xlnt.json b/port_versions/x-/xlnt.json index 86bfbeea1..e078174a4 100644 --- a/port_versions/x-/xlnt.json +++ b/port_versions/x-/xlnt.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "1e9127d56c2d772d64454b5aef80f93689f70242", + "version-string": "1.5.0", + "port-version": 1 + }, + { "git-tree": "1f17fd4b98bd2f8a5f0d02aa8db2cd7b1ed1552f", "version-string": "1.5.0", "port-version": 0 diff --git a/ports/xlnt/CONTROL b/ports/xlnt/CONTROL index 3e03a5a4f..88ebdddf6 100644 --- a/ports/xlnt/CONTROL +++ b/ports/xlnt/CONTROL @@ -1,4 +1,5 @@ Source: xlnt
Version: 1.5.0
+Port-Version: 1
Homepage: https://github.com/tfussell/xlnt
Description: Cross-platform user-friendly xlsx library for C++14
diff --git a/ports/xlnt/static-linking-for-windows.patch b/ports/xlnt/static-linking-for-windows.patch index 9f2719724..603286cf9 100644 --- a/ports/xlnt/static-linking-for-windows.patch +++ b/ports/xlnt/static-linking-for-windows.patch @@ -1,13 +1,16 @@ diff --git a/include/xlnt/xlnt.hpp b/include/xlnt/xlnt.hpp -index 01fe4981..9cefa6e0 100644 +index fdd33c38..0d21128f 100644 --- a/include/xlnt/xlnt.hpp +++ b/include/xlnt/xlnt.hpp -@@ -22,7 +22,7 @@ - // @author: see AUTHORS file +@@ -23,6 +23,11 @@ #pragma once -- + ++// Patched by vcpkg to handle static non-cmake builds ++#ifndef XLNT_STATIC +#define XLNT_STATIC ++#endif ++ #include <xlnt/xlnt_config.hpp> // cell |