diff options
| author | Alexander Neumann <Alexander.Neumann@hamburg.de> | 2019-12-09 19:43:07 +0100 |
|---|---|---|
| committer | Alexander Neumann <Alexander.Neumann@hamburg.de> | 2019-12-09 19:43:07 +0100 |
| commit | c6d89090a934177da391e1b5771d5099e2083781 (patch) | |
| tree | d25075ec462aa21dd15ad7db87fb0a1ecd0ca859 | |
| parent | e9267ac7c40d990c8368861189031bcd5eb77189 (diff) | |
| download | vcpkg-c6d89090a934177da391e1b5771d5099e2083781.tar.gz vcpkg-c6d89090a934177da391e1b5771d5099e2083781.zip | |
fix duplicated symbols of tiff/libharu
| -rw-r--r-- | ports/libharu/CONTROL | 7 | ||||
| -rw-r--r-- | ports/libharu/portfile.cmake | 6 | ||||
| -rw-r--r-- | ports/libharu/tiff.patch | 12 |
3 files changed, 22 insertions, 3 deletions
diff --git a/ports/libharu/CONTROL b/ports/libharu/CONTROL index f8d2ca29a..95e84e34a 100644 --- a/ports/libharu/CONTROL +++ b/ports/libharu/CONTROL @@ -1,5 +1,10 @@ Source: libharu -Version: 2017-08-15-8 +Version: 2017-08-15-9 Homepage: https://github.com/libharu/libharu Description: libharu - free PDF library Build-Depends: zlib, libpng +Default-Features: notiffsymbols + +Feature: notiffsymbols +Description: disable symbols also defined by the tiff port +Build-Depends: tiff
\ No newline at end of file diff --git a/ports/libharu/portfile.cmake b/ports/libharu/portfile.cmake index 962550ca8..58b55a6fc 100644 --- a/ports/libharu/portfile.cmake +++ b/ports/libharu/portfile.cmake @@ -1,5 +1,6 @@ -include(vcpkg_common_functions) - +if("notiffsymbols" IN_LIST FEATURES) + set(DISABLETIFF tiff.patch) +endif() vcpkg_download_distfile(SHADING_PR URLS "https://github.com/libharu/libharu/pull/157.diff" FILENAME "libharu-shading-pr-157.patch" @@ -17,6 +18,7 @@ vcpkg_from_github( add-boolean-typedef.patch # This patch adds shading support which is required for VTK. If desired, this could be moved into an on-by-default feature. ${SHADING_PR} + ${DISABLETIFF} ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") diff --git a/ports/libharu/tiff.patch b/ports/libharu/tiff.patch new file mode 100644 index 000000000..e40a9bb9e --- /dev/null +++ b/ports/libharu/tiff.patch @@ -0,0 +1,12 @@ +diff --git a/src/hpdf_image_ccitt.c b/src/hpdf_image_ccitt.c +index 2937fc90d..a1a35d0ed 100644 +--- a/src/hpdf_image_ccitt.c ++++ b/src/hpdf_image_ccitt.c +@@ -21,7 +21,6 @@ + #include <memory.h> + #include <assert.h> + +-#define G3CODES + #include "t4.h" + + typedef unsigned int uint32; |