diff options
| author | dan-shaw <51385773+dan-shaw@users.noreply.github.com> | 2019-12-20 12:09:43 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-20 12:09:43 -0800 |
| commit | 35f9e6ea94dfae1145ecabf4bbceb54e50bc8a55 (patch) | |
| tree | 0c390311e2718d53ce14ab2c660208fcd467a912 | |
| parent | 660ec1b9a28d5633b70022573f3bde983483712d (diff) | |
| parent | 0b51f928db5b132b83fc926fb529e5a446819bca (diff) | |
| download | vcpkg-35f9e6ea94dfae1145ecabf4bbceb54e50bc8a55.tar.gz vcpkg-35f9e6ea94dfae1145ecabf4bbceb54e50bc8a55.zip | |
Merge pull request #9261 from Neumann-A/remove_duplicated_symbols_libharu
[libharu] Remove symbols also exported from tiff (as a default feature)
| -rw-r--r-- | ports/libharu/CONTROL | 7 | ||||
| -rw-r--r-- | ports/libharu/portfile.cmake | 8 | ||||
| -rw-r--r-- | ports/libharu/tiff.patch | 25 |
3 files changed, 37 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..7a9f6891c 100644 --- a/ports/libharu/portfile.cmake +++ b/ports/libharu/portfile.cmake @@ -1,5 +1,8 @@ -include(vcpkg_common_functions) - +if("notiffsymbols" IN_LIST FEATURES) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(DISABLETIFF tiff.patch) + endif() +endif() vcpkg_download_distfile(SHADING_PR URLS "https://github.com/libharu/libharu/pull/157.diff" FILENAME "libharu-shading-pr-157.patch" @@ -17,6 +20,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..2aabbe32e --- /dev/null +++ b/ports/libharu/tiff.patch @@ -0,0 +1,25 @@ +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; +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 354ca7526..ee301d9af 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -99,6 +99,8 @@ if(PNG_FOUND) + set(ADDITIONAL_LIBRARIES ${ADDITIONAL_LIBRARIES} ${PNG_LIBRARIES}) + endif(PNG_FOUND) + ++find_package(TIFF REQUIRED) ++list(APPEND ADDITIONAL_LIBRARIES TIFF::TIFF) + + # ======================================================================= + # configure header files, add compiler flags |