[apr-util] unglue macro (#26093)

* apr-util unglue macro

* v db

ports/apr-util/portfile.cmake

@@ -12,6 +12,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
         PATCHES
             use-vcpkg-expat.patch
             apr.patch
+            unglue.patch
     )
 
     if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)

ports/apr-util/unglue.patch

@@ -0,0 +1,17 @@
+diff --git a/include/apu_version.h b/include/apu_version.h
+index e4fb2e64e..c6addf142 100644
+--- a/include/apu_version.h	
++++ b/include/apu_version.h
+@@ -98,9 +98,9 @@
+ 
+ /** An alternative formatted string of APR's version */
+ /* macro for Win32 .rc files using numeric csv representation */
+-#define APU_VERSION_STRING_CSV APU_MAJOR_VERSION ##, \
+-                             ##APU_MINOR_VERSION ##, \
+-                             ##APU_PATCH_VERSION
++#define APU_VERSION_STRING_CSV APU_MAJOR_VERSION , \
++                               APU_MINOR_VERSION , \
++                               APU_PATCH_VERSION
+ 
+ 
+ #ifndef APU_VERSION_ONLY

ports/apr-util/vcpkg.json

@@ -1,9 +1,10 @@
 {
   "name": "apr-util",
   "version": "1.6.1",
-  "port-version": 7,
+  "port-version": 8,
   "description": "Apache Portable Runtime (APR) project  mission is to create and maintain software libraries that provide a predictable and consistent interface to underlying platform-specific implementation",
   "homepage": "https://apr.apache.org/",
+  "license": "Apache-2.0",
   "dependencies": [
     "apr",
     "expat",

versions/a-/apr-util.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e11acd0b01edac0a064893b89bd9eb2d976f4371",
+      "version": "1.6.1",
+      "port-version": 8
+    },
     {
       "git-tree": "d758cde4c829f6c3a66a773d517f9e9425227629",
       "version": "1.6.1",

versions/baseline.json

@@ -122,7 +122,7 @@
     },
     "apr-util": {
       "baseline": "1.6.1",
-      "port-version": 7
+      "port-version": 8
     },
     "apsi": {
       "baseline": "0.8.2",