diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2021-06-21 22:45:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-21 13:45:33 -0700 |
| commit | 33d9cd45ffb089f790c7979653a906f28a35df98 (patch) | |
| tree | 7e0c7d4840b2d11f89451eb2545e1e1f5a017568 /ports/qtimageformats | |
| parent | ec5178efe5c743413f0a07137fbdff47be970e0f (diff) | |
| download | vcpkg-33d9cd45ffb089f790c7979653a906f28a35df98.tar.gz vcpkg-33d9cd45ffb089f790c7979653a906f28a35df98.zip | |
[Qt6] Update to 6.1.1 (#18320)
* [qt6] Update to 6.1.1
* version stuff
* fix empty dir
* update version
* fix casing in qtbase
* [libpq] add secure32.lib on windows
* add clang-cl fix
* version stuff
* fix flag removal by adding a space
* version stuff
* make qt6->Qt6 usage consistent since Qt6 refers to itself as Qt6 with uppercase Q
* fix libpq wrapper opensll linkage on linux
* use policy to fix dependent ports
* version stuff
* use upstream patch
* version stuff
* fix source location for clang-cl
* version stuff
* remove ws change
* version stuff
Diffstat (limited to 'ports/qtimageformats')
| -rw-r--r-- | ports/qtimageformats/portfile.cmake | 12 | ||||
| -rw-r--r-- | ports/qtimageformats/vcpkg.json | 2 | ||||
| -rw-r--r-- | ports/qtimageformats/webp.patch | 17 |
3 files changed, 2 insertions, 29 deletions
diff --git a/ports/qtimageformats/portfile.cmake b/ports/qtimageformats/portfile.cmake index 54e597412..db31bc4d3 100644 --- a/ports/qtimageformats/portfile.cmake +++ b/ports/qtimageformats/portfile.cmake @@ -2,8 +2,7 @@ set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) # Only plugins set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") include("${SCRIPT_PATH}/qt_install_submodule.cmake") -set(${PORT}_PATCHES #webp.patch - ) +set(${PORT}_PATCHES) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS INVERTED_FEATURES @@ -30,17 +29,8 @@ endif() list(APPEND FEATURE_OPTIONS -DINPUT_mng=no) # marked as FIXME qt_install_submodule(PATCHES ${${PORT}_PATCHES} - #TOOL_NAMES ${TOOL_NAMES} CONFIGURE_OPTIONS - #--trace ${FEATURE_OPTIONS} CONFIGURE_OPTIONS_RELEASE CONFIGURE_OPTIONS_DEBUG ) - -if("jasper" IN_LIST FEATURES AND VCPKG_LIBRARY_LINKAGE STREQUAL "static" AND NOT QT_UPDATE_VERSION) - file(INSTALL "${SOURCE_PATH}/cmake/FindWrapJasper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/Qt6") -endif() -if("webp" IN_LIST FEATURES AND VCPKG_LIBRARY_LINKAGE STREQUAL "static" AND NOT QT_UPDATE_VERSION) - file(INSTALL "${SOURCE_PATH}/cmake/FindWrapWebP.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/Qt6") -endif() diff --git a/ports/qtimageformats/vcpkg.json b/ports/qtimageformats/vcpkg.json index f1fb09d5a..22353d2a8 100644 --- a/ports/qtimageformats/vcpkg.json +++ b/ports/qtimageformats/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtimageformats", - "version-semver": "6.1.0", + "version-semver": "6.1.1", "description": "Additional Image Format plugins for Qt", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtimageformats/webp.patch b/ports/qtimageformats/webp.patch deleted file mode 100644 index 23eda0ac8..000000000 --- a/ports/qtimageformats/webp.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/cmake/FindWrapWebP.cmake b/cmake/FindWrapWebP.cmake -index 6cdb76b5e..5264044de 100644 ---- a/cmake/FindWrapWebP.cmake -+++ b/cmake/FindWrapWebP.cmake -@@ -6,10 +6,10 @@ - # paths as hints.
-
- find_package(WebP QUIET)
--if(TARGET WebP::webp AND TARGET WebP::webpdemux AND TARGET WebP::webpmux)
-+if(TARGET WebP::webp AND TARGET WebP::webpdemux AND TARGET WebP::libwebpmux)
- set(WrapWebP_FOUND ON)
- add_library(WrapWebP::WrapWebP INTERFACE IMPORTED)
-- target_link_libraries(WrapWebP::WrapWebP INTERFACE WebP::webp WebP::webpdemux Webp::webpmux)
-+ target_link_libraries(WrapWebP::WrapWebP INTERFACE WebP::webp WebP::webpdemux WebP::libwebpmux)
- return()
- endif()
-
|