From 203c9a13d63d1a1eef1da1ef869c7d164ef1f852 Mon Sep 17 00:00:00 2001 From: SunBlack Date: Fri, 3 Jul 2026 02:20:57 +0200 Subject: [PATCH] [7zip] Update to 26.02 (#52684) --- ports/7zip/portfile.cmake | 60 +++++++++++++++++++-------------------- ports/7zip/vcpkg.json | 2 +- versions/7-/7zip.json | 5 ++++ versions/baseline.json | 2 +- 4 files changed, 37 insertions(+), 32 deletions(-) diff --git a/ports/7zip/portfile.cmake b/ports/7zip/portfile.cmake index a03cdaaad1..2925e1e2e9 100644 --- a/ports/7zip/portfile.cmake +++ b/ports/7zip/portfile.cmake @@ -1,30 +1,30 @@ -string(REGEX REPLACE "[.]([0-9])\$" ".0\\1" upstream_version "${VERSION}") - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO ip7z/7zip - REF "${upstream_version}" - SHA512 74a8a909dcf4f50480c2737d333ec16da431a2f95439efe5a364804e47be19daf0ed56f96c63f8fb7e9484b746d45a324e0b4c0921c160037bba6f643eaeb8fa - HEAD_REF main - PATCHES - sort-asm.diff - fix_timespec_get_broken_on_android.patch -) - -file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -file(COPY "${CMAKE_CURRENT_LIST_DIR}/7zip-config.cmake.in" DESTINATION "${SOURCE_PATH}") - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - "-DVCPKG_TARGET_ARCHITECTURE=${VCPKG_TARGET_ARCHITECTURE}" -) - -vcpkg_cmake_install() -vcpkg_copy_pdbs() - -vcpkg_cmake_config_fixup() - -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/DOC/License.txt") - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +string(REGEX REPLACE "[.]([0-9])\$" ".0\\1" upstream_version "${VERSION}") + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ip7z/7zip + REF "${upstream_version}" + SHA512 545ff9b8cf9ab1b91557cad17c01e0f0269a0fc0197c44c321c3693e97b881867f82837cffd89f3b49121527a7055d333dc6fca1ed77ce81d1c5f821298d1561 + HEAD_REF main + PATCHES + sort-asm.diff + fix_timespec_get_broken_on_android.patch +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/7zip-config.cmake.in" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DVCPKG_TARGET_ARCHITECTURE=${VCPKG_TARGET_ARCHITECTURE}" +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup() + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/DOC/License.txt") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/7zip/vcpkg.json b/ports/7zip/vcpkg.json index 89bb0dabd1..a887624c5c 100644 --- a/ports/7zip/vcpkg.json +++ b/ports/7zip/vcpkg.json @@ -1,6 +1,6 @@ { "name": "7zip", - "version": "26.1", + "version": "26.2", "description": "Library for archiving file with a high compression ratio.", "homepage": "https://www.7-zip.org", "license": "LGPL-2.1-or-later", diff --git a/versions/7-/7zip.json b/versions/7-/7zip.json index 6de22511d1..ff7cd940a3 100644 --- a/versions/7-/7zip.json +++ b/versions/7-/7zip.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6cb445b812e73fdbf1e277456c2db089992fde96", + "version": "26.2", + "port-version": 0 + }, { "git-tree": "55267ceb53b513ef374c41ba464d425091506320", "version": "26.1", diff --git a/versions/baseline.json b/versions/baseline.json index 5914a9aeb5..1ad5eae0fa 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5,7 +5,7 @@ "port-version": 5 }, "7zip": { - "baseline": "26.1", + "baseline": "26.2", "port-version": 0 }, "abcmake": {