From e074c61d6a98df9160f381f5e3da57ea6cea7341 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Tue, 3 Oct 2023 11:44:28 +0800 Subject: [PATCH] [discount] update to 3.0.0a (#34108) --- ports/discount/disable-deprecated-warnings.patch | 10 +++++----- ports/discount/portfile.cmake | 6 +++--- ports/discount/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/d-/discount.json | 5 +++++ 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/ports/discount/disable-deprecated-warnings.patch b/ports/discount/disable-deprecated-warnings.patch index e8f4f0fb77..1684c74009 100644 --- a/ports/discount/disable-deprecated-warnings.patch +++ b/ports/discount/disable-deprecated-warnings.patch @@ -1,11 +1,11 @@ diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt -index 11fa675..34cc9ed 100644 +index ae859a3..77a936a 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt -@@ -20,6 +20,11 @@ set(${PROJECT_NAME}_INSTALL_SAMPLES OFF CACHE BOOL - set(${PROJECT_NAME}_ONLY_LIBRARY OFF CACHE BOOL - "Set to ON to only build markdown library (default is OFF)") - +@@ -23,6 +23,11 @@ set(${PROJECT_NAME}_ONLY_LIBRARY OFF CACHE BOOL + set(${PROJECT_NAME}_CXX_BINDING OFF CACHE BOOL + "Set to ON to install header files with c++ wrappers (default is OFF)") + +# MSVC deprecated warnings (C4996,strdup, ...) +if(MSVC) + add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS) diff --git a/ports/discount/portfile.cmake b/ports/discount/portfile.cmake index a615b28e75..3eb6423a48 100644 --- a/ports/discount/portfile.cmake +++ b/ports/discount/portfile.cmake @@ -4,11 +4,10 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Orc/discount - REF v2.2.6 - SHA512 4c5956dea78aacd3a105ddac13f1671d811a5b2b04990cdf8485c36190c8872c4b1b9432a7236f669c34b07564ecd0096632dced54d67de9eaf4f23641417ecc + REF "v${VERSION}" + SHA512 d86bfc6d3e11131622046418a1f54bd9dfa5f1233e510189cd2c89dc857da31e88ffbe6670cc506ca8b9763e8fb74ed215f1018f83e25767c77acb8a7c296b8a HEAD_REF master PATCHES - cmake.patch generate-blocktags-command.patch disable-deprecated-warnings.patch ) @@ -33,6 +32,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/discount) +vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/discount/vcpkg.json b/ports/discount/vcpkg.json index b22550e6a8..08441ab834 100644 --- a/ports/discount/vcpkg.json +++ b/ports/discount/vcpkg.json @@ -1,7 +1,6 @@ { "name": "discount", - "version": "2.2.6", - "port-version": 3, + "version-string": "3.0.0a", "description": "DISCOUNT is a implementation of John Gruber & Aaron Swartz's Markdown markup language.", "homepage": "https://github.com/Orc/discount", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 26838b0b13..91c1698088 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2161,8 +2161,8 @@ "port-version": 0 }, "discount": { - "baseline": "2.2.6", - "port-version": 3 + "baseline": "3.0.0a", + "port-version": 0 }, "discreture": { "baseline": "2020-01-29", diff --git a/versions/d-/discount.json b/versions/d-/discount.json index 827f509e4d..af395e6826 100644 --- a/versions/d-/discount.json +++ b/versions/d-/discount.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0964d0b7e61494ef8a5c81def6fe5070b3d60d4f", + "version-string": "3.0.0a", + "port-version": 0 + }, { "git-tree": "4cd434c2eb8785c098c1bedc33764a78291fbf2b", "version": "2.2.6",