fix duplicated symbols of tiff/libharu

This commit is contained in:
Alexander Neumann 2019-12-09 19:43:07 +01:00
parent e9267ac7c4
commit c6d89090a9
3 changed files with 22 additions and 3 deletions

View File

@ -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

View File

@ -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")

12
ports/libharu/tiff.patch Normal file
View File

@ -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;