[apr] unglue version string (#26005)

* apr unglue version string

* v db
This commit is contained in:
Alexander Neumann 2022-07-28 23:54:27 +02:00 committed by GitHub
parent fb5d36bcad
commit 6691c1a042
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 26 additions and 3 deletions

View File

@ -11,7 +11,8 @@ vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE "${ARCHIVE}"
PATCHES
fix-configcmake.patch
fix-configcmake.patch
unglue.patch
)
if (VCPKG_TARGET_IS_WINDOWS)

17
ports/apr/unglue.patch Normal file
View File

@ -0,0 +1,17 @@
diff --git a/include/apr_version.h b/include/apr_version.h
index e96de3835..de3437d71 100644
--- a/include/apr_version.h
+++ b/include/apr_version.h
@@ -114,9 +114,9 @@
/** An alternative formatted string of APR's version */
/* macro for Win32 .rc files using numeric csv representation */
-#define APR_VERSION_STRING_CSV APR_MAJOR_VERSION ##, \
- ##APR_MINOR_VERSION ##, \
- ##APR_PATCH_VERSION
+#define APR_VERSION_STRING_CSV APR_MAJOR_VERSION , \
+ APR_MINOR_VERSION , \
+ APR_PATCH_VERSION
#ifndef APR_VERSION_ONLY

View File

@ -1,7 +1,7 @@
{
"name": "apr",
"version": "1.7.0",
"port-version": 10,
"port-version": 11,
"description": "The Apache Portable Runtime (APR) is a C library that forms a system portability layer that covers many operating systems.",
"homepage": "https://apr.apache.org/",
"license": "Apache-2.0",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "2f23cf24a3496f9fb519512245a3e0f1a66c8ed9",
"version": "1.7.0",
"port-version": 11
},
{
"git-tree": "7b9002157134602da80c38b7eda863fd9e0012da",
"version": "1.7.0",

View File

@ -118,7 +118,7 @@
},
"apr": {
"baseline": "1.7.0",
"port-version": 10
"port-version": 11
},
"apr-util": {
"baseline": "1.6.1",