diff options
| author | John McNamara <jmcnamara@cpan.org> | 2020-01-21 20:22:30 +0000 |
|---|---|---|
| committer | Victor Romero <romerosanchezv@gmail.com> | 2020-01-21 12:22:30 -0800 |
| commit | 9b901bf801638d14171714d36def05b9ab17a0ca (patch) | |
| tree | 988e313e8927abf769801bc6f3ab7ed5189a1c66 | |
| parent | f4f442b49865dc6f8d10a0083be1c5eeb0c3cfb3 (diff) | |
| download | vcpkg-9b901bf801638d14171714d36def05b9ab17a0ca.tar.gz vcpkg-9b901bf801638d14171714d36def05b9ab17a0ca.zip | |
[libxlsxwriter] upgrade to 0.9.4 (#9775)
Upgrade to the latest version of libxlsxwriter.
Closes #9772
| -rw-r--r-- | ports/libxlsxwriter/0001-fix-cmake-file.patch | 51 | ||||
| -rw-r--r-- | ports/libxlsxwriter/CONTROL | 3 | ||||
| -rw-r--r-- | ports/libxlsxwriter/portfile.cmake | 6 |
3 files changed, 4 insertions, 56 deletions
diff --git a/ports/libxlsxwriter/0001-fix-cmake-file.patch b/ports/libxlsxwriter/0001-fix-cmake-file.patch deleted file mode 100644 index 4f86d2635..000000000 --- a/ports/libxlsxwriter/0001-fix-cmake-file.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f2eed91..f329996 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -224,6 +224,9 @@ target_compile_definitions(${PROJECT_NAME} PRIVATE ${LXW_PRIVATE_COMPILE_DEFINIT - if(MSVC AND NOT (MSVC_VERSION LESS 1900)) - target_compile_options(${PROJECT_NAME} PRIVATE /utf-8) - endif() -+if (WINDOWSSTORE) -+ target_compile_definitions(${PROJECT_NAME} PRIVATE -DIOWIN32_USING_WINRT_API) -+endif() - target_include_directories(${PROJECT_NAME} - PRIVATE ${LXW_PRIVATE_INCLUDE_DIRS} - PUBLIC include include/xlsxwriter -@@ -319,31 +322,11 @@ endif() - - include(GNUInstallDirs) - --if(MSVC) -- if(CMAKE_CL_64) -- set(MSVC_FOLDER_PREFIX x64) -- else() -- set(MSVC_FOLDER_PREFIX Win32) -- endif() -- -- install(TARGETS ${PROJECT_NAME} -- LIBRARY DESTINATION "lib/${MSVC_FOLDER_PREFIX}/\${CMAKE_INSTALL_CONFIG_NAME}" -- ARCHIVE DESTINATION "lib/${MSVC_FOLDER_PREFIX}/\${CMAKE_INSTALL_CONFIG_NAME}" -- RUNTIME DESTINATION "bin/${MSVC_FOLDER_PREFIX}/\${CMAKE_INSTALL_CONFIG_NAME}" -- ) -- if (NOT BUILD_SHARED_LIBS) -- install(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pdb -- DESTINATION "lib/${MSVC_FOLDER_PREFIX}/\${CMAKE_INSTALL_CONFIG_NAME}" -- ) -- endif() -- --else(MSVC) -- install(TARGETS ${PROJECT_NAME} -- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -- ) --endif(MSVC) -+install(TARGETS ${PROJECT_NAME} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -+) - install(FILES include/xlsxwriter.h DESTINATION include) - install(DIRECTORY include/xlsxwriter - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} diff --git a/ports/libxlsxwriter/CONTROL b/ports/libxlsxwriter/CONTROL index 0d7d2494b..2cd6384ce 100644 --- a/ports/libxlsxwriter/CONTROL +++ b/ports/libxlsxwriter/CONTROL @@ -1,4 +1,5 @@ Source: libxlsxwriter -Version: 0.8.9-1 +Version: 0.9.4 Description: Libxlsxwriter is a C library that can be used to write text, numbers, formulas and hyperlinks to multiple worksheets in an Excel 2007+ XLSX file. +Homepage: https://github.com/jmcnamara/libxlsxwriter Build-Depends: zlib diff --git a/ports/libxlsxwriter/portfile.cmake b/ports/libxlsxwriter/portfile.cmake index 75062b4c5..c19db947b 100644 --- a/ports/libxlsxwriter/portfile.cmake +++ b/ports/libxlsxwriter/portfile.cmake @@ -1,11 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jmcnamara/libxlsxwriter - REF RELEASE_0.8.9 - SHA512 0442323b8e55000aa78a689820f8e446b5e925b5077c6ed163ad181b5a8f0e19fe71cc12c4781f47f70f0c702faa27e49655e813f7e90a855ab73dd2bd9f5d66 + REF RELEASE_0.9.4 + SHA512 d7bc319e6b9cd2ad6aaa2f3eb6fdce1c5bcc1d5af23ffb3413e29760191f6aed41f836aaa71a322efe7966f3753a6d8a01cb0b403d682b13a6a3734a87cc12ba HEAD_REF master - PATCHES - 0001-fix-cmake-file.patch ) if (VCPKG_TARGET_IS_UWP) |