Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix error C2169 #5118

Merged
merged 1 commit into from
Jan 10, 2019
Merged

Fix error C2169 #5118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/libmupdf/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
12 changes: 12 additions & 0 deletions ports/libmupdf/Fix-error-C2169.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);
2 changes: 2 additions & 0 deletions ports/libmupdf/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down