[discount] update to 3.0.0a (#34108)

This commit is contained in:
Jia Yue Hua 2023-10-03 11:44:28 +08:00 committed by GitHub
parent bddb59427c
commit e074c61d6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 12 deletions

View File

@ -1,11 +1,11 @@
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 11fa675..34cc9ed 100644 index ae859a3..77a936a 100644
--- a/cmake/CMakeLists.txt --- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt
@@ -20,6 +20,11 @@ set(${PROJECT_NAME}_INSTALL_SAMPLES OFF CACHE BOOL @@ -23,6 +23,11 @@ set(${PROJECT_NAME}_ONLY_LIBRARY OFF CACHE BOOL
set(${PROJECT_NAME}_ONLY_LIBRARY OFF CACHE BOOL set(${PROJECT_NAME}_CXX_BINDING OFF CACHE BOOL
"Set to ON to only build markdown library (default is OFF)") "Set to ON to install header files with c++ wrappers (default is OFF)")
+# MSVC deprecated warnings (C4996,strdup, ...) +# MSVC deprecated warnings (C4996,strdup, ...)
+if(MSVC) +if(MSVC)
+ add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS) + add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS)

View File

@ -4,11 +4,10 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO Orc/discount REPO Orc/discount
REF v2.2.6 REF "v${VERSION}"
SHA512 4c5956dea78aacd3a105ddac13f1671d811a5b2b04990cdf8485c36190c8872c4b1b9432a7236f669c34b07564ecd0096632dced54d67de9eaf4f23641417ecc SHA512 d86bfc6d3e11131622046418a1f54bd9dfa5f1233e510189cd2c89dc857da31e88ffbe6670cc506ca8b9763e8fb74ed215f1018f83e25767c77acb8a7c296b8a
HEAD_REF master HEAD_REF master
PATCHES PATCHES
cmake.patch
generate-blocktags-command.patch generate-blocktags-command.patch
disable-deprecated-warnings.patch disable-deprecated-warnings.patch
) )
@ -33,6 +32,7 @@ vcpkg_cmake_configure(
vcpkg_cmake_install() vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/discount) vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/discount)
vcpkg_fixup_pkgconfig()
vcpkg_copy_pdbs() vcpkg_copy_pdbs()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

View File

@ -1,7 +1,6 @@
{ {
"name": "discount", "name": "discount",
"version": "2.2.6", "version-string": "3.0.0a",
"port-version": 3,
"description": "DISCOUNT is a implementation of John Gruber & Aaron Swartz's Markdown markup language.", "description": "DISCOUNT is a implementation of John Gruber & Aaron Swartz's Markdown markup language.",
"homepage": "https://github.com/Orc/discount", "homepage": "https://github.com/Orc/discount",
"dependencies": [ "dependencies": [

View File

@ -2161,8 +2161,8 @@
"port-version": 0 "port-version": 0
}, },
"discount": { "discount": {
"baseline": "2.2.6", "baseline": "3.0.0a",
"port-version": 3 "port-version": 0
}, },
"discreture": { "discreture": {
"baseline": "2020-01-29", "baseline": "2020-01-29",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "0964d0b7e61494ef8a5c81def6fe5070b3d60d4f",
"version-string": "3.0.0a",
"port-version": 0
},
{ {
"git-tree": "4cd434c2eb8785c098c1bedc33764a78291fbf2b", "git-tree": "4cd434c2eb8785c098c1bedc33764a78291fbf2b",
"version": "2.2.6", "version": "2.2.6",