diff options
| author | NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> | 2020-09-23 06:36:04 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-22 15:36:04 -0700 |
| commit | 7339aea6f57e85a37ff14e887c5bc040c6f0ac41 (patch) | |
| tree | b255496e66688a8f082cea6ec6e524b9e4def95d /ports/libqrencode | |
| parent | 0890b5a25fb4d514a879712eecf4842669073f78 (diff) | |
| download | vcpkg-7339aea6f57e85a37ff14e887c5bc040c6f0ac41.tar.gz vcpkg-7339aea6f57e85a37ff14e887c5bc040c6f0ac41.zip | |
[Many ports] Update to the latest version or commit (#13560)
* [Many ports] Update to the latest version or commit
* [libplist] Update version
[libsync] Update patch format
* Update as review suggestions
* [libplist] Revert changes
Diffstat (limited to 'ports/libqrencode')
| -rw-r--r-- | ports/libqrencode/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libqrencode/fix-found-wingetopt.patch | 13 | ||||
| -rw-r--r-- | ports/libqrencode/portfile.cmake | 15 |
3 files changed, 6 insertions, 24 deletions
diff --git a/ports/libqrencode/CONTROL b/ports/libqrencode/CONTROL index d707bb900..51ac671a4 100644 --- a/ports/libqrencode/CONTROL +++ b/ports/libqrencode/CONTROL @@ -1,5 +1,5 @@ Source: libqrencode -Version: 4.0.2-1 +Version: 4.1.0 Build-Depends: libpng, libiconv Homepage: https://github.com/fukuchi/libqrencode Description: libqrencode - a fast and compact QR Code encoding library diff --git a/ports/libqrencode/fix-found-wingetopt.patch b/ports/libqrencode/fix-found-wingetopt.patch deleted file mode 100644 index 4c28f1cf3..000000000 --- a/ports/libqrencode/fix-found-wingetopt.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3a85c41..92dadca 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -73,7 +73,7 @@ if(MSVC) - - if(WITH_TOOLS) - find_path(GETOPT_INCLUDE_DIR getopt.h PATH_SUFFIXES include) -- find_library(GETOPT_LIBRARIES wingetopt PATH_SUFFIXES lib) -+ find_library(GETOPT_LIBRARIES getopt PATH_SUFFIXES lib) - include_directories(${GETOPT_INCLUDE_DIR}) - endif(WITH_TOOLS) - endif(MSVC) diff --git a/ports/libqrencode/portfile.cmake b/ports/libqrencode/portfile.cmake index 450448dc3..0097ad6fc 100644 --- a/ports/libqrencode/portfile.cmake +++ b/ports/libqrencode/portfile.cmake @@ -1,13 +1,9 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fukuchi/libqrencode - REF v4.0.2 - SHA512 847e32bd13358319f3beabde103b5335a6e11c3f9275425b74e89a00b0ee4d67af8a428f12acc8b80a0419382480e5aeb02e58602a69ee750c21b28f357af6bc + REF 0f6149e41533a34029e72ff9234a18e0f22ab992 #v4.1.0 + SHA512 7aa215d1a9b06df19bcc0178d241af285d5215f6df994f9e2cf64cde716c7451252380a17e60ef27899bf9039e91306c8eb1948b40ede188d49a25555a94c22a HEAD_REF master - PATCHES - fix-found-wingetopt.patch ) if("tool" IN_LIST FEATURES) @@ -32,7 +28,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") # Windows +if(VCPKG_TARGET_IS_WINDOWS) # Windows set(EXECUTABLE_SUFFIX ".exe") else() set(EXECUTABLE_SUFFIX "") @@ -54,9 +50,8 @@ endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libqrencode) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/libqrencode/COPYING ${CURRENT_PACKAGES_DIR}/share/libqrencode/copyright) +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) vcpkg_copy_pdbs() -file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
\ No newline at end of file |