diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2019-05-29 01:58:00 +0200 |
|---|---|---|
| committer | Victor Romero <romerosanchezv@gmail.com> | 2019-05-28 16:58:00 -0700 |
| commit | a9303736fdda58cf5ff3ccc969be917580493c91 (patch) | |
| tree | fab5304f58fa8017e982423ee59fbfd386a1dc62 /ports/podofo | |
| parent | 3d4b4c02ede7b343f4cd9cdfebbd3124ad834045 (diff) | |
| download | vcpkg-a9303736fdda58cf5ff3ccc969be917580493c91.tar.gz vcpkg-a9303736fdda58cf5ff3ccc969be917580493c91.zip | |
[LibLZMA] automatic configuration (#6000)
* [LibLZMA] add a config-generated by CMake
* bump control files of LibLZMA and dependent ports
* [tiff] use proper liblzma target
[OpenCV] add an explicit dependency on LibLZMA for static linking
* [liblzma] fix header install path
* [LibLZMA] avoid using targets in old symbols
* fixes for windows-static and trying to see if CI is happier with a share/lib folder written in lowercase
* [LibLZMA] use only modern CMake language, remove patch in favour of target public definition
* [lzma] put symbols in cmake cache
* [libxmlpp] remove CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS regression
* [lzma] fix header install path
* [liblzma] install wrapper to force config mode
* [liblzma] remove function check inside cmake config since we know it will pass
* [liblzma] wrapper fix
* [tiff,geotiff] general cleanup and patch fixes
* [libgeotiff] remove debug tools
* [tesseract] modernize
* [tiff] fix also tiff_library symbol
* [pdal,libgeotiff] better library integration
* [tiff] restore using unix i/o on UWP, since it was working... for sure win32 one cannot work
* [tiff] enable lzma also on uwp, since it works and is requested by many dependencies
* [selene] enable build on arm/arm64-windows, which was surely broken before
* [lzma] uniform naming with cmake 3.14
* [podofo] fix regression, it requires openssl which was disabled in dependencies
* [many ports] remove unnecessary mods
* [boost-iostream] chmod
* [openssl] fix regression due to missing architecture
* [podofo] fix regression on uwp due to missing include
* [libpq] explicitly fail on UWP, it should avoid being marked as regression
* [shiva] fix regression on linux
Diffstat (limited to 'ports/podofo')
| -rw-r--r-- | ports/podofo/0001-unique_ptr.patch (renamed from ports/podofo/unique_ptr.patch) | 0 | ||||
| -rw-r--r-- | ports/podofo/0002-HAVE_UNISTD_H.patch (renamed from ports/podofo/002-HAVE_UNISTD_H.patch) | 0 | ||||
| -rw-r--r-- | ports/podofo/0003-uwp_fix.patch | 15 | ||||
| -rw-r--r-- | ports/podofo/CONTROL | 4 | ||||
| -rw-r--r-- | ports/podofo/portfile.cmake | 12 |
5 files changed, 26 insertions, 5 deletions
diff --git a/ports/podofo/unique_ptr.patch b/ports/podofo/0001-unique_ptr.patch index 5c70e8471..5c70e8471 100644 --- a/ports/podofo/unique_ptr.patch +++ b/ports/podofo/0001-unique_ptr.patch diff --git a/ports/podofo/002-HAVE_UNISTD_H.patch b/ports/podofo/0002-HAVE_UNISTD_H.patch index 6aed4b279..6aed4b279 100644 --- a/ports/podofo/002-HAVE_UNISTD_H.patch +++ b/ports/podofo/0002-HAVE_UNISTD_H.patch diff --git a/ports/podofo/0003-uwp_fix.patch b/ports/podofo/0003-uwp_fix.patch new file mode 100644 index 000000000..91872d7eb --- /dev/null +++ b/ports/podofo/0003-uwp_fix.patch @@ -0,0 +1,15 @@ +diff --git a/src/base/PdfCompilerCompat.h b/src/base/PdfCompilerCompat.h +index 706875f..8efb349 100644 +--- a/src/base/PdfCompilerCompat.h ++++ b/src/base/PdfCompilerCompat.h +@@ -113,6 +113,10 @@ + #define NOMINMAX + #endif + ++#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP) ++#include <combaseapi.h> ++#endif ++ + // Integer types - fixed size types guaranteed to work anywhere + // because we detect the right underlying type name to use with + // CMake. Use typedefs rather than macros for saner error messages diff --git a/ports/podofo/CONTROL b/ports/podofo/CONTROL index 6664b043c..083248c3c 100644 --- a/ports/podofo/CONTROL +++ b/ports/podofo/CONTROL @@ -1,7 +1,7 @@ Source: podofo -Version: 0.9.6-6 +Version: 0.9.6-7 Description: PoDoFo is a library to work with the PDF file format -Build-Depends: zlib, libpng, libjpeg-turbo, tiff, openssl (!windows&!uwp), freetype +Build-Depends: zlib, libpng, libjpeg-turbo, tiff, openssl, freetype Feature: fontconfig Description: Enable font manager support on Unix platforms. diff --git a/ports/podofo/portfile.cmake b/ports/podofo/portfile.cmake index 335c307f2..759b6dbe1 100644 --- a/ports/podofo/portfile.cmake +++ b/ports/podofo/portfile.cmake @@ -6,13 +6,19 @@ vcpkg_download_distfile(ARCHIVE FILENAME "podofo-${PODOFO_VERSION}.tar.gz" SHA512 35c1a457758768bdadc93632385f6b9214824fead279f1b85420443fb2135837cefca9ced476df0d47066f060e9150e12fcd40f60fa1606b177da433feb20130 ) + +if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + set(ADDITIONAL_PATCH "0003-uwp_fix.patch") +endif() + vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} REF ${PODOFO_VERSION} - PATCHES - "unique_ptr.patch" - "002-HAVE_UNISTD_H.patch" + PATCHES + 0001-unique_ptr.patch + 0002-HAVE_UNISTD_H.patch + ${ADDITIONAL_PATCH} ) set(PODOFO_NO_FONTMANAGER ON) |
