From 6691c1a0427c9d21ac85dc560dc82514be221620 Mon Sep 17 00:00:00 2001
From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
Date: Thu, 28 Jul 2022 23:54:27 +0200
Subject: [PATCH] [apr] unglue version string (#26005)

* apr unglue version string

* v db
---
 ports/apr/portfile.cmake |  3 ++-
 ports/apr/unglue.patch   | 17 +++++++++++++++++
 ports/apr/vcpkg.json     |  2 +-
 versions/a-/apr.json     |  5 +++++
 versions/baseline.json   |  2 +-
 5 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 ports/apr/unglue.patch

diff --git a/ports/apr/portfile.cmake b/ports/apr/portfile.cmake
index b6970da101..9416ecf215 100644
--- a/ports/apr/portfile.cmake
+++ b/ports/apr/portfile.cmake
@@ -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)
diff --git a/ports/apr/unglue.patch b/ports/apr/unglue.patch
new file mode 100644
index 0000000000..0ce518b8a7
--- /dev/null
+++ b/ports/apr/unglue.patch
@@ -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
diff --git a/ports/apr/vcpkg.json b/ports/apr/vcpkg.json
index e5d1ab75d6..fca57ea328 100644
--- a/ports/apr/vcpkg.json
+++ b/ports/apr/vcpkg.json
@@ -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",
diff --git a/versions/a-/apr.json b/versions/a-/apr.json
index 82e10c5cc0..22d2fcf8f0 100644
--- a/versions/a-/apr.json
+++ b/versions/a-/apr.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2f23cf24a3496f9fb519512245a3e0f1a66c8ed9",
+      "version": "1.7.0",
+      "port-version": 11
+    },
     {
       "git-tree": "7b9002157134602da80c38b7eda863fd9e0012da",
       "version": "1.7.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index 7c413a441c..503036d5b0 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -118,7 +118,7 @@
     },
     "apr": {
       "baseline": "1.7.0",
-      "port-version": 10
+      "port-version": 11
     },
     "apr-util": {
       "baseline": "1.6.1",