aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCheney Wang <38240633+Cheney-W@users.noreply.github.com>2019-07-06 09:24:25 +0800
committerRobert Schumacher <roschuma@microsoft.com>2019-07-05 18:24:25 -0700
commit17b5841bc36a13f950af8b052335b2ea56b05db5 (patch)
treed476f2ad1406e9cda6a0a9aa20d531a332eddaea
parent2129bcd1801bf24a8088ed9607069a1bf06028c9 (diff)
downloadvcpkg-17b5841bc36a13f950af8b052335b2ea56b05db5.tar.gz
vcpkg-17b5841bc36a13f950af8b052335b2ea56b05db5.zip
[libmupdf] Enable the old patch for fixing C2169 (#7107)
-rw-r--r--ports/libmupdf/CONTROL2
-rw-r--r--ports/libmupdf/Fix-error-C2169.patch4
2 files changed, 3 insertions, 3 deletions
diff --git a/ports/libmupdf/CONTROL b/ports/libmupdf/CONTROL
index 1285b8c85..28b287a00 100644
--- a/ports/libmupdf/CONTROL
+++ b/ports/libmupdf/CONTROL
@@ -1,5 +1,5 @@
Source: libmupdf
-Version: 1.15.0
+Version: 1.15.0-1
Build-Depends: freetype, libjpeg-turbo, harfbuzz, zlib, curl, glfw3, openjpeg, jbig2dec
Homepage: https://github.com/ArtifexSoftware/mupdf
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
index 164ffe157..4647d6b95 100644
--- a/ports/libmupdf/Fix-error-C2169.patch
+++ b/ports/libmupdf/Fix-error-C2169.patch
@@ -2,11 +2,11 @@ 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)
+@@ -131,7 +131,6 @@ #define isnan(x) _isnan(x)
#define isinf(x) (!_finite(x))
#endif
-#define hypotf _hypotf
#define atoll _atoi64
- char *fz_utf8_from_wchar(const wchar_t *s);
+ #endif