diff options
| author | LarryIII <33021067+LarryIII@users.noreply.github.com> | 2019-01-10 14:22:39 -0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-01-10 14:22:39 -0800 |
| commit | 1fe5a31cd771313e38c46cd63ad3a33aa0acad90 (patch) | |
| tree | 925e2fea0e5b18b2c30e76f882e30cc3a24cb236 | |
| parent | 1955e755b729fcc086fce76b82172a88ced22ca8 (diff) | |
| download | vcpkg-1fe5a31cd771313e38c46cd63ad3a33aa0acad90.tar.gz vcpkg-1fe5a31cd771313e38c46cd63ad3a33aa0acad90.zip | |
Fix error C2169 (#5118)
| -rw-r--r-- | ports/libmupdf/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libmupdf/Fix-error-C2169.patch | 12 | ||||
| -rw-r--r-- | ports/libmupdf/portfile.cmake | 2 |
3 files changed, 15 insertions, 1 deletions
diff --git a/ports/libmupdf/CONTROL b/ports/libmupdf/CONTROL index 36ae69488..df04d00a2 100644 --- a/ports/libmupdf/CONTROL +++ b/ports/libmupdf/CONTROL @@ -1,4 +1,4 @@ Source: libmupdf -Version: 1.12.0 +Version: 1.12.0-1 Build-Depends: freetype, libjpeg-turbo, harfbuzz, zlib, curl, glfw3, openjpeg, jbig2dec Description: a lightweight PDF, XPS, and E-book library diff --git a/ports/libmupdf/Fix-error-C2169.patch b/ports/libmupdf/Fix-error-C2169.patch new file mode 100644 index 000000000..164ffe157 --- /dev/null +++ b/ports/libmupdf/Fix-error-C2169.patch @@ -0,0 +1,12 @@ +diff --git a/include/mupdf/fitz/system.h b/include/mupdf/fitz/system.h
+index 0552771..42fd037 100644
+--- a/include/mupdf/fitz/system.h
++++ b/include/mupdf/fitz/system.h
+@@ -117,7 +117,6 @@ static __inline int signbit(double x)
+ #define isinf(x) (!_finite(x))
+ #endif
+
+-#define hypotf _hypotf
+ #define atoll _atoi64
+
+ char *fz_utf8_from_wchar(const wchar_t *s);
diff --git a/ports/libmupdf/portfile.cmake b/ports/libmupdf/portfile.cmake index b3618ea80..2af2327cc 100644 --- a/ports/libmupdf/portfile.cmake +++ b/ports/libmupdf/portfile.cmake @@ -6,6 +6,8 @@ vcpkg_from_github( REF 1.12.0 SHA512 893a1958e34355acf73624e9c47f4a97adf13d5fe33604ac384df9ac22a56ef7c18e02143eaffc3c2a08f460e4c71fee00c094b6d6696f8446977bb18f65e3da HEAD_REF master + PATCHES + "${CURRENT_PORT_DIR}/Fix-error-C2169.patch" ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) |