mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-27 22:01:37 +08:00
fix duplicated symbols of tiff/libharu
This commit is contained in:
parent
e9267ac7c4
commit
c6d89090a9
@ -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
|
@ -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
12
ports/libharu/tiff.patch
Normal 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;
|
Loading…
Reference in New Issue
Block a user