Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[apr-util] unglue macro #26093

Merged
merged 2 commits into from
Aug 1, 2022
Merged

[apr-util] unglue macro #26093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3649e7
apr-util unglue macro
Neumann-A Aug 1, 2022
0900e26
v db
Neumann-A Aug 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ports/apr-util/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
PATCHES
use-vcpkg-expat.patch
apr.patch
unglue.patch
)

if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
Expand Down
17 changes: 17 additions & 0 deletions ports/apr-util/unglue.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
3 changes: 2 additions & 1 deletion ports/apr-util/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
5 changes: 5 additions & 0 deletions versions/a-/apr-util.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e11acd0b01edac0a064893b89bd9eb2d976f4371",
"version": "1.6.1",
"port-version": 8
},
{
"git-tree": "d758cde4c829f6c3a66a773d517f9e9425227629",
"version": "1.6.1",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
},
"apr-util": {
"baseline": "1.6.1",
"port-version": 7
"port-version": 8
},
"apsi": {
"baseline": "0.8.2",
Expand Down