diff --git a/ports/kubazip/fix-project-version.patch b/ports/kubazip/fix-project-version.patch new file mode 100644 index 0000000000..354ed63bbe --- /dev/null +++ b/ports/kubazip/fix-project-version.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index af81ac7..6cd12b6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.15) + + project(zip + LANGUAGES C +- VERSION "0.3.14") ++ VERSION "0.3.15") + set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) + set(CMAKE_VERBOSE_MAKEFILE ON) + diff --git a/ports/kubazip/portfile.cmake b/ports/kubazip/portfile.cmake index 0d9db60f94..7f0481265f 100644 --- a/ports/kubazip/portfile.cmake +++ b/ports/kubazip/portfile.cmake @@ -2,11 +2,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO kuba--/zip REF "v${VERSION}" - SHA512 e35df05d1db4542223f251b052094a8926f1e84a9051db3ff3f60cd0c3af912e0e3053852df8f24eb37b25c0be90afe058c613e9139ccfad0c3ad4d3950c2e70 + SHA512 817da7dd6f477adeb4986d542c20b6f28bed24895b09d3a69cfddf28cc78a7259db3a5e8f879ac263b6bda11c7bb70d00d1d8b626e33b4280366c769bb30bf50 HEAD_REF master PATCHES fix-name-conflict.diff disable-werror.patch + fix-project-version.patch # https://github.com/kuba--/zip/commit/dd80aeab4293d1e11e31af20fabfd538d88625ef ) vcpkg_cmake_configure( @@ -27,4 +28,8 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # legacy polyfill file(INSTALL "${CURRENT_PORT_DIR}/kubazipConfig.cmake" "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") +vcpkg_install_copyright( + FILE_LIST + "${SOURCE_PATH}/LICENSE.txt" + "${SOURCE_PATH}/src/miniz.h" +) diff --git a/ports/kubazip/vcpkg.json b/ports/kubazip/vcpkg.json index c07cf3ee54..d22ba3649a 100644 --- a/ports/kubazip/vcpkg.json +++ b/ports/kubazip/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kubazip", - "version": "0.3.14", + "version": "0.3.15", "description": "A portable, simple zip library written in C", "homepage": "https://github.com/kuba--/zip", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index bf23329acd..5eea070378 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4637,7 +4637,7 @@ "port-version": 0 }, "kubazip": { - "baseline": "0.3.14", + "baseline": "0.3.15", "port-version": 0 }, "kubernetes": { diff --git a/versions/k-/kubazip.json b/versions/k-/kubazip.json index ac270835eb..98d634867b 100644 --- a/versions/k-/kubazip.json +++ b/versions/k-/kubazip.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ca5503c1bd9dd8d574ddf6010ff0a88ccbd1cf29", + "version": "0.3.15", + "port-version": 0 + }, { "git-tree": "09cda8d314d5c4e8e6a49b51f34aa7a65272c2e6", "version": "0.3.14",